[infinispan-commits] Infinispan SVN: r1574 - in trunk/core/src/main/java/org/infinispan: eviction and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-03-09 05:47:28 -0500 (Tue, 09 Mar 2010)
New Revision: 1574

Modified:
   trunk/core/src/main/java/org/infinispan/config/Configuration.java
   trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
   trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
Log:
[ISPN-364] (Add an EvictionStrategy.UNORDERED for simple, un-ordered eviction)

Modified: trunk/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Configuration.java	2010-03-08 12:16:12 UTC (rev 1573)
+++ trunk/core/src/main/java/org/infinispan/config/Configuration.java	2010-03-09 10:47:28 UTC (rev 1574)
@@ -330,7 +330,7 @@
    public void setEvictionStrategy(String eStrategy){
       this.eviction.strategy = EvictionStrategy.valueOf(uc(eStrategy));
       if (this.eviction.strategy == null) {
-         log.warn("Unknown evictionStrategy  '" + eStrategy + "', using defaults.");
+         log.warn("Unknown evictionStrategy  '" + eStrategy + "'!  Using EvictionStrategy.NONE.");
          this.eviction.setStrategy(EvictionStrategy.NONE);
       }
    }
@@ -1267,8 +1267,8 @@
        */
       protected Long wakeUpInterval=5000L;
 
-      /** @configRef desc="Eviction strategy. Available options are 'NONE', 'FIFO' and 'LRU'."*/
-      protected EvictionStrategy strategy=EvictionStrategy.NONE;
+      /** @configRef desc="Eviction strategy. Available options are 'UNORDERED', 'FIFO', 'LRU' and 'NONE' (to disable eviction)."*/
+      protected EvictionStrategy strategy=EvictionStrategy.UNORDERED;
 
       /** @configRef desc="Maximum number of entries in a cache instance.  -1 means no limit." */
       protected Integer maxEntries=-1;

Modified: trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java	2010-03-08 12:16:12 UTC (rev 1573)
+++ trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java	2010-03-09 10:47:28 UTC (rev 1574)
@@ -7,5 +7,8 @@
  * @since 4.0
  */
 public enum EvictionStrategy {
-   NONE, FIFO, LRU
+   NONE,
+   UNORDERED,
+   FIFO,
+   LRU
 }

Modified: trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java	2010-03-08 12:16:12 UTC (rev 1573)
+++ trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java	2010-03-09 10:47:28 UTC (rev 1574)
@@ -41,6 +41,7 @@
    public <T> T construct(Class<T> componentType) {
       switch (configuration.getEvictionStrategy()) {
          case NONE:
+         case UNORDERED:
             return (T) new SimpleDataContainer(configuration.getConcurrencyLevel());
          case FIFO:
             return (T) new FIFOSimpleDataContainer(configuration.getConcurrencyLevel());