From 5de965590c16539161f4e9641add9f9b094c35d2 Mon Sep 17 00:00:00 2001 From: gojomo Date: Wed, 16 Feb 2011 01:15:13 +0000 Subject: [PATCH] Update Guava library to r08 * .classpath, commons/pom.xml update reference * ObjectIdentityBdbManualCache use new maximumSize() option on dirtyItems map --- .classpath | 2 +- commons/pom.xml | 4 ++-- .../java/org/archive/util/ObjectIdentityBdbManualCache.java | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.classpath b/.classpath index 8ddd1c77..26860870 100644 --- a/.classpath +++ b/.classpath @@ -55,6 +55,6 @@ - + diff --git a/commons/pom.xml b/commons/pom.xml index 0693bebb..d9ad359a 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -36,7 +36,7 @@ true - daily + always warn @@ -269,7 +269,7 @@ com.google.guava guava - r07 + r08 diff --git a/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java b/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java index 8b728dd5..9965eb16 100644 --- a/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java +++ b/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java @@ -130,9 +130,11 @@ implements ObjectIdentityCache, Closeable, Serializable, MapEvictionListener< this.memMap = new MapMaker().concurrencyLevel(64).initialCapacity(8192).softValues().makeMap(); this.db = openDatabase(env, dbName); this.diskMap = createDiskMap(this.db, classCatalog, valueClass); - // TODO: add maxCapacity when upgrading to Guava r08 + // keep a record of items that must be persisted; auto-persist if + // unchanged after 5 minutes, or more than 10K would collect this.dirtyItems = new MapMaker().concurrencyLevel(64) - .expiration(600, TimeUnit.SECONDS).evictionListener(this).makeMap(); + .maximumSize(10000).expireAfterWrite(5,TimeUnit.MINUTES) + .evictionListener(this).makeMap(); this.count = new AtomicLong(diskMap.size()); }