February 2014 - jbosscache-commits

JBoss Cache SVN: r8584 - in core/support-branches/3.2.8.GA_JBCACHE-1633/src: test/java/org/jboss/cache/eviction and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2014-02-27 21:47:41 -0500 (Thu, 27 Feb 2014) New Revision: 8584 Added: core/support-branches/3.2.8.GA_JBCACHE-1633/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java Modified: core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java Log: [JBPAPP-11017] Backport JBCACHE-1633 Modified: core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java 2014-02-28 02:46:53 UTC (rev 8583) +++ core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java 2014-02-28 02:47:41 UTC (rev 8584) @@ -173,6 +173,7 @@ { case ADD_NODE_EVENT: case ADD_ELEMENT_EVENT: + case VISIT_NODE_EVENT: // JBCACHE-1633 addEvictionEntry(node); break; case REMOVE_ELEMENT_EVENT: @@ -181,9 +182,6 @@ // Removals will be noticed when double-checking expiry time // removeEvictionEntry(node); break; - case VISIT_NODE_EVENT: - // unused - break; case MARK_IN_USE_EVENT: markInUse(node); break; @@ -287,12 +285,6 @@ throw new UnsupportedOperationException(); } - @Override - public boolean canIgnoreEvent(Type eventType) - { - return (eventType == EvictionEvent.Type.VISIT_NODE_EVENT); - } - public Class<? extends EvictionAlgorithmConfig> getConfigurationClass() { return ExpirationAlgorithmConfig.class; Modified: core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java 2014-02-28 02:46:53 UTC (rev 8583) +++ core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java 2014-02-28 02:47:41 UTC (rev 8584) @@ -50,15 +50,6 @@ return ExpirationConfiguration.class; } - /** - * Returns true if it's a visit node event. - */ - @Override - public boolean canIgnoreEvent(Fqn fqn, EvictionEventType eventType) - { - return (eventType == EvictionEventType.VISIT_NODE_EVENT); - } - public Class<? extends EvictionAlgorithm> modernizePolicy() { return ExpirationAlgorithm.class; Added: core/support-branches/3.2.8.GA_JBCACHE-1633/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1633/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java (rev 0) +++ core/support-branches/3.2.8.GA_JBCACHE-1633/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java 2014-02-28 02:47:41 UTC (rev 8584) @@ -0,0 +1,93 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.cache.eviction; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.Region; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.EvictionConfig; +import org.jboss.cache.config.EvictionRegionConfig; +import org.jboss.cache.factories.UnitTestConfigurationFactory; +import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; +import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.internals.EvictionController; +import org.jboss.cache.util.internals.EvictionWatcher; +import static org.testng.AssertJUnit.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.concurrent.TimeUnit; + +/** + * Test for JBCACHE-1633 + * + * @author Dennis Reed + * @version $Revision: 8393 $ + */ +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ExpirationWithCacheLoaderTest") +public class ExpirationWithCacheLoaderTest extends EvictionTestsBase +{ + private static final Log log = LogFactory.getLog(ExpirationPolicyTest.class); + + private CacheSPI<Object, Object> cache; + private EvictionController ec; + + Fqn fqn1 = Fqn.fromString("/node/1"); + + Long future; + Long past; + + @BeforeMethod(alwaysRun = true) + public void setUp() throws Exception + { + Configuration conf = new Configuration(); + ExpirationAlgorithmConfig eAC = new ExpirationAlgorithmConfig(); + EvictionRegionConfig eRC = new EvictionRegionConfig(Fqn.ROOT, eAC); + EvictionConfig econf = new EvictionConfig(eRC); + econf.setWakeupInterval(0); + conf.setEvictionConfig(econf); + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(conf, false, getClass()); + + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, true, false, true, false); + cache.getConfiguration().setCacheLoaderConfig(clc); + + cache.start(); + ec = new EvictionController(cache); + + future = System.currentTimeMillis() + 1500; + past = System.currentTimeMillis() - 1500; + } + + @AfterMethod(alwaysRun = true) + public void tearDown() throws Exception + { + TestingUtil.killCaches(cache); + cache = null; + } + + public void testExpirationWithCacheLoader() throws Exception + { + cache.put(fqn1, ExpirationAlgorithmConfig.EXPIRATION_KEY, past); + + EvictionWatcher w = new EvictionWatcher(cache, fqn1); + ec.startEviction(); + assert w.waitForEviction(30, TimeUnit.SECONDS); + + // loads into memory again + assertNotNull(cache.get(fqn1, ExpirationAlgorithmConfig.EXPIRATION_KEY)); + + EvictionWatcher w2 = new EvictionWatcher(cache, fqn1); + ec.startEviction(); + assert w2.waitForEviction(30, TimeUnit.SECONDS); + } +}

10 years, 9 months

1
0
0 / 0

JBoss Cache SVN: r8583 - in core/support-branches/3.2.8.GA_JBCACHE-1633: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2014-02-27 21:46:53 -0500 (Thu, 27 Feb 2014) New Revision: 8583 Modified: core/support-branches/3.2.8.GA_JBCACHE-1633/pom.xml core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/Version.java Log: Set version for one-off Modified: core/support-branches/3.2.8.GA_JBCACHE-1633/pom.xml =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1633/pom.xml 2014-02-28 02:41:37 UTC (rev 8582) +++ core/support-branches/3.2.8.GA_JBCACHE-1633/pom.xml 2014-02-28 02:46:53 UTC (rev 8583) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <properties> - <jbosscache-core-version>3.2.8.GA</jbosscache-core-version> + <jbosscache-core-version>3.2.8.GA_JBCACHE-1633</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  Modified: core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/Version.java 2014-02-28 02:41:37 UTC (rev 8582) +++ core/support-branches/3.2.8.GA_JBCACHE-1633/src/main/java/org/jboss/cache/Version.java 2014-02-28 02:46:53 UTC (rev 8583) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.8.GA"; + public static final String version = "3.2.8.GA_JBCACHE-1633"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0','3','2','8','G','A'}; + static final byte[] version_id = {'0','3','2','8','G','A','_','J','B','C','A','C','H','E','-','1','6','3','3'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

10 years, 9 months

1
0
0 / 0

JBoss Cache SVN: r8582 - core/support-branches.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2014-02-27 21:41:37 -0500 (Thu, 27 Feb 2014) New Revision: 8582 Added: core/support-branches/3.2.8.GA_JBCACHE-1633/ Log: [JBPAPP-11017] Branch to backport JBCACHE-1633 to EAP 5.1.2

10 years, 9 months

1
0
0 / 0

JBoss Cache SVN: r8581 - in core/trunk/src: test/java/org/jboss/cache/eviction and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: dereed Date: 2014-02-27 21:36:10 -0500 (Thu, 27 Feb 2014) New Revision: 8581 Added: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java Log: [JBCACHE-1633] ExpirationAlgorithm ignores entries loaded from a cache loader Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java 2014-02-20 18:29:51 UTC (rev 8580) +++ core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java 2014-02-28 02:36:10 UTC (rev 8581) @@ -173,6 +173,7 @@ { case ADD_NODE_EVENT: case ADD_ELEMENT_EVENT: + case VISIT_NODE_EVENT: // JBCACHE-1633 addEvictionEntry(node); break; case REMOVE_ELEMENT_EVENT: @@ -181,9 +182,6 @@ // Removals will be noticed when double-checking expiry time // removeEvictionEntry(node); break; - case VISIT_NODE_EVENT: - // unused - break; case MARK_IN_USE_EVENT: markInUse(node); break; @@ -287,12 +285,6 @@ throw new UnsupportedOperationException(); } - @Override - public boolean canIgnoreEvent(Type eventType) - { - return (eventType == EvictionEvent.Type.VISIT_NODE_EVENT); - } - public Class<? extends EvictionAlgorithmConfig> getConfigurationClass() { return ExpirationAlgorithmConfig.class; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java 2014-02-20 18:29:51 UTC (rev 8580) +++ core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationPolicy.java 2014-02-28 02:36:10 UTC (rev 8581) @@ -50,15 +50,6 @@ return ExpirationConfiguration.class; } - /** - * Returns true if it's a visit node event. - */ - @Override - public boolean canIgnoreEvent(Fqn fqn, EvictionEventType eventType) - { - return (eventType == EvictionEventType.VISIT_NODE_EVENT); - } - public Class<? extends EvictionAlgorithm> modernizePolicy() { return ExpirationAlgorithm.class; Added: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java (rev 0) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationWithCacheLoaderTest.java 2014-02-28 02:36:10 UTC (rev 8581) @@ -0,0 +1,93 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.cache.eviction; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.Region; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.EvictionConfig; +import org.jboss.cache.config.EvictionRegionConfig; +import org.jboss.cache.factories.UnitTestConfigurationFactory; +import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; +import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.internals.EvictionController; +import org.jboss.cache.util.internals.EvictionWatcher; +import static org.testng.AssertJUnit.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.concurrent.TimeUnit; + +/** + * Test for JBCACHE-1633 + * + * @author Dennis Reed + * @version $Revision: 8393 $ + */ +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ExpirationWithCacheLoaderTest") +public class ExpirationWithCacheLoaderTest extends EvictionTestsBase +{ + private static final Log log = LogFactory.getLog(ExpirationPolicyTest.class); + + private CacheSPI<Object, Object> cache; + private EvictionController ec; + + Fqn fqn1 = Fqn.fromString("/node/1"); + + Long future; + Long past; + + @BeforeMethod(alwaysRun = true) + public void setUp() throws Exception + { + Configuration conf = new Configuration(); + ExpirationAlgorithmConfig eAC = new ExpirationAlgorithmConfig(); + EvictionRegionConfig eRC = new EvictionRegionConfig(Fqn.ROOT, eAC); + EvictionConfig econf = new EvictionConfig(eRC); + econf.setWakeupInterval(0); + conf.setEvictionConfig(econf); + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(conf, false, getClass()); + + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, true, false, true, false); + cache.getConfiguration().setCacheLoaderConfig(clc); + + cache.start(); + ec = new EvictionController(cache); + + future = System.currentTimeMillis() + 1500; + past = System.currentTimeMillis() - 1500; + } + + @AfterMethod(alwaysRun = true) + public void tearDown() throws Exception + { + TestingUtil.killCaches(cache); + cache = null; + } + + public void testExpirationWithCacheLoader() throws Exception + { + cache.put(fqn1, ExpirationAlgorithmConfig.EXPIRATION_KEY, past); + + EvictionWatcher w = new EvictionWatcher(cache, fqn1); + ec.startEviction(); + assert w.waitForEviction(30, TimeUnit.SECONDS); + + // loads into memory again + assertNotNull(cache.get(fqn1, ExpirationAlgorithmConfig.EXPIRATION_KEY)); + + EvictionWatcher w2 = new EvictionWatcher(cache, fqn1); + ec.startEviction(); + assert w2.waitForEviction(30, TimeUnit.SECONDS); + } +}

10 years, 9 months

1
0
0 / 0

JBoss Cache SVN: r8579 - in core/tags/3.2.12.GA: src/main/java/org/jboss/cache and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2014-02-12 11:21:30 -0500 (Wed, 12 Feb 2014) New Revision: 8579 Modified: core/tags/3.2.12.GA/pom.xml core/tags/3.2.12.GA/src/main/java/org/jboss/cache/Version.java Log: JBoss Cache Release Script: Updating 3.2.12.GA Modified: core/tags/3.2.12.GA/pom.xml =================================================================== --- core/tags/3.2.12.GA/pom.xml 2014-02-12 16:17:08 UTC (rev 8578) +++ core/tags/3.2.12.GA/pom.xml 2014-02-12 16:21:30 UTC (rev 8579) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <properties> - <jbosscache-core-version>3.2.9-SNAPSHOT</jbosscache-core-version> + <jbosscache-core-version>3.2.12.GA</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>  @@ -477,7 +477,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <jbosscache-core-version>3.2.1-SNAPSHOT-JBossAS</jbosscache-core-version> + <jbosscache-core-version>3.2.12.GA-JBossAS</jbosscache-core-version> <defaultTestGroup>functional,unit</defaultTestGroup> <protocol.stack>tcp</protocol.stack> </properties> Modified: core/tags/3.2.12.GA/src/main/java/org/jboss/cache/Version.java =================================================================== --- core/tags/3.2.12.GA/src/main/java/org/jboss/cache/Version.java 2014-02-12 16:17:08 UTC (rev 8578) +++ core/tags/3.2.12.GA/src/main/java/org/jboss/cache/Version.java 2014-02-12 16:21:30 UTC (rev 8579) @@ -32,10 +32,10 @@ @Immutable public class Version { - public static final String version = "3.2.1-SNAPSHOT"; + public static final String version = "3.2.12.GA"; public static final String codename = "Malagueta"; //public static final String cvs = "$Id$"; - static final byte[] version_id = {'0', '3', '2', '1', 'S'}; + static final byte[] version_id = {'0','3','2','1','2','G','A'}; private static final int MAJOR_SHIFT = 11; private static final int MINOR_SHIFT = 6;

10 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r8578 - core/tags.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2014-02-12 11:17:08 -0500 (Wed, 12 Feb 2014) New Revision: 8578 Added: core/tags/3.2.12.GA/ Log: JBoss Cache Release Script: Tagging 3.2.12.GA

10 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits February 2014