[rfc][icedtea-web] Allow cache directory to be changed during runtime
Jiri Vanek
jvanek at redhat.com
Tue Feb 24 14:53:42 UTC 2015
On 01/05/2015 08:49 PM, Jie Kang wrote:
> Hello,
>
> This patch consolidates the cacheDir instance to a single place and allows us to change it during run-time. It also modifies a unit test to use this new feature. This feature is aimed mainly at unit tests that need the cache, but do not want to modify the icedtea-web's user cache.
>
> Thoughts? Okay to push?
>
>
no :(
> Regards,
>
> -- Jie Kang
>
>
> itw-change-cache-location.patch
>
>
> # HG changeset patch
> # Parent 02dd1b796d4b2c60c9a7607cf522e09884759b0d
> diff --git a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
> --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
> +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
> @@ -66,8 +66,7 @@
> INSTANCE;
>
> /* location of cache directory */
> - private final String setCachePath = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
> - String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath();
> + String cacheDir;
>
> /*
> * back-end of how LRU is implemented This file is to keep track of the most
> @@ -77,10 +76,19 @@
>
> public static final String CACHE_INDEX_FILE_NAME = "recently_used";
First bug first - those file, and *especially* the directory handling should go via the
FilesAndPaths class. You may find it is already deffined here (especialy directory).
The file recently_used may remian publicly undocumented, but stil it desires internal doc as all
other files.
By doing so, I belive this patch will look completly different.
>
> - PropertiesFile cacheOrder = new PropertiesFile(
> - new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME));
> + PropertiesFile cacheOrder;
>
> private CacheLRUWrapper() {
Wha I'm really thinkign about is having CacheLRUWrapper able to be set. It will have twoconstructors
- default 0using the default path and vit file parameter, setting the directory path. Do you think
it is doable?
Actually the CacheLRUWrapper can provide singleton of itself, and it can be set/get. and used.
Maybe this is complete nonsense, I lets wait for it how it looks when you adapt it to usage of
FilesAndPaths.
Thank you for patience with this!
J.
> + String setCachePath = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
> + String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath();
> + setupCacheDir(cacheDir);
> + }
> +
> + private void setupCacheDir(String cacheDir) {
> + this.cacheDir = cacheDir;
> + cacheOrder = new PropertiesFile(
> + new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME));
> +
> File f = cacheOrder.getStoreFile();
> if (!f.exists()) {
> try {
> @@ -91,7 +99,7 @@
> }
> }
> }
> -
> +
> /**
> * Returns an instance of the policy.
> *
> @@ -294,4 +302,12 @@
> void clearLRUSortedEntries() {
> cacheOrder.clear();
> }
> +
> + protected void setCacheDir(String cacheDir) {
> + setupCacheDir(cacheDir);
> + }
> +
> + protected String getCacheDir() {
> + return this.cacheDir;
> + }
> }
> diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java b/netx/net/sourceforge/jnlp/cache/CacheUtil.java
> --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java
> +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java
> @@ -58,8 +58,6 @@
> */
> public class CacheUtil {
>
> - private static final String setCacheDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
> - private static final String cacheDir = new File(setCacheDir != null ? setCacheDir : System.getProperty("java.io.tmpdir")).getPath(); // Do this with file to standardize it.
> private static final CacheLRUWrapper lruHandler = CacheLRUWrapper.getInstance();
>
> /**
> @@ -126,7 +124,7 @@
> return false;
> }
>
> - File cacheDir = new File(CacheUtil.cacheDir);
> + File cacheDir = new File(lruHandler.getCacheDir());
> if (!(cacheDir.isDirectory())) {
> return false;
> }
> @@ -321,7 +319,7 @@
> * Get the path to file minus the cache directory and indexed folder.
> */
> private static String pathToURLPath(String path) {
> - int len = cacheDir.length();
> + int len = lruHandler.getCacheDir().length();
> int index = path.indexOf(File.separatorChar, len + 1);
> return path.substring(index);
> }
> @@ -334,6 +332,8 @@
> String path = filePath;
> String tempPath = "";
>
> + String cacheDir = lruHandler.getCacheDir();
> +
> while(path.startsWith(cacheDir) && !path.equals(cacheDir)){
> tempPath = new File(path).getParent();
>
> @@ -361,7 +361,7 @@
> lruHandler.lock();
> lruHandler.load();
> for (long i = 0; i < Long.MAX_VALUE; i++) {
> - String path = cacheDir + File.separator + i;
> + String path = lruHandler.getCacheDir() + File.separator + i;
> File cDir = new File(path);
> if (!cDir.exists()) {
> // We can use this directory.
> @@ -567,8 +567,8 @@
> * rStr first becomes: /0/http/www.example.com/subdir/a.jar
> * then rstr becomes: /home/user1/.icedtea/cache/0
> */
> - String rStr = file.getPath().substring(cacheDir.length());
> - rStr = cacheDir + rStr.substring(0, rStr.indexOf(File.separatorChar, 1));
> + String rStr = file.getPath().substring(lruHandler.getCacheDir().length());
> + rStr = lruHandler.getCacheDir() + rStr.substring(0, rStr.indexOf(File.separatorChar, 1));
> long len = file.length();
>
> if (keep.contains(file.getPath().substring(rStr.length()))) {
> @@ -621,4 +621,12 @@
> }
> }
> }
> +
> + protected static void setCacheDir(String cacheDir) {
> + lruHandler.setCacheDir(cacheDir);
> + }
> +
> + public static String getCacheDir(String cacheDir) {
> + return lruHandler.getCacheDir();
> + }
> }
> diff --git a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java
> --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java
> +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java
> @@ -456,8 +456,8 @@
> downloadServer = ServerAccess.getIndependentInstance(dir.getAbsolutePath(), ServerAccess.findFreePort());
> redirectErrBack();
>
> - cacheDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
> - JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR, System.getProperty("java.io.tmpdir") + File.separator + "tempcache");
> + String tempCache = System.getProperty("java.io.tmpdir") + File.separator + "tempcache";
> + CacheUtil.setCacheDir(tempCache);
> }
>
> @AfterClass
> @@ -465,7 +465,7 @@
> downloadServer.stop();
>
> CacheUtil.clearCache();
> - JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR, cacheDir);
> + CacheUtil.setCacheDir(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR));
> }
>
> @Test
>
More information about the distro-pkg-dev
mailing list