[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/eviction ...
Manik Surtani
msurtani at jboss.com
Tue Nov 14 09:17:10 EST 2006
User: msurtani
Date: 06/11/14 09:17:10
Modified: tests/functional/org/jboss/cache/eviction
FIFOAlgorithmTest.java MRUPolicyTest.java
LFUAlgorithmTest.java FIFOPolicyTest.java
ElementSizeAlgorithmTest.java LRUAlgorithmTest.java
RegionTest.java EvictionConfigurationTest.java
RegionManagerTest.java LFUPolicyTest.java
LRUPolicyTest.java ProgrammaticLRUPolicyTest.java
ConcurrentEvictionTest.java MRUAlgorithmTest.java
ReplicatedLRUPolicyTest.java
ElementSizePolicyTest.java
Log:
Merged eviction.Region and Region, eviction.RegionManager and RegionManager (lots of changes, now needs v. thorough testing)
Revision Changes Path
1.6 +11 -9 JBossCache/tests/functional/org/jboss/cache/eviction/FIFOAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/FIFOAlgorithmTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- FIFOAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.5
+++ FIFOAlgorithmTest.java 14 Nov 2006 14:17:10 -0000 1.6
@@ -8,6 +8,8 @@
import junit.framework.TestCase;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
import java.util.Iterator;
@@ -15,7 +17,7 @@
* Unit tests for FIFOAlgorithm.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class FIFOAlgorithmTest extends TestCase
{
@@ -38,7 +40,7 @@
config.setMaxNodes(0);
regionManager = new RegionManager();
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
- regionManager.createRegion("/a/b", config);
+ regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
public void tearDown() throws Exception
@@ -48,14 +50,14 @@
public void testMaxNodes1() throws Exception
{
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
FIFOConfiguration config = (FIFOConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(5);
for (int i = 0; i < 8; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algo.process(region);
@@ -77,12 +79,12 @@
for (int i = 3; i < 8; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setVisitedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
}
for (int i = 3; i < 5; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setVisitedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
}
algo.process(region);
@@ -102,14 +104,14 @@
public void testMaxNodes2() throws Exception
{
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
FIFOConfiguration config = (FIFOConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(50000);
for (int i = 0; i < 50000; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algo.process(region);
@@ -128,7 +130,7 @@
for (int i = 50000; i < 60000; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algo.process(region);
1.9 +2 -2 JBossCache/tests/functional/org/jboss/cache/eviction/MRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/MRUPolicyTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- MRUPolicyTest.java 15 Sep 2006 15:11:35 -0000 1.8
+++ MRUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.9
@@ -16,7 +16,7 @@
* Unit tests for MRUPolicy.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class MRUPolicyTest extends TestCase
{
@@ -32,7 +32,7 @@
super.setUp();
System.out.println("Test " + getName() + "\n");
initCaches();
- wakeupIntervalMillis = cache.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
1.5 +73 -65 JBossCache/tests/functional/org/jboss/cache/eviction/LFUAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LFUAlgorithmTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LFUAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.4
+++ LFUAlgorithmTest.java 14 Nov 2006 14:17:10 -0000 1.5
@@ -10,6 +10,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
import java.util.Iterator;
@@ -17,7 +19,7 @@
* Unit test for LFUAlgorithm.
*
* @author Daniel Huang - dhuang at jboss.org - 10/2005
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class LFUAlgorithmTest extends TestCase
{
@@ -38,7 +40,7 @@
LFUConfiguration config = new LFUConfiguration();
regionManager = new RegionManager();
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
- regionManager.createRegion("/a/b", config);
+ regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
public void tearDown() throws Exception
@@ -50,13 +52,12 @@
{
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(20);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
-
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
try
{
algo.process(region);
@@ -75,13 +76,13 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
config.setMinNodes(20);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
try
{
@@ -94,8 +95,9 @@
}
assertEquals("Queue size should be ", 1, algo.getEvictionQueue().getNumberOfNodes());
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
+
try
{
@@ -111,7 +113,7 @@
public void testMaxNode3() throws Exception
{
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(15000);
@@ -119,10 +121,11 @@
for (int i = 0; i < 20000; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
+
if ((i % 2) == 0)
{
- region.setVisitedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
}
}
@@ -139,16 +142,16 @@
Fqn fqn3 = Fqn.fromString("/a/b/c/d/e");
Fqn fqn4 = Fqn.fromString("/a/b/c/d/e/f");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(2);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
- region.setAddedNode(fqn4);
+ 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));
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.ADD_NODE_EVENT));
algo.process(region);
@@ -160,14 +163,14 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(0);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
algo.process(region);
@@ -188,21 +191,21 @@
Fqn fqn10 = Fqn.fromString("/a/b/c/d/e/f/g/h/i/j/k/l/m");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(100);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
- region.setAddedNode(fqn4);
- region.setAddedNode(fqn5);
- region.setAddedNode(fqn6);
- region.setAddedNode(fqn7);
- region.setAddedNode(fqn8);
- region.setAddedNode(fqn9);
- region.setAddedNode(fqn10);
+ 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));
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn5, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn6, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn7, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn8, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn9, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn10, NodeEventType.ADD_NODE_EVENT));
algo.process(region);
LFUQueue queue = (LFUQueue) algo.evictionQueue;
@@ -217,29 +220,31 @@
}
// fqn1 visited 4 additional times.
- region.setVisitedNode(fqn1);
- region.setVisitedNode(fqn1);
- region.setVisitedNode(fqn1);
- region.setVisitedNode(fqn1);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.VISIT_NODE_EVENT));
// fqn2 visited 3 additional times.
- region.setVisitedNode(fqn2);
- region.setVisitedNode(fqn2);
- region.setVisitedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.VISIT_NODE_EVENT));
// fqn3 visited 1 additional time.
- region.setVisitedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.VISIT_NODE_EVENT));
+
// fqn4 visited 2 additional times.
- region.setVisitedNode(fqn4);
- region.setVisitedNode(fqn4);
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.VISIT_NODE_EVENT));
// fqn9 visited 1 additional time.
- region.setVisitedNode(fqn9);
+ region.putNodeEvent(new EvictedEventNode(fqn9, NodeEventType.VISIT_NODE_EVENT));
+
// fqn10 visited 2 additional times.
- region.setVisitedNode(fqn10);
- region.setVisitedNode(fqn10);
+ region.putNodeEvent(new EvictedEventNode(fqn10, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn10, NodeEventType.VISIT_NODE_EVENT));
algo.process(region);
System.out.println();
@@ -280,8 +285,8 @@
Fqn fqn11 = Fqn.fromString("/a");
Fqn fqn12 = Fqn.fromString("/a/b");
- region.setAddedNode(fqn11);
- region.setAddedNode(fqn12);
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn12, NodeEventType.ADD_NODE_EVENT));
algo.process(region);
System.out.println();
@@ -318,10 +323,10 @@
assertEquals(12, algo.getEvictionQueue().getNumberOfNodes());
- region.setRemovedNode(fqn1);
- region.setRemovedNode(fqn11);
- region.setRemovedNode(fqn12);
- region.setRemovedNode(fqn10);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.REMOVE_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.REMOVE_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn12, NodeEventType.REMOVE_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn10, NodeEventType.REMOVE_NODE_EVENT));
algo.process(region);
@@ -355,19 +360,22 @@
assertEquals(8, algo.getEvictionQueue().getNumberOfNodes());
//test add/visit/remove combination
- region.setAddedNode(fqn11);
- region.setVisitedNode(fqn11);
- region.setVisitedNode(fqn11);
- region.setVisitedNode(fqn11);
- region.setVisitedNode(fqn11);
- region.setVisitedNode(fqn11);
- region.setVisitedNode(fqn4);
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn11, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.VISIT_NODE_EVENT));
+
+
// purposefully revisit a node that has been removed. assert that it is readded.
- region.setVisitedNode(fqn1);
- region.setVisitedNode(fqn1);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.VISIT_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.VISIT_NODE_EVENT));
+
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.REMOVE_NODE_EVENT));
- region.setRemovedNode(fqn3);
algo.process(region);
@@ -402,7 +410,7 @@
public void testEvictionQueueSortOrder2() throws Exception
{
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
@@ -410,7 +418,7 @@
for (int i = 0; i < 10000; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algo.process(region);
@@ -430,7 +438,7 @@
if ((i % 2) == 0)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setVisitedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
}
}
1.8 +2 -2 JBossCache/tests/functional/org/jboss/cache/eviction/FIFOPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/FIFOPolicyTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- FIFOPolicyTest.java 15 Sep 2006 15:11:35 -0000 1.7
+++ FIFOPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.8
@@ -17,7 +17,7 @@
* Unit tests for FIFOPolicy.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class FIFOPolicyTest extends TestCase
{
@@ -37,7 +37,7 @@
{
super.setUp();
initCaches();
- wakeupIntervalMillis = cache.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
1.4 +13 -10 JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ElementSizeAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.3
+++ ElementSizeAlgorithmTest.java 14 Nov 2006 14:17:10 -0000 1.4
@@ -8,12 +8,14 @@
import junit.framework.TestCase;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
import java.util.Iterator;
/**
* @author Daniel Huang
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ElementSizeAlgorithmTest extends TestCase
{
@@ -35,7 +37,7 @@
// We have to configure maxElementsPerNode!!
config.setMaxElementsPerNode(0);
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
- regionManager.createRegion("/a/b", config);
+ regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
public void tearDown() throws Exception
@@ -45,7 +47,7 @@
public void testMaxElements() throws Exception
{
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
ElementSizeConfiguration config = (ElementSizeConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(10);
config.setMaxElementsPerNode(6);
@@ -53,12 +55,12 @@
for (int i = 0; i < 10; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
if (i % 2 == 0)
{
for (int k = 0; k < i; k++)
{
- region.putNodeEvent(fqn, NodeEventType.ADD_ELEMENT_EVENT);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_ELEMENT_EVENT));
}
}
}
@@ -89,8 +91,8 @@
for (int i = 0; i < 7; i++)
{
- region.putNodeEvent(Fqn.fromString("/a/b/9"), NodeEventType.ADD_ELEMENT_EVENT);
- region.putNodeEvent(Fqn.fromString("/a/b/7"), NodeEventType.ADD_ELEMENT_EVENT);
+ region.putNodeEvent(new EvictedEventNode(Fqn.fromString("/a/b/9"), NodeEventType.ADD_ELEMENT_EVENT));
+ region.putNodeEvent(new EvictedEventNode(Fqn.fromString("/a/b/7"), NodeEventType.ADD_ELEMENT_EVENT));
}
algo.process(region);
@@ -100,7 +102,7 @@
public void testMaxNodesAndMaxElements() throws Exception
{
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
ElementSizeConfiguration config = (ElementSizeConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(10);
config.setMaxElementsPerNode(100);
@@ -108,10 +110,11 @@
for (int i = 0; i < 20; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
for (int k = 0; k < i; k++)
{
- region.putNodeEvent(fqn, NodeEventType.ADD_ELEMENT_EVENT);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_ELEMENT_EVENT));
+
}
}
1.7 +59 -50 JBossCache/tests/functional/org/jboss/cache/eviction/LRUAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LRUAlgorithmTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- LRUAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.6
+++ LRUAlgorithmTest.java 14 Nov 2006 14:17:10 -0000 1.7
@@ -4,6 +4,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.Fqn;
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.Region;
import org.jboss.cache.misc.TestingUtil;
/**
@@ -34,7 +36,7 @@
config_.setTimeToLiveSeconds(0);
regionManager_ = new RegionManager();
- regionManager_.createRegion("/a/b", config_);
+ regionManager_.getRegion("/a/b", true).setEvictionPolicy(config_);
/*
try {
Thread.sleep(10000);
@@ -57,11 +59,11 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
try
{
@@ -74,8 +76,8 @@
}
assertEquals("Queue size should be ", 1, algo_.getEvictionQueue().getNumberOfNodes());
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
try
{
@@ -97,11 +99,11 @@
{
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
try
{
@@ -124,11 +126,11 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
try
{
@@ -141,8 +143,8 @@
}
assertEquals("Queue size should be ", 1, algo_.getEvictionQueue().getNumberOfNodes());
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
try
{
@@ -163,12 +165,12 @@
{
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(0);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
TestingUtil.sleepThread(2000);
try
{
@@ -191,13 +193,14 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(1);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ 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));
+
try
{
algo_.process(region);
@@ -229,13 +232,14 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(1);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ 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));
+
try
{
algo_.process(region);
@@ -247,7 +251,7 @@
}
assertEquals("Queue size #1: ", 3, algo_.getEvictionQueue().getNumberOfNodes());
TestingUtil.sleepThread(2000);
- region.setVisitedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.VISIT_NODE_EVENT));
try
{
algo_.process(region);
@@ -270,14 +274,15 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(0);
config.setMaxAgeSeconds(1);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ 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));
+
algo_.process(region);
assertEquals("Queue size #1: ", 3, algo_.getEvictionQueue().getNumberOfNodes());
TestingUtil.sleepThread(2000);
@@ -295,15 +300,16 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(0);
config.setMaxAgeSeconds(2);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ 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));
+
algo_.process(region);
assertEquals("Queue size #1: ", 3, algo_.getEvictionQueue().getNumberOfNodes());
TestingUtil.sleepThread(1000);
@@ -323,15 +329,16 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Fqn fqn4 = Fqn.fromString("/a/b/f");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(2);
config.setTimeToLiveSeconds(1);
config.setMaxAgeSeconds(3);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn4);
+ 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));
+
try
{
algo_.process(region);
@@ -342,7 +349,8 @@
e.printStackTrace();
}
assertEquals("Queue size #1: ", 2, algo_.getEvictionQueue().getNumberOfNodes());
- region.setAddedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
+
TestingUtil.sleepThread(2000);
try
{
@@ -358,7 +366,7 @@
TestingUtil.sleepThread(3000);
// visit the node now to prevent the idle time from doing the pruning - node still gets pruned but by
// max age.
- region.setVisitedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.VISIT_NODE_EVENT));
try
{
algo_.process(region);
@@ -379,15 +387,15 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(2);
config.setTimeToLiveSeconds(1);
config.setMaxAgeSeconds(3);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setRemovedNode(fqn2);
+ 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));
try
{
algo_.process(region);
@@ -398,7 +406,8 @@
e.printStackTrace();
}
assertEquals("Queue size #1: ", 1, algo_.getEvictionQueue().getNumberOfNodes());
- region.setAddedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
+
TestingUtil.sleepThread(2000);
try
{
@@ -412,7 +421,7 @@
assertEquals("Queue size #2: ", 1, algo_.getEvictionQueue().getNumberOfNodes());
TestingUtil.sleepThread(3000);
- region.setVisitedNode(fqn3);
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.VISIT_NODE_EVENT));
try
{
algo_.process(region);
@@ -428,7 +437,7 @@
public void testEvictionSortOrder() throws Exception
{
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxAgeSeconds(1000);
@@ -438,7 +447,7 @@
for (int i = 0; i < 100; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algo_.process(region);
@@ -450,7 +459,7 @@
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
if (i % 2 == 0)
{
- region.setVisitedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
}
}
@@ -477,7 +486,7 @@
for (int i = 0; i < 100; i++)
{
Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algo_.process(region);
1.9 +15 -11 JBossCache/tests/functional/org/jboss/cache/eviction/RegionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/RegionTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RegionTest.java 27 Oct 2006 19:26:06 -0000 1.8
+++ RegionTest.java 14 Nov 2006 14:17:10 -0000 1.9
@@ -4,6 +4,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
import org.jboss.cache.config.EvictionConfig;
@@ -26,7 +28,7 @@
super.setUp();
algorithm = new LRUAlgorithm();
regionManager_ = new RegionManager();
- regionManager_.createRegion("/a/b", new DummyEvictionConfiguration());
+ regionManager_.getRegion("/a/b", true).setEvictionPolicy(new DummyEvictionConfiguration());
}
public void tearDown() throws Exception
@@ -40,10 +42,10 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
+ Region region = regionManager_.getRegion("/a/b", true);
+ 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));
assertEquals("AddedNode queue size ", 3, region.nodeEventQueueSize());
EvictedEventNode node = region.takeLastEventNode();
@@ -62,10 +64,12 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b");
- region.setRemovedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setVisitedNode(fqn3);
+ Region region = regionManager_.getRegion("/a/b", true);
+ region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.REMOVE_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.VISIT_NODE_EVENT));
+
+
assertEquals("RemovedNode queue size ", 3, region.nodeEventQueueSize());
NodeEventType event = region.takeLastEventNode().getEventType();
@@ -80,11 +84,11 @@
{
Fqn fqn2 = Fqn.fromString("/a/b/d");
- Region region = regionManager_.getRegion("/a/b");
+ Region region = regionManager_.getRegion("/a/b", true);
// This should succeed, alhtough it will produce warning over the threshold.
for (int i = 0; i < EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT - 1; i++)
{
- region.setAddedNode(fqn2);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
}
}
1.10 +22 -20 JBossCache/tests/functional/org/jboss/cache/eviction/EvictionConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/EvictionConfigurationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- EvictionConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.9
+++ EvictionConfigurationTest.java 14 Nov 2006 14:17:10 -0000 1.10
@@ -8,6 +8,8 @@
import junit.framework.TestCase;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.lock.IsolationLevel;
@@ -16,7 +18,7 @@
* Unit test to test Eviction configuration types.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class EvictionConfigurationTest extends TestCase
{
@@ -36,9 +38,9 @@
public void testPolicyPerRegion() throws Exception
{
this.setupCache("META-INF/policyPerRegion-eviction-service.xml");
- assertEquals(5, cache.getEvictionThreadWakeupIntervalSeconds());
+ assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
- Region region = regionManager.getRegion("/org/jboss/data");
+ Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/data/", region.getFqn());
@@ -47,7 +49,7 @@
assertEquals(5000, ((LFUConfiguration) configuration).getMaxNodes());
assertEquals(1000, ((LFUConfiguration) configuration).getMinNodes());
- region = regionManager.getRegion("/org/jboss/test/data");
+ region = regionManager.getRegion("/org/jboss/test/data", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/test/data/", region.getFqn());
@@ -55,7 +57,7 @@
assertTrue(configuration instanceof FIFOConfiguration);
assertEquals(5, ((FIFOConfiguration) configuration).getMaxNodes());
- region = regionManager.getRegion("/test");
+ region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/test/", region.getFqn());
@@ -63,7 +65,7 @@
assertTrue(configuration instanceof MRUConfiguration);
assertEquals(10000, ((MRUConfiguration) configuration).getMaxNodes());
- region = regionManager.getRegion("/maxAgeTest");
+ region = regionManager.getRegion("/maxAgeTest", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/maxAgeTest/", region.getFqn());
@@ -74,7 +76,7 @@
assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
// test the default region. use a region name that isn't defined explicitly in conf file.
- region = regionManager.getRegion("/a/b/c");
+ region = regionManager.getRegion("/a/b/c", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/_default_/", region.getFqn());
@@ -90,9 +92,9 @@
public void testMixedPolicies() throws Exception
{
this.setupCache("META-INF/mixedPolicy-eviction-service.xml");
- assertEquals(5, cache.getEvictionThreadWakeupIntervalSeconds());
+ assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
- Region region = regionManager.getRegion("/org/jboss/data");
+ Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/data/", region.getFqn());
@@ -100,7 +102,7 @@
assertTrue(configuration instanceof FIFOConfiguration);
assertEquals(5000, ((FIFOConfiguration) configuration).getMaxNodes());
- region = regionManager.getRegion("/test");
+ region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/test/", region.getFqn());
@@ -109,7 +111,7 @@
assertEquals(10000, ((MRUConfiguration) configuration).getMaxNodes());
// test the default region. use a region name that isn't defined explicitly in conf file.
- region = regionManager.getRegion("/a/b/c");
+ region = regionManager.getRegion("/a/b/c", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/_default_/", region.getFqn());
@@ -119,7 +121,7 @@
assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
assertEquals(0, ((LRUConfiguration) configuration).getMaxAgeSeconds());
- region = regionManager.getRegion("/maxAgeTest");
+ region = regionManager.getRegion("/maxAgeTest", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/maxAgeTest/", region.getFqn());
@@ -135,9 +137,9 @@
public void testLegacyPolicyConfiguration() throws Exception
{
this.setupCache("META-INF/local-lru-eviction-service.xml");
- assertEquals(5, cache.getEvictionThreadWakeupIntervalSeconds());
+ assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
- Region region = regionManager.getRegion("/org/jboss/data");
+ Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/data/", region.getFqn());
@@ -146,7 +148,7 @@
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- region = regionManager.getRegion("/org/jboss/test/data");
+ region = regionManager.getRegion("/org/jboss/test/data", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/test/data/", region.getFqn());
@@ -155,7 +157,7 @@
assertEquals(5, ((LRUConfiguration) configuration).getMaxNodes());
assertEquals(4, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- region = regionManager.getRegion("/test");
+ region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/test/", region.getFqn());
@@ -164,7 +166,7 @@
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
assertEquals(4, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- region = regionManager.getRegion("/maxAgeTest");
+ region = regionManager.getRegion("/maxAgeTest", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/maxAgeTest/", region.getFqn());
@@ -175,7 +177,7 @@
assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
// test the default region. use a region name that isn't defined explicitly in conf file.
- region = regionManager.getRegion("/a/b/c");
+ region = regionManager.getRegion("/a/b/c", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
assertEquals("/_default_/", region.getFqn());
@@ -199,7 +201,7 @@
public void testNoEviction() throws Exception
{
this.setupCache("META-INF/tree-service.xml");
- assertEquals(0, regionManager.getRegions().length);
+ assertEquals(0, regionManager.getAllRegions().size());
}
private void setupCache(String configurationName) throws Exception
@@ -211,6 +213,6 @@
c.setIsolationLevel(IsolationLevel.SERIALIZABLE);
cache.setConfiguration(c);
cache.start();
- regionManager = cache.getEvictionRegionManager();
+ regionManager = cache.getRegionManager();
}
}
1.16 +56 -97 JBossCache/tests/functional/org/jboss/cache/eviction/RegionManagerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionManagerTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/RegionManagerTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- RegionManagerTest.java 27 Oct 2006 19:26:06 -0000 1.15
+++ RegionManagerTest.java 14 Nov 2006 14:17:10 -0000 1.16
@@ -4,18 +4,22 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.Region;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
+import java.util.List;
+
/**
* MarshRegion Manager unit tests.
*
* @author Ben Wang, Feb 11, 2004
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class RegionManagerTest extends TestCase
{
@@ -48,21 +52,13 @@
String fqn3 = "/aop";
RegionManager regionManager = new RegionManager();
- try
- {
- regionManager.createRegion(DEFAULT_REGION, config);
- regionManager.createRegion(fqn1, config);
- regionManager.createRegion(fqn2, config);
- regionManager.createRegion(fqn3, config);
- }
- catch (RegionNameConflictException e)
- {
- fail("Failed to create region");
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ regionManager.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
- Region[] regions = regionManager.getRegions();
- assertEquals("MarshRegion size ", 4, regions.length);
+ List<Region> regions = regionManager.getAllRegions();
+ assertEquals("MarshRegion size ", 4, regions.size());
}
public void testCreateRegion2()
@@ -72,29 +68,22 @@
String fqn3 = "/a/b/";
RegionManager regionManager = new RegionManager();
- try
- {
- regionManager.createRegion(fqn1, config);
- regionManager.createRegion(fqn2, config);
- regionManager.createRegion(fqn3, config);
- }
- catch (RegionNameConflictException e)
- {
- fail("Failed to create region");
- }
-
- Region[] regions = regionManager.getRegions();
- assertEquals("MarshRegion size ", 3, regions.length);
- assertEquals("MarshRegion 0", DEFAULT_REGION, regions[0].getFqn());
- assertEquals("MarshRegion 1 ", "/a/b/c/", regions[1].getFqn());
- assertEquals("MarshRegion 2 ", "/a/b/", regions[2].getFqn());
- Region region = regionManager.getRegion("/a/b/c/d");
+ regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
+
+ List<Region> regions = regionManager.getAllRegions();
+ assertEquals("MarshRegion size ", 3, regions.size());
+ assertEquals("MarshRegion 0", DEFAULT_REGION, regions.get(0).getFqn());
+ assertEquals("MarshRegion 1 ", "/a/b/c/", regions.get(1).getFqn());
+ assertEquals("MarshRegion 2 ", "/a/b/", regions.get(2).getFqn());
+ Region region = regionManager.getRegion("/a/b/c/d", true);
assertNotNull("MarshRegion ", region);
assertEquals("MarshRegion ", "/a/b/c/", region.getFqn());
- region = regionManager.getRegion("/a/b");
+ region = regionManager.getRegion("/a/b", true);
assertNotNull("MarshRegion ", region);
assertEquals("MarshRegion ", "/a/b/", region.getFqn());
- region = regionManager.getRegion("/a");
+ region = regionManager.getRegion("/a", true);
// Should be default.
assertNotNull("MarshRegion ", region);
}
@@ -105,20 +94,12 @@
String fqn2 = "/a/b/";
RegionManager regionManager = new RegionManager();
- try
- {
- regionManager.createRegion(fqn1, config);
- regionManager.createRegion(fqn2, config);
- }
- catch (RegionNameConflictException e)
- {
- fail("Failed to create region");
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
try
{
- regionManager.getRegion("/a");
+ regionManager.getRegion("/a", true);
}
catch (Exception e)
{
@@ -136,20 +117,12 @@
String fqn4 = DEFAULT_REGION;
RegionManager regionManager = new RegionManager();
- try
- {
- regionManager.createRegion(fqn4, config);
- regionManager.createRegion(fqn1, config);
- regionManager.createRegion(fqn2, config);
- regionManager.createRegion(fqn3, config);
- regionManager.createRegion(fqn4, config);
- }
- catch (RegionNameConflictException e)
- {
- Region[] regions = regionManager.getRegions();
- assertEquals("MarshRegion size ", 2, regions.length);
- return;
- }
+ regionManager.getRegion(fqn4, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn4, true).setEvictionPolicy(config);
+
fail("testRegionConflict failed");
}
@@ -160,18 +133,10 @@
String fqn3 = "/a/bc";
RegionManager regionManager = new RegionManager();
- try
- {
- regionManager.createRegion(fqn1, config);
- regionManager.createRegion(fqn2, config);
- regionManager.createRegion(fqn3, config);
- }
- catch (RegionNameConflictException e)
- {
- Region[] regions = regionManager.getRegions();
- assertEquals("MarshRegion size ", 1, regions.length);
- return;
- }
+ regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
+
fail("testRegionConflict failed");
}
@@ -182,18 +147,11 @@
String fqn3 = "/a/b";
RegionManager regionManager = new RegionManager();
- try
- {
- regionManager.createRegion(fqn1, config);
- regionManager.createRegion(fqn2, config);
- regionManager.createRegion(fqn3, config);
- }
- catch (RegionNameConflictException e)
- {
- fail("testRegionConflict3 failed " + e);
- }
+ regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
+ regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
- Region region = regionManager.getRegion(fqn2);
+ Region region = regionManager.getRegion(fqn2, true);
assertNotSame("MarshRegion ", fqn1, region.getFqn());
}
@@ -207,7 +165,8 @@
Element element = XmlHelper.stringToElement(xml);
RegionManager regionManager = new RegionManager();
EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, null, EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT);
- Region region = regionManager.createRegion(erc);
+ Region region = regionManager.getRegion(erc.getRegionFqn(), true);
+ region.setEvictionPolicy(erc.getEvictionPolicyConfig());
assertTrue(region.getEvictionPolicy() instanceof LFUPolicy);
assertTrue(region.getEvictionPolicyConfig() instanceof LFUConfiguration);
@@ -226,8 +185,8 @@
element = XmlHelper.stringToElement(xml);
erc = XmlConfigurationParser.parseEvictionRegionConfig(element, "org.jboss.cache.eviction.LFUPolicy", EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT);
regionManager = new RegionManager();
- regionManager.setTreeCache(cache);
- region = regionManager.createRegion(erc);
+ region = regionManager.getRegion(erc.getRegionFqn(), true);
+ region.setEvictionPolicy(erc.getEvictionPolicyConfig());
assertTrue(region.getEvictionPolicy() instanceof LFUPolicy);
assertTrue(region.getEvictionPolicyConfig() instanceof LFUConfiguration);
@@ -245,33 +204,33 @@
String fqn4 = "/a/b/c/";
RegionManager rm = new RegionManager();
- rm.createRegion(fqn1, config);
- rm.createRegion(fqn2, config);
- rm.createRegion(fqn3, config);
- rm.createRegion(fqn4, config);
+ rm.getRegion(fqn1, true).setEvictionPolicy(config);
+ rm.getRegion(fqn2, true).setEvictionPolicy(config);
+ rm.getRegion(fqn3, true).setEvictionPolicy(config);
+ rm.getRegion(fqn4, true).setEvictionPolicy(config);
- Region region = rm.getRegion("/a/b/c/d/e/f");
- Region region2 = rm.getRegion("/e/f/g");
+ Region region = rm.getRegion("/a/b/c/d/e/f", true);
+ Region region2 = rm.getRegion("/e/f/g", true);
assertEquals(fqn2, region.getFqn());
assertEquals(fqn1, region2.getFqn());
- Region[] regions = rm.getRegions();
- for (int i = 0; i < regions.length; i++)
+ List<Region> regions = rm.getAllRegions();
+ for (int i = 0; i < regions.size(); i++)
{
switch (i)
{
case 0:
- assertEquals(fqn1, regions[i].getFqn());
+ assertEquals(fqn1, regions.get(i).getFqn());
break;
case 1:
- assertEquals(fqn2, regions[i].getFqn());
+ assertEquals(fqn2, regions.get(i).getFqn());
break;
case 2:
- assertEquals(fqn3, regions[i].getFqn());
+ assertEquals(fqn3, regions.get(i).getFqn());
break;
case 3:
- assertEquals(fqn4, regions[i].getFqn());
+ assertEquals(fqn4, regions.get(i).getFqn());
break;
default:
fail("This error condition should never be reached");
1.7 +2 -2 JBossCache/tests/functional/org/jboss/cache/eviction/LFUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LFUPolicyTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- LFUPolicyTest.java 15 Sep 2006 15:11:35 -0000 1.6
+++ LFUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.7
@@ -18,7 +18,7 @@
* Unit tests for LFU Policy.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class LFUPolicyTest extends TestCase
{
@@ -38,7 +38,7 @@
{
super.setUp();
initCaches();
- wakeupIntervalMillis = cache.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
1.16 +3 -28 JBossCache/tests/functional/org/jboss/cache/eviction/LRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LRUPolicyTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- LRUPolicyTest.java 27 Oct 2006 19:26:06 -0000 1.15
+++ LRUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.16
@@ -14,7 +14,7 @@
*
* @author Ben Wang, Feb 11, 2004
* @author Daniel Huang - dhuang at jboss.org
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class LRUPolicyTest extends TestCase
{
@@ -34,7 +34,7 @@
{
super.setUp();
initCaches();
- wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis_);
if (wakeupIntervalMillis_ < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
@@ -73,7 +73,7 @@
}
TestingUtil.sleepThread(wakeupIntervalMillis_ + 500);
- cache_.getEvictionRegionManager().markNodeCurrentlyInUse(Fqn.fromString(rootStr + 5), 0);
+ cache_.getRegionManager().getRegion(Fqn.fromString(rootStr + 5), true).markNodeCurrentlyInUse(0);
for (int i = 10; i < 15; i++)
{
@@ -354,31 +354,6 @@
}
}
- public void testLegacyAPI() throws Exception
- {
- RegionManager regionManager = cache_.getEvictionRegionManager();
- Region region = regionManager.createRegion("/123", new LRUAlgorithm());
-
- region.setTimeToLiveSeconds(5);
- region.setMaxNodes(5000);
-
- assertEquals(5000, ((LRUConfiguration) region.getEvictionPolicyConfig()).getMaxNodes());
- assertEquals(5, ((LRUConfiguration) region.getEvictionPolicyConfig()).getTimeToLiveSeconds());
-
- String rootStr = "/123/node";
- for (int i = 0; i < 10; i++)
- {
- Fqn fqn = Fqn.fromString(rootStr + Integer.toString(i));
- cache_.put(fqn, fqn.toString(), fqn.toString());
- }
-
- assertEquals(rootStr + "5", cache_.get(rootStr + "5", rootStr + "5"));
-
- TestingUtil.sleepThread(2 * wakeupIntervalMillis_ + 2000);
-
- assertNull("DataNode should be null", cache_.get(rootStr + "5"));
- }
-
void log(String msg)
{
System.out.println("-- " + msg);
1.5 +12 -11 JBossCache/tests/functional/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProgrammaticLRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ProgrammaticLRUPolicyTest.java 27 Oct 2006 19:26:06 -0000 1.4
+++ ProgrammaticLRUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.5
@@ -27,6 +27,7 @@
import junit.framework.TestSuite;
import org.jboss.cache.TreeCache;
import org.jboss.cache.Fqn;
+import org.jboss.cache.RegionManager;
import org.jboss.cache.xml.XmlHelper;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.lock.IsolationLevel;
@@ -39,7 +40,7 @@
* Unit tests for programmatic configuration of LRU policy
*
* @author Ben Wang, Oct, 2006
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class ProgrammaticLRUPolicyTest extends TestCase
{
@@ -55,7 +56,7 @@
{
super.setUp();
initCaches();
- wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis_);
if (wakeupIntervalMillis_ < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
@@ -87,11 +88,11 @@
"<attribute name=\"timeToLiveSeconds\">4</attribute>" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- RegionManager regionManager = cache_.getEvictionRegionManager();
- EvictionConfig topConfig = regionManager.getEvictionConfig();
+ RegionManager regionManager = cache_.getRegionManager();
+ EvictionConfig topConfig = cache_.getConfiguration().getEvictionConfig();
EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, topConfig.getDefaultEvictionPolicyClass(), topConfig.getDefaultEventQueueSize());
// Fqn is the region name
- regionManager.createRegion("/programmatic", erc.getEvictionPolicyConfig());
+ regionManager.getRegion("/programmatic", true).setEvictionPolicy(erc.getEvictionPolicyConfig());
}
public void testStringBasedFqnEviction() throws Exception
@@ -148,15 +149,15 @@
"<attribute name=\"timeToLiveSeconds\">4</attribute>" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- RegionManager regionManager = cache_.getEvictionRegionManager();
- EvictionConfig topEC = regionManager.getEvictionConfig();
+ RegionManager regionManager = cache_.getRegionManager();
+ EvictionConfig topEC = cache_.getConfiguration().getEvictionConfig();
EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element,
topEC.getDefaultEvictionPolicyClass(),
topEC.getDefaultEventQueueSize());
// Fqn is the region name
- Integer ii = new Integer(1);
+ Integer ii = 1;
Fqn fqn = new Fqn(ii);
- regionManager.createRegion(fqn, erc.getEvictionPolicyConfig());
+ regionManager.getRegion(fqn, true).setEvictionPolicy(erc.getEvictionPolicyConfig());
}
public void testObjectBasedFqnEviction1() throws Exception
@@ -167,7 +168,7 @@
for (int i = 0; i < 10; i++)
{
String str = rootStr;
- Integer in = new Integer(i);
+ Integer in = i;
Fqn fqn = new Fqn(Fqn.fromString(str), in);
try
{
@@ -180,7 +181,7 @@
}
}
- Integer in = new Integer(3);
+ Integer in = 3;
Fqn fqn = new Fqn(Fqn.fromString(rootStr), in);
try
{
1.4 +2 -2 JBossCache/tests/functional/org/jboss/cache/eviction/ConcurrentEvictionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConcurrentEvictionTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ConcurrentEvictionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ConcurrentEvictionTest.java 8 Nov 2006 17:29:21 -0000 1.3
+++ ConcurrentEvictionTest.java 14 Nov 2006 14:17:10 -0000 1.4
@@ -20,7 +20,7 @@
* Tests cache behavior in the presence of concurrent passivation.
*
* @author Brian Stansberry
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ConcurrentEvictionTest extends TestCase
{
@@ -36,7 +36,7 @@
{
super.setUp();
initCaches();
- wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
if (wakeupIntervalMillis_ < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
1.4 +22 -21 JBossCache/tests/functional/org/jboss/cache/eviction/MRUAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/MRUAlgorithmTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MRUAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.3
+++ MRUAlgorithmTest.java 14 Nov 2006 14:17:10 -0000 1.4
@@ -8,12 +8,14 @@
import junit.framework.TestCase;
import org.jboss.cache.Fqn;
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.Region;
/**
* Unit tests for MRUAlgorithm.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class MRUAlgorithmTest extends TestCase
{
@@ -29,7 +31,7 @@
config.setMaxNodes(0);
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
regionManager = new RegionManager();
- regionManager.createRegion("/a/b", config);
+ regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
public void tearDown() throws Exception
@@ -42,13 +44,12 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
MRUConfiguration config = (MRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
-
+ 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));
algorithm.process(region);
assertEquals(1, algorithm.getEvictionQueue().getNumberOfNodes());
@@ -57,7 +58,7 @@
for (int i = 0; i < 150; i++)
{
Fqn fqn = Fqn.fromString("/a/b/c/" + Integer.toString(i));
- region.setAddedNode(fqn);
+ region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
algorithm.process(region);
@@ -77,29 +78,29 @@
Fqn fqn8 = Fqn.fromString("/a/b/j");
Fqn fqn9 = Fqn.fromString("/a/b/k");
Fqn fqn10 = Fqn.fromString("/a/b/l");
- Region region = regionManager.getRegion("/a/b");
+ Region region = regionManager.getRegion("/a/b", true);
MRUConfiguration config = (MRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(8);
- region.setAddedNode(fqn1);
- region.setAddedNode(fqn2);
- region.setAddedNode(fqn3);
- region.setAddedNode(fqn4);
- region.setAddedNode(fqn5);
- region.setAddedNode(fqn6);
- region.setAddedNode(fqn7);
- region.setAddedNode(fqn8);
+ 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));
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn5, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn6, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn7, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn8, NodeEventType.ADD_NODE_EVENT));
algorithm.process(region);
assertEquals(8, algorithm.getEvictionQueue().getNumberOfNodes());
- region.setAddedNode(fqn9);
- region.setAddedNode(fqn10);
+ region.putNodeEvent(new EvictedEventNode(fqn9, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn10, NodeEventType.ADD_NODE_EVENT));
Thread.sleep(5000);
- region.setVisitedNode(fqn2);
- region.setVisitedNode(fqn4);
+ region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
+ region.putNodeEvent(new EvictedEventNode(fqn4, NodeEventType.ADD_NODE_EVENT));
algorithm.process(region);
1.14 +1 -1 JBossCache/tests/functional/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedLRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ReplicatedLRUPolicyTest.java 6 Sep 2006 15:30:57 -0000 1.13
+++ ReplicatedLRUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.14
@@ -38,7 +38,7 @@
cache2_.getConfiguration().setUseRegionBasedMarshalling(true);
cache2_.start();
- wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis_);
if (wakeupIntervalMillis_ <= 0)
{
1.6 +1 -1 JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizePolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizePolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizePolicyTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ElementSizePolicyTest.java 15 Sep 2006 15:11:35 -0000 1.5
+++ ElementSizePolicyTest.java 14 Nov 2006 14:17:10 -0000 1.6
@@ -35,7 +35,7 @@
{
super.setUp();
initCaches();
- wakeupIntervalMillis = cache.getEvictionThreadWakeupIntervalSeconds() * 1000;
+ wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
More information about the jboss-cvs-commits
mailing list