Changeset 10417 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-06-18T15:26:31+02:00 (8 years ago)

Author:

wiktorn

Message:

Fix block cache growing outside the limit.

• Missing setting of the block size prevented JCS to properly limit of the cache file size when using Block Disk. Set the block size to 4096
• Block Disk Cache do not reduce the size of the file, when setting the limit lower than the actual file size, so now JOSM will remove all the cache files by itself when limit is set to lower than before value
• Because of above two, bumped naming of the files to _v2 so older (possibly way above the file size limit) file will be removed

See: #12979, #12986

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCacheManager.java (modified) (4 diffs)
• gui/preferences/imagery/CommonSettingsPanel.java (modified) (6 diffs)

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

@@ -45 +45 @@
     private static long maxObjectTTL = -1;
     private static final String PREFERENCE_PREFIX = "jcs.cache";
-    private static BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true);
+    public static BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true);
 
     private static final AuxiliaryCacheFactory diskCacheFactory =
@@ -203 +203 @@
             BlockDiskCacheAttributes blockAttr = new BlockDiskCacheAttributes();
             blockAttr.setMaxKeySize(maxDiskObjects);
+            blockAttr.setBlockSizeBytes(4096); // use 4k blocks
             ret = blockAttr;
         } else {
@@ -216 +217 @@
             ret.setDiskPath(cachePath);
         }
-        ret.setCacheName(cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK" : "_INDEX"));
-
-        removeStaleFiles(cachePath + File.separator + cacheName, (USE_BLOCK_CACHE.get() ? "_INDEX" : "_BLOCK"));
+        ret.setCacheName(cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2"));
+
+        removeStaleFiles(cachePath + File.separator + cacheName, (USE_BLOCK_CACHE.get() ? "_INDEX_v2" : "_BLOCK_v2"));
         return ret;
     }
@@ -224 +225 @@
     private static void removeStaleFiles(String basePathPart, String suffix) {
         deleteCacheFiles(basePathPart); // TODO: this can be removed around 2016.09
+        deleteCacheFiles(basePathPart + "_BLOCK"); // TODO: this can be removed around 2016.09
+        deleteCacheFiles(basePathPart + "_INDEX"); // TODO: this can be removed around 2016.09
         deleteCacheFiles(basePathPart + suffix);
     }

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FilenameFilter;
 
 import javax.swing.JButton;
@@ -18 +20 @@
 import javax.swing.SpinnerNumberModel;
 
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory;
 import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
@@ -26 +29 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -129 +133 @@
         boolean restartRequired = false;
         if (!AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().equals(this.maxElementsOnDisk.getValue())) {
+            if (((Integer)this.maxElementsOnDisk.getValue()) < AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get() &&
+                    JCSCacheManager.USE_BLOCK_CACHE.get()) {
+                // reducing size of the cache, this requires deletion of the files
+                removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
+            }
             AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.put((Integer) this.maxElementsOnDisk.getValue());
             restartRequired = true;
@@ -136 +145 @@
         if (!CachedTileLoaderFactory.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) {
             restartRequired = true;
+            removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get()); // clear old cache directory
             CachedTileLoaderFactory.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText());
         }
@@ -146 +156 @@
         return restartRequired;
     }
+
+    private void removeCacheFiles(String path) {
+        File directory = new File(path);
+        File[] cacheFiles = directory.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                return name.endsWith(".data") || name.endsWith(".key");
+            }
+
+        });
+        JCSCacheManager.shutdown(); // shutdown Cache - so files can by safely deleted
+        for (File cacheFile: cacheFiles) {
+            Utils.deleteFile(cacheFile);
+        }
+    }
 }