Author: tv
Date: Fri Oct 21 16:05:15 2016
New Revision: 1766059
URL: http://svn.apache.org/viewvc?rev=1766059&view=rev
Log:
Remove size limitation configuration of indexed cache recycle bin
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheB.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10A.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10B.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheID.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG1.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG2.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG3.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheLMD1.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA2.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA3.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNB.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRCSimple.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC_CEL.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP1.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP2.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP3.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP4.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/remote.cacheRS1.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/remote.cacheRS2.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheCon.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheHuge.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJCS-73.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestUDPDiscovery.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/cache2.ccf
commons/proper/jcs/trunk/src/changes/changes.xml
commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml
commons/proper/jcs/trunk/xdocs/IndexedDiskCacheProperties.xml
commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml
commons/proper/jcs/trunk/xdocs/getting_started/intro.xml
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java
Fri Oct 21 16:05:15 2016
@@ -36,14 +36,6 @@ public class IndexedDiskCacheAttributes
/** -1 means no limit. */
private int maxKeySize = DEFAULT_maxKeySize;
- /** default value */
- private static final int DEFAULT_maxRecycleBinSize = 5000;
-
- /**
- * Cannot be larger than the max size. If max is less than 0, this will be
5000
- */
- private int maxRecycleBinSize = DEFAULT_maxRecycleBinSize;
-
/** default to -1, i.e., don't optimize until shutdown */
private int optimizeAtRemoveCount = -1;
@@ -56,7 +48,7 @@ public class IndexedDiskCacheAttributes
/** Should we clear the disk on startup. */
public static final boolean DEFAULT_CLEAR_DISK_ON_STARTUP = false;
- /** Should we clear the disk on startup. If true the congtents of disk are
cleared. */
+ /** Should we clear the disk on startup. If true the contents of disk are
cleared. */
private boolean clearDiskOnStartup = DEFAULT_CLEAR_DISK_ON_STARTUP;
/**
@@ -85,9 +77,6 @@ public class IndexedDiskCacheAttributes
public void setMaxKeySize( int maxKeySize )
{
this.maxKeySize = maxKeySize;
-
- // make sure the sizes are in accord with our rule.
- setMaxRecycleBinSize( maxRecycleBinSize );
}
/**
@@ -112,27 +101,6 @@ public class IndexedDiskCacheAttributes
}
/**
- * This cannot be larger than the maxKeySize. It wouldn't hurt anything,
but it makes the config
- * necessary. The recycle bin entry willbe at least as large as a key.
- * <p>
- * If the maxKeySize is -1 this will be set tot he default, which is 5000.
- * <p>
- * @param maxRecycleBinSize The maxRecycleBinSize to set.
- */
- public void setMaxRecycleBinSize( int maxRecycleBinSize )
- {
- this.maxRecycleBinSize = maxRecycleBinSize;
- }
-
- /**
- * @return Returns the maxRecycleBinSize.
- */
- public int getMaxRecycleBinSize()
- {
- return maxRecycleBinSize;
- }
-
- /**
* @param optimizeOnShutdown The optimizeOnShutdown to set.
*/
public void setOptimizeOnShutdown( boolean optimizeOnShutdown )
@@ -177,7 +145,6 @@ public class IndexedDiskCacheAttributes
str.append( "\n diskPath = " + super.getDiskPath() );
str.append( "\n maxPurgatorySize = " + super.getMaxPurgatorySize() );
str.append( "\n maxKeySize = " + maxKeySize );
- str.append( "\n maxRecycleBinSize = " + maxRecycleBinSize );
str.append( "\n optimizeAtRemoveCount = " + optimizeAtRemoveCount );
str.append( "\n shutdownSpoolTimeLimit = " +
super.getShutdownSpoolTimeLimit() );
str.append( "\n optimizeOnShutdown = " + optimizeOnShutdown );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheB.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheB.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheB.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheB.ccf Fri Oct
21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000
@@ -103,7 +103,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC.attributes.MaxKeySize=10000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
# Disk Cache Using a Pooled Event Queue -- this allows you
@@ -112,13 +111,12 @@ jcs.auxiliary.DC.attributes.OptimizeAtRe
# adding more threads does not help.
# If you want to use a separate pool for each disk cache, either use
# the single model or define a different auxiliary for each region and use the
Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
+# SINGLE is best unless you have a huge # of regions.
jcs.auxiliary.DC2=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC2.attributes=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10A.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10A.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10A.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10A.ccf Fri
Oct 21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=DC,RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000000
@@ -88,7 +88,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
@@ -98,13 +97,12 @@ jcs.auxiliary.DC.attributes.ShutdownSpoo
# adding more threads does not help.
# If you want to use a separate pool for each disk cache, either use
# the single model or define a different auxiliary for each region and use the
Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
+# SINGLE is best unless you have a huge # of regions.
jcs.auxiliary.DC2=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC2.attributes=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10B.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10B.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10B.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheD10B.ccf Fri
Oct 21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=DC,RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000000
@@ -88,7 +88,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
@@ -98,13 +97,12 @@ jcs.auxiliary.DC.attributes.ShutdownSpoo
# adding more threads does not help.
# If you want to use a separate pool for each disk cache, either use
# the single model or define a different auxiliary for each region and use the
Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
+# SINGLE is best unless you have a huge # of regions.
jcs.auxiliary.DC2=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC2.attributes=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheID.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheID.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheID.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheID.ccf Fri Oct
21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=DC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=0
@@ -60,6 +60,5 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=50000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG1.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG1.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG2.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG2.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG3.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheJG3.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheLMD1.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheLMD1.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA2.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA2.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA3.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNA3.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNB.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheNB.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC.ccf Fri Oct
21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=DC,RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000000
@@ -103,7 +103,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
@@ -113,13 +112,12 @@ jcs.auxiliary.DC.attributes.ShutdownSpoo
# adding more threads does not help.
# If you want to use a separate pool for each disk cache, either use
# the single model or define a different auxiliary for each region and use the
Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
+# SINGLE is best unless you have a huge # of regions.
jcs.auxiliary.DC2=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC2.attributes=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRCSimple.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRCSimple.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRCSimple.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRCSimple.ccf
Fri Oct 21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000000
@@ -74,7 +74,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
@@ -84,13 +83,12 @@ jcs.auxiliary.DC.attributes.ShutdownSpoo
# adding more threads does not help.
# If you want to use a separate pool for each disk cache, either use
# the single model or define a different auxiliary for each region and use the
Pooled.
-# SINGLE is best unless you ahve a huge # of regions.
+# SINGLE is best unless you have a huge # of regions.
jcs.auxiliary.DC2=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC2.attributes=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC_CEL.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC_CEL.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC_CEL.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheRC_CEL.ccf Fri
Oct 21 16:05:15 2016
@@ -35,7 +35,7 @@ jcs.default.elementattributes.IsLateral=
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=DC,RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000000
@@ -88,7 +88,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP1.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP1.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP2.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP2.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP3.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP3.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP4.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/cacheTCP4.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/remote.cacheRS1.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/remote.cacheRS1.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/remote.cacheRS2.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/conf/remote.cacheRS2.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
Fri Oct 21 16:05:15 2016
@@ -38,7 +38,6 @@ public class IndexDiskCacheCountUnitTest
{
IndexedDiskCacheAttributes cattr = getCacheAttributes();
cattr.setCacheName( "testRemoveItems" );
- cattr.setMaxRecycleBinSize( 2 );
cattr.setOptimizeAtRemoveCount( 7 );
cattr.setMaxKeySize( 5 );
cattr.setMaxPurgatorySize( 0 );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
Fri Oct 21 16:05:15 2016
@@ -39,7 +39,6 @@ public class IndexDiskCacheSizeUnitTest
{
IndexedDiskCacheAttributes cattr = getCacheAttributes();
cattr.setCacheName( "testRemoveItems" );
- cattr.setMaxRecycleBinSize( 2 );
cattr.setOptimizeAtRemoveCount( 7 );
cattr.setMaxKeySize( 8); // 1kb DiskTestObject takes
1420 bytes, so 5*1420 = 7100, so to keep 5 ojbects, we need max key size of 8
cattr.setMaxPurgatorySize( 0 );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
Fri Oct 21 16:05:15 2016
@@ -24,8 +24,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
import org.apache.commons.jcs.engine.CacheElement;
@@ -36,6 +34,8 @@ import org.apache.commons.jcs.engine.con
import org.apache.commons.jcs.engine.control.group.GroupId;
import org.apache.commons.jcs.utils.timing.SleepUtil;
+import junit.framework.TestCase;
+
/**
* Tests for common functionality.
* <p>
@@ -245,7 +245,6 @@ public abstract class IndexDiskCacheUnit
IndexedDiskCacheAttributes cattr = getCacheAttributes();
cattr.setCacheName("testRecyleBinSize");
cattr.setDiskPath("target/test-sandbox/UnitTest");
- cattr.setMaxRecycleBinSize(numberToInsert);
cattr.setOptimizeAtRemoveCount(numberToInsert);
cattr.setMaxKeySize(numberToInsert * 2);
cattr.setMaxPurgatorySize(numberToInsert);
@@ -291,7 +290,6 @@ public abstract class IndexDiskCacheUnit
IndexedDiskCacheAttributes cattr = getCacheAttributes();
cattr.setCacheName("testRecyleBinUsage");
cattr.setDiskPath("target/test-sandbox/UnitTest");
- cattr.setMaxRecycleBinSize(numberToInsert);
cattr.setOptimizeAtRemoveCount(numberToInsert);
cattr.setMaxKeySize(numberToInsert * 2);
cattr.setMaxPurgatorySize(numberToInsert);
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
Fri Oct 21 16:05:15 2016
@@ -1,5 +1,9 @@
package org.apache.commons.jcs.auxiliary.disk.indexed;
+import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
+import org.apache.commons.jcs.engine.behavior.ICacheElement;
+import org.apache.commons.jcs.utils.timing.SleepUtil;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,9 +24,6 @@ package org.apache.commons.jcs.auxiliary
*/
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
-import org.apache.commons.jcs.engine.behavior.ICacheElement;
-import org.apache.commons.jcs.utils.timing.SleepUtil;
/**
* Tests for the optimization routine.
@@ -42,12 +43,11 @@ public class IndexedDiskCacheOptimizatio
{
// SETUP
int removeCount = 50;
-
+
IndexedDiskCacheAttributes cattr = new IndexedDiskCacheAttributes();
cattr.setCacheName( "testOptimization" );
cattr.setMaxKeySize( removeCount * 2 );
cattr.setOptimizeAtRemoveCount( removeCount );
- cattr.setMaxRecycleBinSize( removeCount * 3 );
cattr.setDiskPath( "target/test-sandbox/testOptimization" );
IndexedDiskCache<Integer, DiskTestObject> disk = new
IndexedDiskCache<Integer, DiskTestObject>( cattr );
@@ -61,7 +61,7 @@ public class IndexedDiskCacheOptimizatio
{
disk.processUpdate( elements[i] );
}
-
+
Thread.sleep( 1000 );
long sizeBeforeRemove = disk.getDataFileSize();
@@ -73,7 +73,7 @@ public class IndexedDiskCacheOptimizatio
{
disk.processRemove( Integer.valueOf( i ) );
}
-
+
SleepUtil.sleepAtLeast( 1000 );
disk.optimizeFile();
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheCon.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheCon.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheCon.ccf
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheCon.ccf
Fri Oct 21 16:05:15 2016
@@ -55,7 +55,6 @@ jcs.auxiliary.indexedDiskCache.attribute
jcs.auxiliary.indexedDiskCache.attributes.DiskPath=target/test-sandbox/indexed-disk-cache-conc
jcs.auxiliary.indexedDiskCache.attributes.MaxPurgatorySize=10000
jcs.auxiliary.indexedDiskCache.attributes.MaxKeySize=10000
-jcs.auxiliary.indexedDiskCache.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.indexedDiskCache.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.indexedDiskCache.attributes.EventQueueType=SINGLE
jcs.auxiliary.indexedDiskCache.attributes.EventQueuePoolName=disk_cache_event_queue
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf
Fri Oct 21 16:05:15 2016
@@ -30,5 +30,4 @@ jcs.auxiliary.DC.attributes.DiskPath=tar
jcs.auxiliary.DC.attributes.maxKeySize=10000
jcs.auxiliary.DC.attributes.MaxPurgatorySize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=5000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheHuge.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheHuge.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheHuge.ccf
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheHuge.ccf
Fri Oct 21 16:05:15 2016
@@ -39,7 +39,6 @@ jcs.auxiliary.indexedDiskCache.attribute
jcs.auxiliary.indexedDiskCache.attributes.DiskPath=target/test-sandbox/indexed-disk-cache-conc
jcs.auxiliary.indexedDiskCache.attributes.MaxPurgatorySize=300000
jcs.auxiliary.indexedDiskCache.attributes.MaxKeySize=500000
-jcs.auxiliary.indexedDiskCache.attributes.MaxRecycleBinSize=50000
jcs.auxiliary.indexedDiskCache.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.indexedDiskCache.attributes.EventQueueType=SINGLE
#
jcs.auxiliary.indexedDiskCache.attributes.EventQueuePoolName=disk_cache_event_queue
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf
Fri Oct 21 16:05:15 2016
@@ -31,4 +31,3 @@ jcs.auxiliary.DC.attributes.DiskPath=tar
jcs.auxiliary.DC.attributes.maxKeySize=1000
jcs.auxiliary.DC.attributes.MaxPurgatorySize=1000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=20000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=10000
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf
Fri Oct 21 16:05:15 2016
@@ -44,7 +44,6 @@ jcs.auxiliary.indexedDiskCache.attribute
jcs.auxiliary.indexedDiskCache.attributes.DiskPath=target/test-sandbox/indexed-disk-cache-conc
jcs.auxiliary.indexedDiskCache.attributes.MaxPurgatorySize=10000
jcs.auxiliary.indexedDiskCache.attributes.MaxKeySize=10000
-jcs.auxiliary.indexedDiskCache.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.indexedDiskCache.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.indexedDiskCache.attributes.EventQueueType=SINGLE
jcs.auxiliary.indexedDiskCache.attributes.EventQueuePoolName=disk_cache_event_queue
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJCS-73.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJCS-73.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJCS-73.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJCS-73.ccf
Fri Oct 21 16:05:15 2016
@@ -35,7 +35,6 @@ jcs.auxiliary.CACHE.attributes=org.apach
jcs.auxiliary.CACHE.attributes.DiskPath=target/test-sandbox/concurrent_cache
jcs.auxiliary.CACHE.attributes.MaxPurgatorySize=-1
jcs.auxiliary.CACHE.attributes.MaxKeySize=-1
-jcs.auxiliary.CACHE.attributes.MaxRecycleBinSize=500
jcs.auxiliary.CACHE.attributes.ShutdownSpoolTimeLimit=60
jcs.auxiliary.CACHE.attributes.OptimizeAtRemoveCount=30000
jcs.auxiliary.CACHE.attributes.OptimizeOnShutdown=true
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestUDPDiscovery.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestUDPDiscovery.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
Binary files - no diff available.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/cache2.ccf
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/cache2.ccf?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/cache2.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/cache2.ccf Fri
Oct 21 16:05:15 2016
@@ -49,7 +49,7 @@ jcs.system.groupIdCache.elementattribute
# #############################################################
# ################# CACHE REGIONS AVAILABLE ###################
-# Regions preconfirgured for caching
+# Regions preconfigured for caching
jcs.region.testCache1=DC,RC
jcs.region.testCache1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.region.testCache1.cacheattributes.MaxObjects=1000
Modified: commons/proper/jcs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/changes/changes.xml?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/changes/changes.xml (original)
+++ commons/proper/jcs/trunk/src/changes/changes.xml Fri Oct 21 16:05:15 2016
@@ -22,6 +22,15 @@
<release version="2.0" date="unreleased" description="JDK 1.6 based
major release">
</release>
<release version="2.0-beta-2" date="2016-10-10" description="JDK 1.6
based major release (beta-2)">
+ <action dev="tv" type="remove">
+ Remove size limitation configuration of indexed cache recycle
bin
+ </action>
+ <action dev="tv" type="remove">
+ Replace SortedPreferentialArray with JDK ConcurrentSkipListSet
+ </action>
+ <action dev="tv" type="remove">
+ Replace SingleLinkedList with JDK ConcurrentLinkedQueue
+ </action>
<action issue="JCS-130" dev="tv" type="update">
Simplify management of auxiliary caches
</action>
Modified: commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml (original)
+++ commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml Fri Oct 21 16:05:15
2016
@@ -56,10 +56,9 @@
<p>
When items are removed from the disk
cache, the
location of the available block on the
storage file
- is recorded in a sorted preferential
array of a size
- not to exceed the maximum number of
keys allowed in
- memory. This allows the disk cache to
reuse empty
- spots, thereby keeping the file size to
a minimum.
+ is recorded in skip list set. This
allows the disk
+ cache to reuse empty spots, thereby keeping the file
+ size to a minimum.
</p>
</subsection>
@@ -159,13 +158,8 @@ jcs.auxiliary.DC.attributes.MaxPurgatory
Slots in the data file become empty
when items are
removed from the disk cache. The
indexed disk cache
keeps track of empty slots in the data
file, so they
- can be reused. The slot locations are
stored in a
- sorted preferential array -- the
recycle bin. The
- smallest items are removed from the
recycle bin when
- it reaches the specified limit. The
- MaxRecycleBinSize cannot be larger than
the
- MaxKeySize. If the MaxKeySize is less
than 0, the
- recycle bin will default to 5000.
+ can be reused. The slot locations are
stored in the
+ recycle bin.
</p>
<p>
If all the items put on disk are the
same size, then
@@ -177,11 +171,6 @@ jcs.auxiliary.DC.attributes.MaxPurgatory
written to disk, unusable gaps will
result.
Optimization is intended to remove
these gaps.
</p>
- <source>
- <![CDATA[
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=10000
- ]]>
- </source>
<p>
The Disk cache can be configured to
defragment the
data file at runtime. Since
defragmentation is only
@@ -240,7 +229,6 @@ jcs.auxiliary.DC.attributes.MaxPurgatory
jcs.auxiliary.DC.attributes.MaxKeySize=10000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.OptimizeOnShutdown=true
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=7500
jcs.auxiliary.DC.attributes.DiskLimitType=COUNT
]]>
</source>
@@ -299,7 +287,6 @@ jcs.auxiliary.DC2.attributes=org.apache.
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
-jcs.auxiliary.DC2.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.OptimizeOnShutdown=true
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
Modified: commons/proper/jcs/trunk/xdocs/IndexedDiskCacheProperties.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/IndexedDiskCacheProperties.xml?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/IndexedDiskCacheProperties.xml (original)
+++ commons/proper/jcs/trunk/xdocs/IndexedDiskCacheProperties.xml Fri Oct 21
16:05:15 2016
@@ -79,15 +79,6 @@
<td>N</td>
<td>false</td>
</tr>
- <tr>
- <td>MaxRecycleBinSize</td>
- <td> The maximum number of
empty spots the cache will keep track
- of. The smallest are
removed when the maximum size is reached.
- Keeping track of empty
spots on disk allows us to reuse spots,
- thereby keeping the
file from growing unncessarily.</td>
- <td>N</td>
- <td>5000</td>
- </tr>
</table>
</subsection>
<subsection name="Example Configuration">
@@ -101,7 +92,6 @@ jcs.auxiliary.DC.attributes.MaxKeySize=1
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.OptimizeOnShutdown=true
jcs.auxiliary.DC.attributes.ClearDiskOnStartup=false
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=7500
]]>
</source>
</subsection>
@@ -147,7 +137,6 @@ jcs.auxiliary.DC.attributes.MaxPurgatory
jcs.auxiliary.DC.attributes.MaxKeySize=10000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.OptimizeOnShutdown=true
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=7500
jcs.auxiliary.DC.attributes.EventQueueType=POOLED
jcs.auxiliary.DC.attributes.EventQueuePoolName=disk_cache_event_queue
Modified: commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml (original)
+++ commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml Fri Oct 21 16:05:15 2016
@@ -406,7 +406,6 @@ jcs.auxiliary.DC.attributes.DiskPath=/us
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC.attributes.MaxKeySize=10000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=7500
# Remote RMI Cache set up to failover
jcs.auxiliary.RFailover=
Modified: commons/proper/jcs/trunk/xdocs/getting_started/intro.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/getting_started/intro.xml?rev=1766059&r1=1766058&r2=1766059&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/getting_started/intro.xml (original)
+++ commons/proper/jcs/trunk/xdocs/getting_started/intro.xml Fri Oct 21
16:05:15 2016
@@ -183,7 +183,6 @@ jcs.auxiliary.DC.attributes=org.apache.c
jcs.auxiliary.DC.attributes.DiskPath=${user.dir}/jcs_swap
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.DC.attributes.MaxKeySize=1000000
-jcs.auxiliary.DC.attributes.MaxRecycleBinSize=5000
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.ShutdownSpoolTimeLimit=60
]]>
