Author: asmuts
Date: Thu Mar 16 16:16:04 2006
New Revision: 386491
URL: http://svn.apache.org/viewcvs?rev=386491&view=rev
Log:
--Removed old hsql disk cache.
--Added new hsql using new jdbc disk cache base.
--Tested the jdbc with mysql for several hours and found the need for a
removeall limiting setting. I added the ability to prohibit removeall commands
for the disk cache.
--Added new tests for hsql, found race condition with removeall resulting from
my changes earlier. added new locking for update and remove all to solve the
issue. Unit tests prove the fix.
--Added runtime shutdown hook for indexed disk cache.
--Added startup size the indexed disk cache stats.
Modified:
jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf
jakarta/jcs/trunk/src/test-conf/TestJDBCDiskCache.ccf
Modified: jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf?rev=386491&r1=386490&r2=386491&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf (original)
+++ jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf Thu Mar 16 16:16:04
2006
@@ -1,9 +1,9 @@
# Cache configuration for the 'TestHSQLDiskCache' test. The memory cache has a
# a maximum of 100 objects, so objects should get pushed into the disk cache
-jcs.default=HDC
+jcs.default=HSQL
jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.default.cacheattributes.MaxObjects=100
+jcs.default.cacheattributes.MaxObjects=0
jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=false
jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
@@ -16,8 +16,55 @@
jcs.default.elementattributes.IsRemote=true
jcs.default.elementattributes.IsLateral=true
-##### AUXILIARY CACHES
-# HSQL Disk Cache -- too slow as is
-jcs.auxiliary.HDC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory
-jcs.auxiliary.HDC.attributes=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheAttributes
-jcs.auxiliary.HDC.attributes.DiskPath=target/test-sandbox/hsql-disk-cache
+
+jcs.region.noRemoveAll=HSQL_NORA
+jcs.region.noRemoveAll.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.noRemoveAll.cacheattributes.MaxObjects=0
+jcs.region.noRemoveAll.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+
+
+
+##############################################################
+################## AUXILIARY CACHES AVAILABLE ################
+# HSQL disk cache
+jcs.auxiliary.HSQL=org.apache.jcs.auxiliary.disk.jdbc.hsql.HSQLDiskCacheFactory
+jcs.auxiliary.HSQL.attributes=org.apache.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes
+jcs.auxiliary.HSQL.attributes.userName=sa
+jcs.auxiliary.HSQL.attributes.password=
+jcs.auxiliary.HSQL.attributes.url=jdbc:hsqldb:
+jcs.auxiliary.HSQL.attributes.database=target/cache_hsql_db
+jcs.auxiliary.HSQL.attributes.driverClassName=org.hsqldb.jdbcDriver
+jcs.auxiliary.HSQL.attributes.tableName=JCS_STORE3
+jcs.auxiliary.HSQL.attributes.testBeforeInsert=false
+jcs.auxiliary.HSQL.attributes.maxActive=15
+jcs.auxiliary.HSQL.attributes.allowRemoveAll=true
+jcs.auxiliary.HSQL.attributes.MaxPurgatorySize=10000000
+jcs.auxiliary.HSQL.attributes.EventQueueType=POOLED
+jcs.auxiliary.HSQL.attributes.EventQueuePoolName=disk_cache_event_queue
+
+# HSQL disk cache, doesn't allow remove all
+jcs.auxiliary.HSQL_NORA=org.apache.jcs.auxiliary.disk.jdbc.hsql.HSQLDiskCacheFactory
+jcs.auxiliary.HSQL_NORA.attributes=org.apache.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes
+jcs.auxiliary.HSQL_NORA.attributes.userName=sa
+jcs.auxiliary.HSQL_NORA.attributes.password=
+jcs.auxiliary.HSQL_NORA.attributes.url=jdbc:hsqldb:
+jcs.auxiliary.HSQL_NORA.attributes.database=target/cache_hsql_db
+jcs.auxiliary.HSQL_NORA.attributes.driverClassName=org.hsqldb.jdbcDriver
+jcs.auxiliary.HSQL_NORA.attributes.tableName=JCS_STORE4
+jcs.auxiliary.HSQL_NORA.attributes.testBeforeInsert=false
+jcs.auxiliary.HSQL_NORA.attributes.maxActive=15
+jcs.auxiliary.HSQL_NORA.attributes.allowRemoveAll=false
+jcs.auxiliary.HSQL_NORA.attributes.MaxPurgatorySize=10000000
+jcs.auxiliary.HSQL_NORA.attributes.EventQueueType=POOLED
+jcs.auxiliary.HSQL_NORA.attributes.EventQueuePoolName=disk_cache_event_queue
+
+##############################################################
+################## OPTIONAL THREAD POOL CONFIGURATION #########
+# Disk Cache pool
+thread_pool.disk_cache_event_queue.useBoundary=false
+thread_pool.disk_cache_event_queue.boundarySize=500
+thread_pool.disk_cache_event_queue.maximumPoolSize=15
+thread_pool.disk_cache_event_queue.minimumPoolSize=10
+thread_pool.disk_cache_event_queue.keepAliveTime=3500
+thread_pool.disk_cache_event_queue.whenBlockedPolicy=RUN
+thread_pool.disk_cache_event_queue.startUpSize=10
Modified: jakarta/jcs/trunk/src/test-conf/TestJDBCDiskCache.ccf
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/TestJDBCDiskCache.ccf?rev=386491&r1=386490&r2=386491&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/test-conf/TestJDBCDiskCache.ccf (original)
+++ jakarta/jcs/trunk/src/test-conf/TestJDBCDiskCache.ccf Thu Mar 16 16:16:04
2006
@@ -28,6 +28,7 @@
jcs.auxiliary.JDBC.attributes.tableName=JCS_STORE2
jcs.auxiliary.JDBC.attributes.testBeforeInsert=false
jcs.auxiliary.JDBC.attributes.maxActive=15
+jcs.auxiliary.JDBC.attributes.allowRemoveAll=true
jcs.auxiliary.JDBC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.JDBC.attributes.EventQueueType=POOLED
jcs.auxiliary.JDBC.attributes.EventQueuePoolName=disk_cache_event_queue
|
