[jboss-cvs] JBossCache/src/org/jboss/cache/eviction ...
Manik Surtani
msurtani at jboss.com
Tue Nov 14 09:17:11 EST 2006
User: msurtani
Date: 06/11/14 09:17:11
Modified: src/org/jboss/cache/eviction LRUPolicy.java
MRUAlgorithm.java LFUAlgorithm.java
ElementSizeAlgorithm.java EvictedEventNode.java
EvictionPolicyConfig.java EvictionAlgorithm.java
EvictionTimerTask.java EvictionPolicy.java
BaseSortedEvictionAlgorithm.java FIFOAlgorithm.java
BaseEvictionAlgorithm.java LRUAlgorithm.java
Removed: src/org/jboss/cache/eviction Region.java
RegionManager.java
Log:
Merged eviction.Region and Region, eviction.RegionManager and RegionManager (lots of changes, now needs v. thorough testing)
Revision Changes Path
1.11 +3 -2 JBossCache/src/org/jboss/cache/eviction/LRUPolicy.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUPolicy.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LRUPolicy.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- LRUPolicy.java 11 Apr 2006 11:42:31 -0000 1.10
+++ LRUPolicy.java 14 Nov 2006 14:17:11 -0000 1.11
@@ -8,6 +8,7 @@
package org.jboss.cache.eviction;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.RegionManager;
/**
* Provider to provide eviction policy. This one is based on LRU algorithm that a user
@@ -15,7 +16,7 @@
*
* @author Ben Wang 02-2004
* @author Daniel Huang - dhuang at jboss.org
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class LRUPolicy extends BaseEvictionPolicy implements EvictionPolicy
{
@@ -42,6 +43,6 @@
public void configure(TreeCache cache)
{
super.configure(cache);
- regionManager_ = cache_.getEvictionRegionManager();
+ regionManager_ = cache_.getRegionManager();
}
}
1.4 +2 -1 JBossCache/src/org/jboss/cache/eviction/MRUAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/MRUAlgorithm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MRUAlgorithm.java 27 Oct 2006 19:26:07 -0000 1.3
+++ MRUAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.4
@@ -7,6 +7,7 @@
package org.jboss.cache.eviction;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
/**
* Most Recently Used Algorithm.
@@ -17,7 +18,7 @@
* EvictionAlgorithm/EvictionQueue/EvictionConfiguration are only operated on by one thread at any given time.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class MRUAlgorithm extends BaseEvictionAlgorithm
{
1.7 +2 -1 JBossCache/src/org/jboss/cache/eviction/LFUAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LFUAlgorithm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- LFUAlgorithm.java 27 Oct 2006 19:26:07 -0000 1.6
+++ LFUAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.7
@@ -8,6 +8,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Region;
/**
* Least Frequently Used algorithm for cache eviction.
@@ -29,7 +30,7 @@
* a node is visited, the less likely it will be evicted.
*
* @author Daniel Huang - dhuang at jboss.org 10/2005
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class LFUAlgorithm extends BaseSortedEvictionAlgorithm implements EvictionAlgorithm
{
1.3 +3 -1 JBossCache/src/org/jboss/cache/eviction/ElementSizeAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/ElementSizeAlgorithm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ElementSizeAlgorithm.java 27 Oct 2006 19:26:07 -0000 1.2
+++ ElementSizeAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.3
@@ -6,10 +6,12 @@
*/
package org.jboss.cache.eviction;
+import org.jboss.cache.Region;
+
/**
* @author Daniel Huang
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ElementSizeAlgorithm extends BaseSortedEvictionAlgorithm
{
1.7 +1 -1 JBossCache/src/org/jboss/cache/eviction/EvictedEventNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictedEventNode.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictedEventNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- EvictedEventNode.java 12 Oct 2006 03:39:09 -0000 1.6
+++ EvictedEventNode.java 14 Nov 2006 14:17:11 -0000 1.7
@@ -13,7 +13,7 @@
*
* @author Ben Wang 2-2004
* @author Daniel Huang (dhuang at jboss.org)
- * @see Region
+ * @see org.jboss.cache.Region
*/
public class EvictedEventNode
{
1.5 +1 -1 JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfig.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionPolicyConfig.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- EvictionPolicyConfig.java 27 Oct 2006 19:26:07 -0000 1.4
+++ EvictionPolicyConfig.java 14 Nov 2006 14:17:11 -0000 1.5
@@ -21,7 +21,7 @@
{
/**
* Gets the class name of the {@link EvictionPolicy} implementation
- * this object will be used to configure. Used by {@link RegionManager}
+ * this object will be used to configure. Used by {@link org.jboss.cache.RegionManager}
* to instantiate the policy.
*
* @return fully qualified class name
1.4 +3 -1 JBossCache/src/org/jboss/cache/eviction/EvictionAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionAlgorithm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EvictionAlgorithm.java 12 Oct 2006 23:03:58 -0000 1.3
+++ EvictionAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.4
@@ -1,5 +1,7 @@
package org.jboss.cache.eviction;
+import org.jboss.cache.Region;
+
/**
* Interface for all eviction algorithms.
* <p/>
@@ -8,7 +10,7 @@
*
* @author Ben Wang 2-2004
* @author Daniel Huang - dhuang at jboss.org - 10/2005
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public interface EvictionAlgorithm
{
1.6 +2 -1 JBossCache/src/org/jboss/cache/eviction/EvictionTimerTask.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionTimerTask.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionTimerTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- EvictionTimerTask.java 12 Oct 2006 23:03:58 -0000 1.5
+++ EvictionTimerTask.java 14 Nov 2006 14:17:11 -0000 1.6
@@ -9,6 +9,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Region;
import java.util.Collections;
import java.util.HashSet;
@@ -21,7 +22,7 @@
*
* @author Ben Wang 2-2004
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class EvictionTimerTask extends TimerTask
{
1.7 +3 -3 JBossCache/src/org/jboss/cache/eviction/EvictionPolicy.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionPolicy.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionPolicy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- EvictionPolicy.java 27 Oct 2006 19:26:07 -0000 1.6
+++ EvictionPolicy.java 14 Nov 2006 14:17:11 -0000 1.7
@@ -6,11 +6,11 @@
*/
package org.jboss.cache.eviction;
-import java.util.Set;
-
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
+import java.util.Set;
+
/**
* Generic eviction policy interface.
* <p/>
@@ -82,7 +82,7 @@
* <p>
* If this method returns false then the event is processed normally
* and eviction processing for the node continues. As a result, the event
- * will be added to the {@link Region eviction region's} event queue where
+ * will be added to the {@link org.jboss.cache.Region eviction region's} event queue where
* at some later point the particular algorithm of the eviction policy
* can use it to decide whether to call {@link #evict(Fqn)}.
* </p>
1.5 +1 -0 JBossCache/src/org/jboss/cache/eviction/BaseSortedEvictionAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseSortedEvictionAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/BaseSortedEvictionAlgorithm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- BaseSortedEvictionAlgorithm.java 12 Oct 2006 03:36:46 -0000 1.4
+++ BaseSortedEvictionAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.5
@@ -9,6 +9,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
/**
1.7 +2 -1 JBossCache/src/org/jboss/cache/eviction/FIFOAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/FIFOAlgorithm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- FIFOAlgorithm.java 27 Oct 2006 19:26:07 -0000 1.6
+++ FIFOAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.7
@@ -8,13 +8,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Region;
/**
* First-in-first-out algorithm used to evict nodes.
*
* @author Daniel Huang - dhuang at jboss.org
* @author Morten Kvistgaard
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class FIFOAlgorithm extends BaseEvictionAlgorithm
{
1.14 +2 -1 JBossCache/src/org/jboss/cache/eviction/BaseEvictionAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseEvictionAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/BaseEvictionAlgorithm.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- BaseEvictionAlgorithm.java 12 Oct 2006 23:03:58 -0000 1.13
+++ BaseEvictionAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.14
@@ -10,6 +10,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Region;
import org.jboss.cache.lock.TimeoutException;
/**
@@ -19,7 +20,7 @@
* abstract methods and a policy.
*
* @author Daniel Huang - dhuang at jboss.org 10/2005
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public abstract class BaseEvictionAlgorithm implements EvictionAlgorithm
{
1.14 +1 -0 JBossCache/src/org/jboss/cache/eviction/LRUAlgorithm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUAlgorithm.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LRUAlgorithm.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- LRUAlgorithm.java 27 Oct 2006 19:26:07 -0000 1.13
+++ LRUAlgorithm.java 14 Nov 2006 14:17:11 -0000 1.14
@@ -9,6 +9,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Region;
import java.util.Iterator;
More information about the jboss-cvs-commits
mailing list