[jbosscache-commits] JBoss Cache SVN: r6568 - in core/trunk/src: main/java/org/jboss/cache/eviction and 2 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Sun Aug 17 12:28:54 EDT 2008
Author: mircea.markus
Date: 2008-08-17 12:28:52 -0400 (Sun, 17 Aug 2008)
New Revision: 6568
Modified:
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java
core/trunk/src/test/resources/configs/clonable-config.xml
core/trunk/src/test/resources/configs/local-lru-eviction.xml
core/trunk/src/test/resources/configs/local-passivation.xml
core/trunk/src/test/resources/configs/local-tx.xml
core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml
core/trunk/src/test/resources/configs/parser-test.xml
core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
core/trunk/src/test/resources/configs/string-property-replaced.xml
Log:
fixed UT after eviction refactorings
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-17 16:28:52 UTC (rev 6568)
@@ -46,11 +46,6 @@
throw new ConfigurationException("Missing mandatory attribute wakeUpInterval");
}
-// String defaultPolicyClassStr = getAttributeValue(evictionElement, "defaultPolicyClass");
-// if (existsAttribute(defaultPolicyClassStr)) evictionConfig.setDefaultEvictionPolicyClass(defaultPolicyClassStr);
-// String defaultEventQueueSize = getAttributeValue(evictionElement, "defaultEventQueueSize");
-// if (existsAttribute(defaultEventQueueSize)) evictionConfig.setDefaultEventQueueSize(getInt(defaultEventQueueSize));
-
List<EvictionRegionConfig> evictionRegionConfigs = new LinkedList<EvictionRegionConfig>();
Element defaultRegion = getSingleElementInCoreNS("default", evictionElement);
@@ -58,7 +53,7 @@
{
EvictionRegionConfig defaultRegionConfig = getEvictionRegionConfig(defaultRegion, null, true);
if (defaultRegionConfig.getEvictionAlgorithmConfig() == null)
- throw new ConfigurationException("Default eviction region should have an evictionAlgorithmClass defined.");
+ throw new MissingPolicyException("Default eviction region should have an evictionAlgorithmClass defined.");
evictionConfig.setDefaultEvictionRegionConfig(defaultRegionConfig);
}
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionAlgorithmConfigBase.java 2008-08-17 16:28:52 UTC (rev 6568)
@@ -101,7 +101,6 @@
public void reset()
{
- evictionAlgorithmClassName = null;
maxNodes = 0;
minTimeToLive = 0;
}
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-08-17 16:28:52 UTC (rev 6568)
@@ -201,28 +201,28 @@
public void testEvictionPolicyConfig()
{
EvictionConfig evictionConfig = config.getEvictionConfig();
- assert "org.jboss.cache.eviction.LRUPolicy".equals(evictionConfig.getDefaultEvictionPolicyClass());
+ assert "org.jboss.cache.eviction.LRUAlgorithm".equals(evictionConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig().getEvictionAlgorithmClassName());
assert 200000 == evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize();
assert 5 == evictionConfig.getWakeupInterval();
List<EvictionRegionConfig> regionConfigs = evictionConfig.getEvictionRegionConfigs();
- assert regionConfigs.size() == 3;
+ assert regionConfigs.size() == 2;
- EvictionRegionConfig first = regionConfigs.get(0);
- assert first.getRegionName().equals("/_default_");
+ EvictionRegionConfig first = evictionConfig.getDefaultEvictionRegionConfig();
+ assert first.getRegionName().equals("/");
assert first.getEvictionAlgorithmConfig() instanceof LRUAlgorithmConfig;
LRUAlgorithmConfig firstConfiguration = (LRUAlgorithmConfig) first.getEvictionAlgorithmConfig();
assert firstConfiguration.getMaxAge() <= 0;
assert firstConfiguration.getTimeToLive() == 1000;
assert firstConfiguration.getMaxNodes() == 5000;
- EvictionRegionConfig second = regionConfigs.get(1);
+ EvictionRegionConfig second = regionConfigs.get(0);
LRUAlgorithmConfig secondConfiguration = (LRUAlgorithmConfig) second.getEvictionAlgorithmConfig();
assert secondConfiguration.getMaxAge() == 0;
assert secondConfiguration.getTimeToLive() == 1002;
assert secondConfiguration.getMaxNodes() == 0;
- EvictionRegionConfig third = regionConfigs.get(2);
+ EvictionRegionConfig third = regionConfigs.get(1);
MRUAlgorithmConfig thirdConfiguration = (MRUAlgorithmConfig) third.getEvictionAlgorithmConfig();
assert thirdConfiguration.getMaxNodes() == 2103;
assert thirdConfiguration.getMinTimeToLive() == 22;
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java 2008-08-17 16:28:52 UTC (rev 6568)
@@ -41,6 +41,7 @@
public void testSimpleFile()
{
ExceptionCountingErrorHandler handler = new ExceptionCountingErrorHandler();
+ System.setProperty("jbosscache.config.schemaLocation","src/main/resources/jbosscache-config-3.0.xsd");
XmlConfigurationParser parser = new XmlConfigurationParser(handler);
for (String file : testFiles)
{
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -44,19 +44,19 @@
</locator>
</buddy>
</replication>
- <eviction wakeUpInterval="45000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="4">
- <default>
+ <eviction wakeUpInterval="45000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="4">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
<attribute name="maxAge">15000</attribute>
</default>
- <region name="/fifo" policyClass="org.jboss.cache.eviction.FIFOPolicy">
+ <region name="/fifo" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
<attribute name="maxNodes">5000</attribute>
</region>
- <region name="/mru" policyClass="org.jboss.cache.eviction.MRUPolicy">
+ <region name="/mru" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm">
<attribute name="maxNodes">10000</attribute>
</region>
- <region name="/lfu" policyClass="org.jboss.cache.eviction.LFUPolicy">
+ <region name="/lfu" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm">
<attribute name="maxNodes">5000</attribute>
<attribute name="minNodes">4000</attribute>
</region>
Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -6,27 +6,27 @@
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
- <default>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</default>
<region name="/org/jboss/data">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</region>
<region name="/org/jboss/test/data">
<attribute name="maxNodes">5</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
+ <attribute name="timeToLive">4000</attribute>
</region>
<region name="/test">
<attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
+ <attribute name="timeToLive">4000</attribute>
</region>
<region name="/maxAgeTest">
<attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">8</attribute>
- <attribute name="maxAgeSeconds">10</attribute>
+ <attribute name="timeToLive">8000</attribute>
+ <attribute name="maxAge">10000</attribute>
</region>
</eviction>
</jbosscache>
Modified: core/trunk/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-passivation.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/local-passivation.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -6,14 +6,14 @@
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="1000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
- <default>
+ <eviction wakeUpInterval="1000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1</attribute>
+ <attribute name="timeToLive">1000</attribute>
</default>
<region name="/org/jboss/test/data">
<attribute name="maxNodes">100</attribute>
- <attribute name="timeToLiveSeconds">1</attribute>
+ <attribute name="timeToLive">1000</attribute>
</region>
</eviction>
<loaders passivation="true" shared="false">
Modified: core/trunk/src/test/resources/configs/local-tx.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-tx.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/local-tx.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -7,18 +7,18 @@
<serialization useRegionBasedMarshalling="false"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
- <default>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</default>
<region name="/org/jboss/data">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</region>
<region name="/org/jboss/test/data">
<attribute name="maxNodes">5</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
+ <attribute name="timeToLive">4000</attribute>
</region>
</eviction>
</jbosscache>
Modified: core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -34,21 +34,21 @@
<pbcast.FLUSH timeout="0"/>
</jgroupsConfig>
</transport>
- <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
- <default>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</default>
- <region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.FIFOPolicy">
+ <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
<attribute name="maxNodes">5000</attribute>
</region>
- <region name="/test/" policyClass="org.jboss.cache.eviction.MRUPolicy">
+ <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm">
<attribute name="maxNodes">10000</attribute>
</region>
<region name="/maxAgeTest/">
<attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">8</attribute>
- <attribute name="maxAgeSeconds">10</attribute>
+ <attribute name="timeToLive">8000</attribute>
+ <attribute name="maxAge">10000</attribute>
</region>
</eviction>
</jbosscache>
Modified: core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml
===================================================================
--- core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -31,7 +31,7 @@
</jgroupsConfig>
</transport>
<replication>
- <sync replTimeout="15000"/>
+ <async replTimeout="15000"/>
<buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
<dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
<locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -58,15 +58,15 @@
<jmxStatistics enabled="false"/>
- <eviction wakeUpInterval="5" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
- <default>
+ <eviction wakeUpInterval="5">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLive">1000</attribute>
</default>
<region name="/org/jboss/data">
<attribute name="timeToLive">1002</attribute>
</region>
- <region name="/org/jboss/xyz" policyClass="org.jboss.cache.eviction.MRUPolicy" eventQueueSize="21">
+ <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21">
<attribute name="maxNodes">2103</attribute>
<attribute name="minTimeToLive">22</attribute>
</region>
Modified: core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -35,24 +35,24 @@
</transport>
<eviction wakeUpInterval="5000">
- <default policyClass="org.jboss.cache.eviction.LRUPolicy">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</default>
- <region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.LFUPolicy">
+ <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm">
<attribute name="maxNodes">5000</attribute>
<attribute name="minNodes">1000</attribute>
</region>
- <region name="/org/jboss/test/data" policyClass="org.jboss.cache.eviction.FIFOPolicy">
+ <region name="/org/jboss/test/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
<attribute name="maxNodes">5</attribute>
</region>
- <region name="/test/" policyClass="org.jboss.cache.eviction.MRUPolicy">
+ <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm">
<attribute name="maxNodes">10000</attribute>
</region>
- <region name="/maxAgeTest/" policyClass="org.jboss.cache.eviction.LRUPolicy">
+ <region name="/maxAgeTest/" algorithmClass="org.jboss.cache.eviction.LRUAlgorithm">
<attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">8</attribute>
- <attribute name="maxAgeSeconds">10</attribute>
+ <attribute name="timeToLive">8000</attribute>
+ <attribute name="maxAge">10000</attribute>
</region>
</eviction>
</jbosscache>
Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-08-16 18:45:24 UTC (rev 6567)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-08-17 16:28:52 UTC (rev 6568)
@@ -23,10 +23,10 @@
</locator>
</buddy>
</replication>
- <eviction wakeUpInterval="5000" defaultPolicyClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUPolicy}">
- <default>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUAlgorithm}">
<attribute name="maxNodes">${test.property.EvictionPolicyConfig.maxNodes:5000}</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="timeToLive">1000000</attribute>
</default>
</eviction>
<loaders passivation="true" shared="false">
More information about the jbosscache-commits
mailing list