Changeset 9064 in josm for trunk/src

Timestamp:

2015-11-25T22:27:31+01:00 (8 years ago)

Author:

wiktorn

Message:

Move from IndexedDiskCache to BlockDiskCache.

HEADSUP: This change trashes contents of the cache files silently (and there's nothing easy we can do about it).

Thanks to Thomans Vandahl at Apache Commons (​https://issues.apache.org/jira/browse/JCS-153) the problem with restoring cache file corruptions is finally solved.

This means, that ot no time cache file optimization will be needed, thus reducing the shutdown time of JCS Caches.

Closes: #11566

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -17 +17 @@
 import org.apache.commons.jcs.auxiliary.AuxiliaryCacheFactory;
 import org.apache.commons.jcs.auxiliary.disk.behavior.IDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory;
+import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
+import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheFactory;
 import org.apache.commons.jcs.engine.CompositeCacheAttributes;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;
@@ -41 +41 @@
     private static long maxObjectTTL        = -1;
     private static final String PREFERENCE_PREFIX = "jcs.cache";
-    private static final AuxiliaryCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
+    private static final AuxiliaryCacheFactory diskCacheFactory = new BlockDiskCacheFactory();
     private static FileLock cacheDirLock;
 
@@ -184 +184 @@
 
     private static IDiskCacheAttributes getDiskCacheAttributes(int maxDiskObjects, String cachePath) {
-        IndexedDiskCacheAttributes ret = new IndexedDiskCacheAttributes();
+        BlockDiskCacheAttributes ret = new BlockDiskCacheAttributes();
         ret.setDiskLimitType(IDiskCacheAttributes.DiskLimitType.SIZE);
         ret.setMaxKeySize(maxDiskObjects);