[jbosscache-commits] JBoss Cache SVN: r6252 - in core/trunk/src: main/java/org/jboss/cache/eviction and 12 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri Jul 11 16:15:20 EDT 2008
Author: mircea.markus
Date: 2008-07-11 16:15:20 -0400 (Fri, 11 Jul 2008)
New Revision: 6252
Modified:
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java
core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java
core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java
core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java
core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java
core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java
core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/jmx/LegacyConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java
core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java
core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionController.java
Log:
removed refrences to deprecated API (seconds based setters/getters) from surce code and tests
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -367,7 +367,7 @@
wakeupIntervalSeconds = EvictionConfig.WAKEUP_DEFAULT;
}
- ec.setWakeupIntervalSeconds(wakeupIntervalSeconds);
+ ec.setWakeupInterval(wakeupIntervalSeconds * 1000);
int eventQueueSize = 0;
temp = XmlConfigHelper.getTagContents(element,
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -567,8 +567,8 @@
if (region.getEvictionPolicyConfig() instanceof EvictionPolicyConfigBase)
{
EvictionPolicyConfigBase cfg = (EvictionPolicyConfigBase) region.getEvictionPolicyConfig();
- int minTTL = cfg.getMinTimeToLiveSeconds();
- return minTTL >= 1 && (entry.getModifiedTimeStamp() + (1000 * minTTL) > System.currentTimeMillis());
+ long minTTL = cfg.getMinTimeToLive();
+ return minTTL >= 1 && (entry.getModifiedTimeStamp() + minTTL > System.currentTimeMillis());
}
else
{
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -23,7 +23,7 @@
* nodes with expiration keys set, a warning is logged.
* <p/>
* If a node in the eviction region does not have an expiration value, then
- * {@link ExpirationConfiguration#getTimeToLiveSeconds} (if set) will be used.
+ * {@link org.jboss.cache.eviction.ExpirationConfiguration#getTimeToLive()} (if set) will be used.
* The expiration is updated when a node is added or updated.
* <p/>
* If there is no time-to-live set, and a node in the eviction region does not
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -40,36 +40,36 @@
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
// no idle or max time limit
- if (config.getTimeToLiveSeconds() == 0 && config.getMaxAgeSeconds() == 0) return false;
+ if (config.getTimeToLive() == 0 && config.getMaxAge() == 0) return false;
long currentTime = System.currentTimeMillis();
- if (config.getTimeToLiveSeconds() != 0)
+ if (config.getTimeToLive() != 0)
{
long idleTime = currentTime - entry.getModifiedTimeStamp();
if (trace)
{
log.trace("Node " + entry.getFqn() + " has been idle for " + idleTime + "ms");
}
- if ((idleTime >= (config.getTimeToLiveSeconds() * 1000)))
+ if ((idleTime >= (config.getTimeToLive())))
{
if (trace)
{
log.trace("Node " + entry.getFqn() + " should be evicted because of idle time");
- log.trace("Time to live in millies is: " + (config.getTimeToLiveSeconds() * 1000));
+ log.trace("Time to live in millies is: " + (config.getTimeToLive()));
log.trace("Config instance is: " + System.identityHashCode(config));
}
return true;
}
}
- if (config.getMaxAgeSeconds() != 0)
+ if (config.getMaxAge() != 0)
{
long objectLifeTime = currentTime - entry.getCreationTimeStamp();
if (trace)
{
log.trace("Node " + entry.getFqn() + " has been alive for " + objectLifeTime + "ms");
}
- if ((objectLifeTime >= (config.getMaxAgeSeconds() * 1000)))
+ if ((objectLifeTime >= config.getMaxAge()))
{
if (trace)
{
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -119,6 +119,7 @@
/**
* Use {@link #getMaxAge()}
+ * @deprecated
*/
@Deprecated
public int getMaxAgeSeconds()
Modified: core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -38,7 +38,7 @@
Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
cacheConfig.setCacheMode(Configuration.CacheMode.LOCAL);
cache = (CacheSPI<Object, Object>) new DefaultCacheFactory().createCache(cacheConfig, false);
- cache.getConfiguration().getEvictionConfig().setWakeupIntervalSeconds(1);
+ cache.getConfiguration().getEvictionConfig().setWakeupInterval(1000);
createNewRegion();
cache.start();
evController = new EvictionController(cache);
@@ -54,8 +54,8 @@
evRegConfig.setRegionFqn(Fqn.fromString("/" + TEST_NODES_ROOT));
evRegConfig.setEventQueueSize(100);
LRUConfiguration lruConfig = new LRUConfiguration();
- lruConfig.setMaxAgeSeconds(100000);
- lruConfig.setTimeToLiveSeconds(100000);
+ lruConfig.setMaxAge(100000000);
+ lruConfig.setTimeToLive(100000000);
lruConfig.setMaxNodes(3);
evRegConfig.setEvictionPolicyConfig(lruConfig);
evConfig.getEvictionRegionConfigs().add(evRegConfig);
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -343,12 +343,12 @@
private void configureEviction(Configuration cfg)
{
EvictionConfig ec = new EvictionConfig();
- ec.setWakeupIntervalSeconds(1);
+ ec.setWakeupInterval(1000);
EvictionRegionConfig erc = new EvictionRegionConfig();
erc.setRegionName("/_default_");
LRUConfiguration epc = new LRUConfiguration();
- epc.setMaxAgeSeconds(2);
- epc.setTimeToLiveSeconds(1);
+ epc.setMaxAge(2000);
+ epc.setTimeToLive(1000);
epc.setMaxNodes(1);
erc.setEvictionPolicyConfig(epc);
List<EvictionRegionConfig> ercs = new ArrayList<EvictionRegionConfig>();
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -48,10 +48,10 @@
{
EvictionConfig c = new EvictionConfig();
c.setDefaultEvictionPolicyClass(NullEvictionPolicy.class.getName());
- c.setWakeupIntervalSeconds(1);
+ c.setWakeupInterval(1000);
LRUConfiguration epc = new LRUConfiguration();
- epc.setMaxAgeSeconds(1);
- epc.setTimeToLiveSeconds(1);
+ epc.setMaxAge(1000);
+ epc.setTimeToLive(1000);
EvictionRegionConfig erc = new EvictionRegionConfig(fqn, epc);
c.setEvictionRegionConfigs(Collections.singletonList(erc));
return c;
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -57,7 +57,7 @@
assertFalse(ec1 == ec2);
assertEquals(4, ec2.getDefaultEventQueueSize());
- assertEquals(45, ec2.getWakeupIntervalSeconds());
+ assertEquals(45000, ec2.getWakeupInterval());
assertEquals(LRUPolicy.class.getName(), ec2.getDefaultEvictionPolicyClass());
List<EvictionRegionConfig> ercs1 = ec1.getEvictionRegionConfigs();
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -119,7 +119,6 @@
EvictionRegionConfig evictionRegionConfig = evConfig.getEvictionRegionConfigs().get(0);
assert evictionRegionConfig.getRegionName().equals(RegionManagerImpl.DEFAULT_REGION.toString());
assert evictionRegionConfig.getRegionName().equals(RegionManagerImpl.DEFAULT_REGION.toString());
- assert ((LRUConfiguration) evictionRegionConfig.getEvictionPolicyConfig()).getTimeToLiveSeconds() == 1000;
assert ((LRUConfiguration) evictionRegionConfig.getEvictionPolicyConfig()).getTimeToLive() == 1000000;
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -38,7 +38,7 @@
public class ConcurrentEvictionTest
{
private Cache<Integer, String> cache_;
- private int wakeupIntervalMillis_ = 0;
+ private long wakeupIntervalMillis_ = 0;
private String tmpDir = System.getProperty("java.io.tmpdir", "/tmp");
private String cacheLoaderDir = "/JBossCacheFileCacheLoader";
@@ -46,7 +46,7 @@
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupInterval();
if (wakeupIntervalMillis_ < 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
@@ -88,9 +88,9 @@
{
EvictionConfig ec = new EvictionConfig("org.jboss.cache.eviction.LRUPolicy");
ec.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.LRUPolicy");
- ec.setWakeupIntervalSeconds(5);
+ ec.setWakeupInterval(5000);
- EvictionRegionConfig erc = UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("_default_", 5000, 1000);
+ EvictionRegionConfig erc = UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("_default_", 5000, 1000000);
List<EvictionRegionConfig> erConfigs = new ArrayList<EvictionRegionConfig>();
erConfigs.add(erc);
ec.setEvictionRegionConfigs(erConfigs);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -32,7 +32,7 @@
public class ElementSizePolicyTest
{
CacheSPI<Object, Object> cache;
- int wakeupIntervalMillis = 0;
+ long wakeupIntervalMillis = 0;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
final long DURATION = 10000;
@@ -42,7 +42,7 @@
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
@@ -58,7 +58,7 @@
Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
EvictionConfig evConfig = conf.getEvictionConfig();
evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.ElementSizePolicy");
- evConfig.setWakeupIntervalSeconds(3);
+ evConfig.setWakeupInterval(3000);
evConfig.setDefaultEventQueueSize(200000);
List<EvictionRegionConfig> regionConfigs = new ArrayList<EvictionRegionConfig>();
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -32,7 +32,7 @@
public void testPolicyPerRegion() throws Exception
{
this.setupCache("configs/policyPerRegion-eviction.xml");
- assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
+ assertEquals(5000, cache.getConfiguration().getEvictionConfig().getWakeupInterval());
Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
@@ -66,8 +66,8 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(8, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
+ assertEquals(8000, ((LRUConfiguration) configuration).getTimeToLive());
+ assertEquals(10000, ((LRUConfiguration) configuration).getMaxAge());
// test the default region. use a region name that isn't defined explicitly in conf file.
region = regionManager.getRegion("/a/b/c", false);
@@ -77,8 +77,8 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- assertEquals(0, ((LRUConfiguration) configuration).getMaxAgeSeconds());
+ assertEquals(1000000, ((LRUConfiguration) configuration).getTimeToLive());
+ assertEquals(0, ((LRUConfiguration) configuration).getMaxAge());
cache.stop();
}
@@ -86,7 +86,7 @@
public void testMixedPolicies() throws Exception
{
this.setupCache("configs/mixedPolicy-eviction.xml");
- assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
+ assertEquals(5000, cache.getConfiguration().getEvictionConfig().getWakeupInterval());
Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
@@ -112,8 +112,8 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- assertEquals(0, ((LRUConfiguration) configuration).getMaxAgeSeconds());
+ assertEquals(1000000, ((LRUConfiguration) configuration).getTimeToLive());
+ assertEquals(0, ((LRUConfiguration) configuration).getMaxAge());
region = regionManager.getRegion("/maxAgeTest", false);
policy = region.getEvictionPolicy();
@@ -122,8 +122,8 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(8, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
+ assertEquals(8000, ((LRUConfiguration) configuration).getTimeToLive());
+ assertEquals(10000, ((LRUConfiguration) configuration).getMaxAge());
cache.stop();
}
@@ -131,7 +131,7 @@
public void testLegacyPolicyConfiguration() throws Exception
{
this.setupCache("configs/local-lru-eviction.xml");
- assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
+ assertEquals(5000, cache.getConfiguration().getEvictionConfig().getWakeupInterval());
Region region = regionManager.getRegion("/org/jboss/data", false);
EvictionPolicy policy = region.getEvictionPolicy();
@@ -140,7 +140,7 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
+ assertEquals(1000000, ((LRUConfiguration) configuration).getTimeToLive());
region = regionManager.getRegion("/org/jboss/test/data", false);
policy = region.getEvictionPolicy();
@@ -149,7 +149,7 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(4, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
+ assertEquals(4000, ((LRUConfiguration) configuration).getTimeToLive());
region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
@@ -158,7 +158,7 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(4, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
+ assertEquals(4000, ((LRUConfiguration) configuration).getTimeToLive());
region = regionManager.getRegion("/maxAgeTest", true);
policy = region.getEvictionPolicy();
@@ -167,8 +167,8 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(8, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
+ assertEquals(8000, ((LRUConfiguration) configuration).getTimeToLive());
+ assertEquals(10000, ((LRUConfiguration) configuration).getMaxAge());
// test the default region. use a region name that isn't defined explicitly in conf file.
region = regionManager.getRegion("/a/b/c", false);
@@ -178,8 +178,8 @@
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
- assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- assertEquals(0, ((LRUConfiguration) configuration).getMaxAgeSeconds());
+ assertEquals(1000000, ((LRUConfiguration) configuration).getTimeToLive());
+ assertEquals(0, ((LRUConfiguration) configuration).getMaxAge());
cache.stop();
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -47,7 +47,7 @@
{
Configuration conf = new Configuration();
EvictionConfig econf = new EvictionConfig(ExpirationPolicy.class.getName());
- econf.setWakeupIntervalSeconds(1);
+ econf.setWakeupInterval(1000);
conf.setEvictionConfig(econf);
cache = (CacheSPI<Object, Object>) new DefaultCacheFactory().createCache(conf, false);
cache.start();
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -34,7 +34,7 @@
public class FIFOPolicyTest
{
CacheSPI<Object, Object> cache;
- int wakeupIntervalMillis = 0;
+ long wakeupIntervalMillis = 0;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
final long DURATION = 10000;
@@ -44,7 +44,7 @@
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
@@ -59,7 +59,7 @@
{
Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
EvictionConfig evConfig = config.getEvictionConfig();
- evConfig.setWakeupIntervalSeconds(3);
+ evConfig.setWakeupInterval(3000);
evConfig.setDefaultEventQueueSize(20000);
evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.FIFOPolicy");
List<EvictionRegionConfig> erConfigs = new ArrayList<EvictionRegionConfig>();
@@ -181,7 +181,7 @@
}
}
- int period = wakeupIntervalMillis + 500;
+ long period = wakeupIntervalMillis + 500;
log("sleeping for " + period + "ms");
EvictionController evictionController = new EvictionController(cache);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -33,7 +33,7 @@
public class LFUPolicyTest
{
CacheSPI<Object, Object> cache;
- int wakeupIntervalMillis = 0;
+ long wakeupIntervalMillis = 0;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
final long DURATION = 10000;
@@ -43,7 +43,7 @@
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
@@ -58,7 +58,7 @@
{
Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
EvictionConfig evConfig = config.getEvictionConfig();
- evConfig.setWakeupIntervalSeconds(3);
+ evConfig.setWakeupInterval(3000);
evConfig.setDefaultEventQueueSize(200000);
List<EvictionRegionConfig> erConfigs = new ArrayList<EvictionRegionConfig>();
erConfigs.add(createEvictionRegionConfig("/_default_",500,10));
@@ -149,7 +149,7 @@
}
}
- int period = wakeupIntervalMillis + 500;
+ long period = wakeupIntervalMillis + 500;
log("sleeping for " + period + "ms");
TestingUtil.sleepThread(period);// it really depends the eviction thread time.
@@ -252,7 +252,7 @@
}
}
- int period = (wakeupIntervalMillis + 500);
+ long period = (wakeupIntervalMillis + 500);
log("period is " + period);
TestingUtil.sleepThread(period);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -123,7 +123,7 @@
Region region = regionManager.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
- config.setTimeToLiveSeconds(0);
+ config.setTimeToLive(0);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
@@ -145,7 +145,7 @@
Region region = regionManager.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
- config.setTimeToLiveSeconds(1);
+ config.setTimeToLive(1000);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
@@ -171,7 +171,7 @@
Region region = regionManager.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
- config.setTimeToLiveSeconds(1);
+ config.setTimeToLive(1000);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
@@ -199,8 +199,8 @@
Region region = regionManager.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
- config.setTimeToLiveSeconds(0);
- config.setMaxAgeSeconds(1);
+ config.setTimeToLive(0);
+ config.setMaxAge(1000);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
@@ -226,8 +226,8 @@
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
- config.setTimeToLiveSeconds(0);
- config.setMaxAgeSeconds(1);
+ config.setTimeToLive(0);
+ config.setMaxAge(1000);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
@@ -256,8 +256,8 @@
// Should have a maximum of 2 nodes.
config.setMaxNodes(2);
- config.setTimeToLiveSeconds(1);
- config.setMaxAgeSeconds(3);
+ config.setTimeToLive(1000);
+ config.setMaxAge(3000);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.ADD_NODE_EVENT));
@@ -301,8 +301,8 @@
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(2);
- config.setTimeToLiveSeconds(1);
- config.setMaxAgeSeconds(3);
+ config.setTimeToLive(1000);
+ config.setMaxAge(3000);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.REMOVE_NODE_EVENT));
@@ -336,9 +336,9 @@
Region region = regionManager.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
- config.setMaxAgeSeconds(1000);
+ config.setMaxAge(1000000);
config.setMaxNodes(0);
- config.setTimeToLiveSeconds(1000);
+ config.setTimeToLive(1000000);
for (int i = 0; i < 100; i++)
{
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -39,7 +39,7 @@
EvictionElementParser.parseEvictionPolicyConfig(element, config);
assertEquals(5000, config.getMaxNodes());
- assertEquals(1000, config.getTimeToLiveSeconds());
+ assertEquals(1000000, config.getTimeToLive());
}
public void testXMLParsing2() throws Exception
@@ -55,8 +55,8 @@
EvictionElementParser.parseEvictionPolicyConfig(element, config);
assertEquals(10000, config.getMaxNodes());
- assertEquals(8, config.getTimeToLiveSeconds());
- assertEquals(10, config.getMaxAgeSeconds());
+ assertEquals(8000, config.getTimeToLive());
+ assertEquals(10000, config.getMaxAge());
}
public void testXMLParsing3() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -27,9 +27,9 @@
public class LRUPolicyTest
{
CacheSPI<Object, Object> cache;
- int wakeupIntervalMillis_ = 0;
- int dataRegionTTLMillis = 6000;
- int testRegionTTLMillis = 4000;
+ long wakeupIntervalMillis = 0;
+ long dataRegionTTLMillis = 6000;
+ long testRegionTTLMillis = 4000;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
@@ -41,20 +41,20 @@
{
Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
EvictionConfig evConfig = conf.getEvictionConfig();
- evConfig.setWakeupIntervalSeconds(1);
+ evConfig.setWakeupInterval(1000);
List<EvictionRegionConfig> regionConfigs = new ArrayList<EvictionRegionConfig>();
- regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("/org/jboss/test/data", 5, dataRegionTTLMillis / 1000));
- regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("/test", 10000, testRegionTTLMillis / 1000));
+ regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("/org/jboss/test/data", 5, dataRegionTTLMillis));
+ regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("/test", 10000, testRegionTTLMillis));
evConfig.setEvictionRegionConfigs(regionConfigs);
conf.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
conf.setIsolationLevel(IsolationLevel.SERIALIZABLE);
cache = (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Object>().createCache(conf);
- wakeupIntervalMillis_ = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
- System.out.println("-- wakeupInterval is " + wakeupIntervalMillis_);
- if (wakeupIntervalMillis_ < 0)
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
+ System.out.println("-- wakeupInterval is " + wakeupIntervalMillis);
+ if (wakeupIntervalMillis < 0)
{
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
+ fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
}
t1_ex = t2_ex = null;
@@ -89,7 +89,7 @@
cache.put(fqn, str, str);
}
- TestingUtil.sleepThread(wakeupIntervalMillis_ + 500);
+ TestingUtil.sleepThread(wakeupIntervalMillis + 500);
for (int i = 0; i < 5; i++)
{
@@ -129,7 +129,7 @@
}
}
System.out.println(cache.toString());
- TestingUtil.sleepThread(wakeupIntervalMillis_ + 500);
+ TestingUtil.sleepThread(wakeupIntervalMillis + 500);
System.out.println(cache.toString());
String val = (String) cache.get(rootStr + "3", rootStr + "3");
assertNull("Node should be empty ", val);
@@ -148,7 +148,7 @@
cache.put(fqn, str, str);
}
- int period = (wakeupIntervalMillis_ / 2 + 500);
+ long period = (wakeupIntervalMillis / 2 + 500);
System.out.println("-- sleeping for " + period + "ms");
TestingUtil.sleepThread(period);
String str = rootStr + "7";
@@ -165,7 +165,7 @@
val = (String) cache.get(rootStr + "7", rootStr + "7");
System.out.println("-- val=" + val);
assertNotNull("Node should not be empty ", val);
- period = dataRegionTTLMillis + wakeupIntervalMillis_ + 500; // this is the TTL for nodes + time for the eviction thread to kick in
+ period = dataRegionTTLMillis + wakeupIntervalMillis + 500; // this is the TTL for nodes + time for the eviction thread to kick in
System.out.println("-- sleeping for " + period + "ms");
TestingUtil.sleepThread(period);
val = (String) cache.get(rootStr + "7", rootStr + "7");
@@ -183,7 +183,7 @@
cache.put(fqn, str, str);
}
- int period = (wakeupIntervalMillis_ / 2 + 500);
+ long period = (wakeupIntervalMillis / 2 + 500);
System.out.println("-- period is " + period);
// TestingUtil.sleepThread(period); // it really depends the eviction thread time.
String str1 = rootStr + "7";
@@ -199,7 +199,7 @@
String val = (String) cache.get(rootStr + "7/7", rootStr + "7/7");
assertNotNull("Node should not be empty ", val);
cache.removeNode(fqn1);
- TestingUtil.sleepThread(wakeupIntervalMillis_ + 500);
+ TestingUtil.sleepThread(wakeupIntervalMillis + 500);
val = (String) cache.get(rootStr + "7/7", rootStr + "7/7");
assertNull("Node should be empty ", val);
}
@@ -216,7 +216,7 @@
// Give eviction time to run a few times, then confirm parent
// is completely gone
- int period = (wakeupIntervalMillis_ + testRegionTTLMillis) * 2;
+ long period = (wakeupIntervalMillis + testRegionTTLMillis) * 2;
System.out.println("-- Sleeping for " + period);
TestingUtil.sleepThread(period);
assertFalse("Parent not completely removed", cache.getRoot().hasChild(parent));
@@ -304,7 +304,7 @@
}
// wait for an eviction
- TestingUtil.sleepThread(2 * (wakeupIntervalMillis_ + testRegionTTLMillis));
+ TestingUtil.sleepThread(2 * (wakeupIntervalMillis + testRegionTTLMillis));
String val = (String) cache.get(rootStr + "3", rootStr + "3");
assertNull("Node should be empty ", val);
@@ -321,7 +321,7 @@
cache.removeNode(Fqn.ROOT);
// wait for an eviction
- TestingUtil.sleepThread(2 * wakeupIntervalMillis_ + 1000);
+ TestingUtil.sleepThread(2 * wakeupIntervalMillis + 1000);
val = (String) cache.get(rootStr + "3", rootStr + "3");
assertNull("Node should be empty ", val);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -32,7 +32,7 @@
public class MRUPolicyTest
{
CacheSPI<Object, Object> cache;
- int wakeupIntervalMillis = 0;
+ long wakeupIntervalMillis = 0;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
final long DURATION = 10000;
@@ -42,7 +42,7 @@
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
@@ -63,7 +63,7 @@
{
Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
EvictionConfig evConfig = config.getEvictionConfig();
- evConfig.setWakeupIntervalSeconds(3);
+ evConfig.setWakeupInterval(3000);
evConfig.setDefaultEventQueueSize(200000);
evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.MRUPolicy");
List<EvictionRegionConfig> evictionRegionConfigs = new ArrayList<EvictionRegionConfig>();
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -60,13 +60,13 @@
{
Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
EvictionConfig evConfig = config.getEvictionConfig();
- evConfig.setWakeupIntervalSeconds(1);
+ evConfig.setWakeupInterval(1000);
evConfig.setDefaultEventQueueSize(200000);
evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.NullEvictionPolicy");
List<EvictionRegionConfig> regionConfigs = new ArrayList<EvictionRegionConfig>();
regionConfigs.add(buildEvictionRegionConfig("/_default_"));
regionConfigs.add(buildEvictionRegionConfig("/test"));
- regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("/lru", 10000,1));
+ regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEvictionRegionConfig("/lru", 10000,1000));
evConfig.setEvictionRegionConfigs(regionConfigs);
config.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
config.setIsolationLevel(IsolationLevel.SERIALIZABLE);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -52,13 +52,13 @@
public class ProgrammaticLRUPolicyTest
{
CacheSPI<Object, Object> cache;
- int wakeupIntervalMillis = 0;
+ long wakeupIntervalMillis = 0;
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
@@ -72,7 +72,7 @@
Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
CacheFactory<Object, Integer> instance = new DefaultCacheFactory();
cache = (CacheSPI) instance.createCache(conf, false);
- conf.getEvictionConfig().setWakeupIntervalSeconds(5);
+ conf.getEvictionConfig().setWakeupInterval(5000);
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZABLE);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -22,7 +22,7 @@
public class ReplicatedLRUPolicyTest
{
CacheSPI<Object, Object> cache_, cache1_, cache2_;
- int wakeupIntervalMillis_ = 0;
+ long wakeupIntervalMillis = 0;
EvictionListener listener_ = new EvictionListener();
@BeforeMethod(alwaysRun = true)
@@ -40,11 +40,11 @@
cache2_.getConfiguration().setUseRegionBasedMarshalling(true);
cache2_.start();
- wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
- log("wakeupInterval is " + wakeupIntervalMillis_);
- if (wakeupIntervalMillis_ <= 0)
+ wakeupIntervalMillis = cache_.getConfiguration().getEvictionConfig().getWakeupInterval();
+ log("wakeupInterval is " + wakeupIntervalMillis);
+ if (wakeupIntervalMillis <= 0)
{
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
+ fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
}
}
@@ -83,7 +83,7 @@
cache_.put(fqn, str, str);
}
- TestingUtil.sleepThread(2 * wakeupIntervalMillis_);
+ TestingUtil.sleepThread(2 * wakeupIntervalMillis);
String val = (String) cache_.get(rootStr + "3", rootStr + "3");
assertNull("DataNode should be evicted already ", val);
val = (String) cache2_.get(rootStr + "3", rootStr + "3");
@@ -100,11 +100,11 @@
cache_.put(fqn, str, str);
}
- TestingUtil.sleepThread(wakeupIntervalMillis_ - 1000);
+ TestingUtil.sleepThread(wakeupIntervalMillis - 1000);
String str = rootStr + "7";
Fqn fqn = Fqn.fromString(str);
cache_.get(fqn, str);
- TestingUtil.sleepThread(wakeupIntervalMillis_);
+ TestingUtil.sleepThread(wakeupIntervalMillis);
String val = (String) cache_.get(rootStr + "3", rootStr + "3");
assertNull("DataNode should be empty ", val);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -16,7 +16,7 @@
protected EvictionPolicyConfigBase getEvictionPolicyConfig()
{
LRUConfiguration cfg = new LRUConfiguration();
- cfg.setTimeToLiveSeconds(1);
+ cfg.setTimeToLive(1000);
return cfg;
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -54,7 +54,7 @@
// cache-wide
EvictionConfig ec = new EvictionConfig();
- ec.setWakeupIntervalSeconds(1);
+ ec.setWakeupInterval(1000);
ec.setEvictionRegionConfigs(evictionRegionConfigs);
cache = new DefaultCacheFactory().createCache(false);
@@ -83,7 +83,7 @@
public void testWithMinimumTTL()
{
- ((EvictionPolicyConfigBase) cache.getConfiguration().getEvictionConfig().getEvictionRegionConfigs().get(0).getEvictionPolicyConfig()).setMinTimeToLiveSeconds(3);
+ ((EvictionPolicyConfigBase) cache.getConfiguration().getEvictionConfig().getEvictionRegionConfigs().get(0).getEvictionPolicyConfig()).setMinTimeToLive(3000);
cache.start();
cache.put(fqn, "k", "v");
Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -160,14 +160,14 @@
}
- public static EvictionRegionConfig buildLruEvictionRegionConfig(String regionNaame, int maxNodes, int timeToLive)
+ public static EvictionRegionConfig buildLruEvictionRegionConfig(String regionNaame, int maxNodes, long timeToLive)
{
EvictionRegionConfig erc = new EvictionRegionConfig();
erc.setRegionName(regionNaame);
LRUConfiguration lruConfig = new LRUConfiguration();
lruConfig.setEvictionPolicyClass("org.jboss.cache.eviction.LRUPolicy");
if (maxNodes >= 0) lruConfig.setMaxNodes(maxNodes);
- if (timeToLive >= 0) lruConfig.setTimeToLiveSeconds(timeToLive);
+ if (timeToLive >= 0) lruConfig.setTimeToLive(timeToLive);
erc.setEvictionPolicyConfig(lruConfig);
return erc;
}
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -41,7 +41,7 @@
// the FIFO policy cfg
FIFOConfiguration cfg = new FIFOConfiguration();
cfg.setMaxNodes(1);
- cfg.setMinTimeToLiveSeconds(0);
+ cfg.setMinTimeToLive(0);
// the region configuration
EvictionRegionConfig regionCfg = new EvictionRegionConfig();
@@ -55,7 +55,7 @@
EvictionConfig ec = new EvictionConfig();
- ec.setWakeupIntervalSeconds(2);
+ ec.setWakeupInterval(2000);
ec.setEvictionRegionConfigs(evictionRegionConfigs);
c1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC);
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/LegacyConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/LegacyConfigurationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/LegacyConfigurationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -172,7 +172,7 @@
assertEquals("EvictionPolicyConfig", getEvictionPolicyConfig().toString(), wrapper.getEvictionPolicyConfig().toString());
EvictionConfig ec = c.getEvictionConfig();
assertEquals("EC queue size", 20000, ec.getDefaultEventQueueSize());
- assertEquals("EC wakeup", 5, ec.getWakeupIntervalSeconds());
+ assertEquals("EC wakeup", 5000, ec.getWakeupInterval());
assertEquals("EC default pol", LRUPolicy.class.getName(), ec.getDefaultEvictionPolicyClass());
List<EvictionRegionConfig> ercs = ec.getEvictionRegionConfigs();
EvictionRegionConfig erc = ercs.get(0);
@@ -181,7 +181,7 @@
LRUConfiguration lru = (LRUConfiguration) erc.getEvictionPolicyConfig();
assertEquals("EPC0 pol", LRUPolicy.class.getName(), lru.getEvictionPolicyClass());
assertEquals("EPC0 maxnodes", 5000, lru.getMaxNodes());
- assertEquals("EPC0 ttl", 1000, lru.getTimeToLiveSeconds());
+ assertEquals("EPC0 ttl", 1000000, lru.getTimeToLive());
erc = ercs.get(1);
assertEquals("ERC1 name", "/org/jboss/data", erc.getRegionName());
assertEquals("ERC1 queue size", 20000, erc.getEventQueueSize());
@@ -200,8 +200,8 @@
lru = (LRUConfiguration) erc.getEvictionPolicyConfig();
assertEquals("EPC3 pol", LRUPolicy.class.getName(), lru.getEvictionPolicyClass());
assertEquals("EPC3 maxnodes", 10000, lru.getMaxNodes());
- assertEquals("EPC3 maxage", 10, lru.getMaxAgeSeconds());
- assertEquals("EPC3 ttl", 8, lru.getTimeToLiveSeconds());
+ assertEquals("EPC3 maxage", 10000, lru.getMaxAge());
+ assertEquals("EPC3 ttl", 8000, lru.getTimeToLive());
}
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -111,13 +111,13 @@
EvictionConfig ec = new EvictionConfig();
ec.setDefaultEvictionPolicyClass(LRUPolicy.class.getName());
- ec.setWakeupIntervalSeconds(1000); // a long time; really disabled
+ ec.setWakeupInterval(1000000); // a long time; really disabled
EvictionRegionConfig erc = new EvictionRegionConfig();
erc.setRegionFqn(Fqn.ROOT);
erc.setRegionName("_default_");
LRUConfiguration epc = new LRUConfiguration();
epc.setMaxNodes(1000);
- epc.setTimeToLiveSeconds(1000);
+ epc.setTimeToLive(1000000);
erc.setEvictionPolicyConfig(epc);
List<EvictionRegionConfig> ercs = new ArrayList<EvictionRegionConfig>();
ercs.add(erc);
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -141,13 +141,13 @@
EvictionConfig ec = new EvictionConfig();
ec.setDefaultEvictionPolicyClass(LRUPolicy.class.getName());
- ec.setWakeupIntervalSeconds(1000); // a long time; really disabled
+ ec.setWakeupInterval(1000000); // a long time; really disabled
EvictionRegionConfig erc = new EvictionRegionConfig();
erc.setRegionFqn(Fqn.ROOT);
erc.setRegionName("_default_");
LRUConfiguration epc = new LRUConfiguration();
epc.setMaxNodes(1000);
- epc.setTimeToLiveSeconds(1000);
+ epc.setTimeToLive(1000000);
erc.setEvictionPolicyConfig(epc);
List<EvictionRegionConfig> ercs = new ArrayList<EvictionRegionConfig>();
ercs.add(erc);
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -32,7 +32,7 @@
public class BasicPassivationTest
{
CacheSPI cache;
- int wakeupIntervalMillis_ = 0;
+ long wakeupIntervalMillis = 0;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
final long DURATION = 10000;
@@ -45,11 +45,11 @@
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis_ = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
- log("wakeupInterval is " + wakeupIntervalMillis_);
- if (wakeupIntervalMillis_ < 0)
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
+ log("wakeupInterval is " + wakeupIntervalMillis);
+ if (wakeupIntervalMillis < 0)
{
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
+ fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
}
t1_ex = t2_ex = null;
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -30,16 +30,16 @@
public class ConcurrentPassivationTest
{
private CacheSPI cache;
- private int wakeupIntervalMillis_ = 0;
+ private long wakeupIntervalMillis = 0;
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
initCaches();
- wakeupIntervalMillis_ = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
- if (wakeupIntervalMillis_ < 0)
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
+ if (wakeupIntervalMillis < 0)
{
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
+ fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
}
}
@@ -72,9 +72,9 @@
}
// Loop for long enough to have 5 runs of the eviction thread
- long loopDone = System.currentTimeMillis() + (5 * wakeupIntervalMillis_);
+ long loopDone = System.currentTimeMillis() + (5 * wakeupIntervalMillis);
- System.out.println("Initialised; Loop for " + (5 * wakeupIntervalMillis_) + " millis");
+ System.out.println("Initialised; Loop for " + (5 * wakeupIntervalMillis) + " millis");
while (System.currentTimeMillis() < loopDone)
{
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -36,7 +36,7 @@
{
CacheSPI<String, String> cache;
protected final static Log log = LogFactory.getLog(LocalPassivationIntegrationTest.class);
- int wakeupIntervalMillis_ = 0;
+ long wakeupIntervalMillis = 0;
PassivationListener listener_;
private static final int LISTENER_WAIT_TIME = 200; // needed since notifications are delivered asynchronously
@@ -56,11 +56,11 @@
cache.getNotifier().addCacheListener(listener_);
listener_.resetCounter();
- wakeupIntervalMillis_ = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
- log("wakeupInterval is " + wakeupIntervalMillis_);
- if (wakeupIntervalMillis_ <= 0)
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
+ log("wakeupInterval is " + wakeupIntervalMillis);
+ if (wakeupIntervalMillis <= 0)
{
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
+ fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -87,7 +87,7 @@
protected void configureEviction() throws Exception
{
EvictionConfig ec = new EvictionConfig();
- ec.setWakeupIntervalSeconds(1);
+ ec.setWakeupInterval(1000);
List<EvictionRegionConfig> ercs = new ArrayList<EvictionRegionConfig>();
@@ -95,7 +95,7 @@
erc.setRegionFqn(RegionManagerImpl.DEFAULT_REGION);
LRUConfiguration epc = new LRUConfiguration();
epc.setMaxNodes(0);
- epc.setTimeToLiveSeconds(5);
+ epc.setTimeToLive(5000);
erc.setEvictionPolicyConfig(epc);
ercs.add(erc);
@@ -103,7 +103,7 @@
erc.setRegionFqn(BASE);
epc = new LRUConfiguration();
epc.setMaxNodes(0);
- epc.setTimeToLiveSeconds(1);
+ epc.setTimeToLive(1000);
erc.setEvictionPolicyConfig(epc);
ercs.add(erc);
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -60,7 +60,7 @@
private CacheSPI<String, String> cache1;
private CacheSPI<String, String> cache2;
protected final static Log log = LogFactory.getLog(ReplicatedPassivationIntegrationTest.class);
- int wakeupIntervalMillis = 0;
+ long wakeupIntervalMillis = 0;
PassivationListener listener;
Fqn base = Fqn.fromString("/org/jboss/test/data");
@@ -84,7 +84,7 @@
cache2.getNotifier().addCacheListener(listener);
listener.resetCounter();
- wakeupIntervalMillis = cache2.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache2.getConfiguration().getEvictionConfig().getWakeupInterval();
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis <= 0)
{
@@ -115,7 +115,7 @@
private EvictionConfig buildEvictionConfig() throws Exception
{
EvictionConfig cfg = new EvictionConfig();
- cfg.setWakeupIntervalSeconds(1);
+ cfg.setWakeupInterval(1000);
cfg.setDefaultEventQueueSize(200000);
cfg.setDefaultEvictionPolicyClass(LRUPolicy.class.getName());
List<EvictionRegionConfig> erc = new LinkedList<EvictionRegionConfig>();
@@ -125,14 +125,14 @@
region1.setRegionFqn(Fqn.ROOT);
LRUConfiguration epc1 = new LRUConfiguration();
epc1.setMaxNodes(5000);
- epc1.setTimeToLiveSeconds(3);
+ epc1.setTimeToLive(3000);
region1.setEvictionPolicyConfig(epc1);
EvictionRegionConfig region2 = new EvictionRegionConfig();
region2.setRegionFqn(base);
LRUConfiguration epc2 = new LRUConfiguration();
epc2.setMaxNodes(100);
- epc2.setTimeToLiveSeconds(3);
+ epc2.setTimeToLive(3000);
region2.setEvictionPolicyConfig(epc2);
erc.add(region1);
Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionController.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionController.java 2008-07-11 17:01:51 UTC (rev 6251)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionController.java 2008-07-11 20:15:20 UTC (rev 6252)
@@ -70,17 +70,17 @@
{
throw new IllegalStateException("No such region!");
}
- int ttl = 0;
+ long ttl = 0;
if (erConfig.getEvictionPolicyConfig() instanceof LRUConfiguration)
{
LRUConfiguration configuration = (LRUConfiguration) erConfig.getEvictionPolicyConfig();
- ttl = configuration.getTimeToLiveSeconds();
+ ttl = configuration.getTimeToLive();
}
else
{
throw new IllegalArgumentException("Only LRU being handled for now; please add other implementations here");
}
- TestingUtil.sleepThread(ttl * 1000 + 500);
+ TestingUtil.sleepThread(ttl + 500);
evictRegion(region);
}
More information about the jbosscache-commits
mailing list