Revert "GEODE-7504: region eviction support (apache#4386)" (apache#4421)

This reverts commit 332e3f0.

Author: jinmeiliao

geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java

@@ -27,13 +27,9 @@
 import org.junit.Test;
 
 import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.EvictionAction;
-import org.apache.geode.cache.EvictionAlgorithm;
-import org.apache.geode.cache.EvictionAttributes;
 import org.apache.geode.cache.ExpirationAction;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.configuration.CacheConfig;
-import org.apache.geode.cache.configuration.EnumActionDestroyOverflow;
 import org.apache.geode.cache.configuration.RegionAttributesType;
 import org.apache.geode.cache.configuration.RegionConfig;
 import org.apache.geode.management.api.ClusterManagementRealizationResult;
@@ -281,52 +277,4 @@ public void createRegionWithExpiration() throws Exception {
     assertThat(expirations.get(1).getAction()).isEqualTo(Region.ExpirationAction.INVALIDATE);
     assertThat(expirations.get(1).getType()).isEqualTo(Region.ExpirationType.ENTRY_TIME_TO_LIVE);
   }
-
-  @Test
-  public void createRegionWithEviction() {
-    Region region = new Region();
-    String regionName = "createRegionWithEviction";
-    region.setName(regionName);
-    region.setType(RegionType.REPLICATE);
-    Region.Eviction eviction = new Region.Eviction();
-    eviction.setAction(Region.EvictionAction.OVERFLOW_TO_DISK);
-    eviction.setEntryCount(100);
-    region.setEviction(eviction);
-
-    assertManagementResult(cms.create(region)).isSuccessful();
-
-    locator.invoke(() -> {
-      CacheConfig cacheConfig =
-          ClusterStartupRule.getLocator().getConfigurationPersistenceService()
-              .getCacheConfig("cluster");
-      RegionConfig regionConfig = find(cacheConfig.getRegions(), regionName);
-      RegionAttributesType regionAttributes = regionConfig.getRegionAttributes();
-      RegionAttributesType.EvictionAttributes evictionAttributes =
-          regionAttributes.getEvictionAttributes();
-      assertThat(evictionAttributes).isNotNull();
-      assertThat(evictionAttributes.getLruEntryCount()).isNotNull();
-      assertThat(evictionAttributes.getLruEntryCount().getAction()).isEqualTo(
-          EnumActionDestroyOverflow.OVERFLOW_TO_DISK);
-      assertThat(evictionAttributes.getLruEntryCount().getMaximum()).isEqualTo("100");
-    });
-
-    server1.invoke(() -> {
-      Cache cache = ClusterStartupRule.getCache();
-      org.apache.geode.cache.Region actualRegion = cache.getRegion(regionName);
-      RegionAttributes attributes = actualRegion.getAttributes();
-      EvictionAttributes evictionAttributes = attributes.getEvictionAttributes();
-      assertThat(evictionAttributes).isNotNull();
-      assertThat(evictionAttributes.getAlgorithm()).isEqualTo(EvictionAlgorithm.LRU_ENTRY);
-      assertThat(evictionAttributes.getAction()).isEqualTo(EvictionAction.OVERFLOW_TO_DISK);
-      assertThat(evictionAttributes.getMaximum()).isEqualTo(100);
-
-    });
-
-    Region regionResult = cms.get(region).getConfigResult();
-    Region.Eviction eviction2 = regionResult.getEviction();
-    assertThat(eviction2).isNotNull();
-    assertThat(eviction2.getType()).isEqualTo(Region.EvictionType.ENTRY_COUNT);
-    assertThat(eviction2.getEntryCount()).isEqualTo(100);
-    assertThat(eviction2.getAction()).isEqualTo(Region.EvictionAction.OVERFLOW_TO_DISK);
-  }
 }

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -746,9 +746,6 @@ javadoc/org/apache/geode/management/configuration/Index.html
 javadoc/org/apache/geode/management/configuration/Links.html
 javadoc/org/apache/geode/management/configuration/Member.html
 javadoc/org/apache/geode/management/configuration/Pdx.html
-javadoc/org/apache/geode/management/configuration/Region.Eviction.html
-javadoc/org/apache/geode/management/configuration/Region.EvictionAction.html
-javadoc/org/apache/geode/management/configuration/Region.EvictionType.html
 javadoc/org/apache/geode/management/configuration/Region.Expiration.html
 javadoc/org/apache/geode/management/configuration/Region.ExpirationAction.html
 javadoc/org/apache/geode/management/configuration/Region.ExpirationType.html

geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java

@@ -85,7 +85,11 @@ public DeclarableType(String className, Properties properties) {
     }
 
     this.className = className;
-    setParameters(properties);
+
+    if (properties != null) {
+      parameters = properties.stringPropertyNames().stream()
+          .map(k -> new ParameterType(k, properties.getProperty(k))).collect(Collectors.toList());
+    }
   }
 
   /**
@@ -114,16 +118,6 @@ public List<ParameterType> getParameters() {
     return this.parameters;
   }
 
-  public void setParameters(Properties properties) {
-    if (properties == null) {
-      this.parameters = null;
-      return;
-    }
-
-    parameters = properties.stringPropertyNames().stream()
-        .map(k -> new ParameterType(k, properties.getProperty(k))).collect(Collectors.toList());
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java

@@ -2060,7 +2060,7 @@ public static class EvictionAttributes implements Serializable {
 
     public static EvictionAttributes generate(String evictionAction,
         Integer maxMemory, Integer maxEntryCount,
-        ClassName objectSizer) {
+        String objectSizer) {
       if (evictionAction == null && maxMemory == null && maxEntryCount == null
           && objectSizer == null) {
         return null;
@@ -2074,19 +2074,13 @@ public static EvictionAttributes generate(String evictionAction,
         LruHeapPercentage heapPercentage =
             new LruHeapPercentage();
         heapPercentage.setAction(action);
-        if (objectSizer != null) {
-          heapPercentage.setClassName(objectSizer.getClassName());
-          heapPercentage.setParameters(objectSizer.getInitProperties());
-        }
+        heapPercentage.setClassName(objectSizer);
         evictionAttributes.setLruHeapPercentage(heapPercentage);
       } else if (maxMemory != null) {
         LruMemorySize memorySize =
             new LruMemorySize();
         memorySize.setAction(action);
-        if (objectSizer != null) {
-          memorySize.setClassName(objectSizer.getClassName());
-          memorySize.setParameters(objectSizer.getInitProperties());
-        }
+        memorySize.setClassName(objectSizer);
         memorySize.setMaximum(maxMemory.toString());
         evictionAttributes.setLruMemorySize(memorySize);
       } else {
@@ -2099,15 +2093,6 @@ public static EvictionAttributes generate(String evictionAction,
       return evictionAttributes;
     }
 
-    public static EvictionAttributes generate(String evictionAction,
-        Integer maxMemory, Integer maxEntryCount,
-        String objectSizer) {
-      if (objectSizer == null) {
-        return generate(evictionAction, maxMemory, maxEntryCount, (ClassName) null);
-      }
-      return generate(evictionAction, maxMemory, maxEntryCount, new ClassName(objectSizer));
-    }
-
     /**
      * Gets the value of the lruEntryCount property.
      *

geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/RegionConverter.java

@@ -31,8 +31,6 @@
 import org.apache.geode.management.configuration.RegionType;
 
 public class RegionConverter extends ConfigurationConverter<Region, RegionConfig> {
-  private final ClassNameConverter classNameConverter = new ClassNameConverter();
-
   @Override
   protected Region fromNonNullXmlObject(RegionConfig xmlObject) {
     Region region = new Region();
@@ -76,20 +74,6 @@ protected Region fromNonNullXmlObject(RegionConfig xmlObject) {
       if (!expirations.isEmpty()) {
         region.setExpirations(expirations);
       }
-
-      if (regionAttributes.getEvictionAttributes() != null) {
-        RegionAttributesType.EvictionAttributes evictionAttributes =
-            regionAttributes.getEvictionAttributes();
-        if (evictionAttributes.getLruMemorySize() != null) {
-          region.setEviction(convertFrom(evictionAttributes.getLruMemorySize()));
-        }
-        if (evictionAttributes.getLruEntryCount() != null) {
-          region.setEviction(convertFrom(evictionAttributes.getLruEntryCount()));
-        }
-        if (evictionAttributes.getLruHeapPercentage() != null) {
-          region.setEviction(convertFrom(evictionAttributes.getLruHeapPercentage()));
-        }
-      }
     }
 
     return region;
@@ -109,6 +93,7 @@ protected RegionConfig fromNonNullConfigObject(Region configObject) {
     attributesType.setDiskStoreName(configObject.getDiskStoreName());
     attributesType.setKeyConstraint(configObject.getKeyConstraint());
     attributesType.setValueConstraint(configObject.getValueConstraint());
+    region.setRegionAttributes(attributesType);
 
     if (configObject.getRedundantCopies() != null) {
       RegionAttributesType.PartitionAttributes partitionAttributes =
@@ -130,72 +115,9 @@ protected RegionConfig fromNonNullConfigObject(Region configObject) {
         }
       }
     }
-
-    if (configObject.getEviction() != null) {
-      attributesType.setEvictionAttributes(convertFrom(configObject.getEviction()));
-    }
-
-    region.setRegionAttributes(attributesType);
     return region;
   }
 
-  private RegionAttributesType.EvictionAttributes convertFrom(Region.Eviction eviction) {
-    return RegionAttributesType.EvictionAttributes.generate(getEvictionActionString(eviction),
-        eviction.getMemorySizeMb(), eviction.getEntryCount(), eviction.getObjectSizer());
-  }
-
-  private String getEvictionActionString(Region.Eviction eviction) {
-    if (eviction.getAction() == null) {
-      return "local-destroy";
-    } else {
-      switch (eviction.getAction()) {
-        case LOCAL_DESTROY:
-          return "local-destroy";
-        case OVERFLOW_TO_DISK:
-          return "overflow-to-disk";
-        default:
-          throw new IllegalStateException("Unhandled eviction action: " + eviction.getAction());
-      }
-    }
-  }
-
-  private Region.EvictionAction getEvictionAction(EnumActionDestroyOverflow evictionAction) {
-    switch (evictionAction) {
-      case LOCAL_DESTROY:
-        return Region.EvictionAction.LOCAL_DESTROY;
-      case OVERFLOW_TO_DISK:
-        return Region.EvictionAction.OVERFLOW_TO_DISK;
-      default:
-        throw new IllegalStateException("Unhandled eviction action xml: " + evictionAction);
-    }
-  }
-
-  Region.Eviction convertFrom(
-      RegionAttributesType.EvictionAttributes.LruMemorySize evictionAttributes) {
-    Region.Eviction eviction = new Region.Eviction();
-    eviction.setAction(getEvictionAction(evictionAttributes.getAction()));
-    eviction.setMemorySizeMb(Integer.parseInt(evictionAttributes.getMaximum()));
-    eviction.setObjectSizer(classNameConverter.fromXmlObject(evictionAttributes));
-    return eviction;
-  }
-
-  Region.Eviction convertFrom(
-      RegionAttributesType.EvictionAttributes.LruEntryCount evictionAttributes) {
-    Region.Eviction eviction = new Region.Eviction();
-    eviction.setAction(getEvictionAction(evictionAttributes.getAction()));
-    eviction.setEntryCount(Integer.parseInt(evictionAttributes.getMaximum()));
-    return eviction;
-  }
-
-  Region.Eviction convertFrom(
-      RegionAttributesType.EvictionAttributes.LruHeapPercentage evictionAttributes) {
-    Region.Eviction eviction = new Region.Eviction();
-    eviction.setAction(getEvictionAction(evictionAttributes.getAction()));
-    eviction.setObjectSizer(classNameConverter.fromXmlObject(evictionAttributes));
-    eviction.setType(Region.EvictionType.HEAP_PERCENTAGE);
-    return eviction;
-  }
-
   RegionAttributesType.ExpirationAttributesType convertFrom(Region.Expiration expiration) {
     RegionAttributesType.ExpirationAttributesType xmlExpiration =
         new RegionAttributesType.ExpirationAttributesType();

geode-core/src/main/java/org/apache/geode/management/internal/configuration/validators/RegionConfigValidator.java

@@ -98,39 +98,6 @@ private void validateCreate(Region config) {
         existingTypes.add(expiration.getType());
       }
     }
-
-    // validate eviction
-    validateEviction(config.getEviction());
-  }
-
-  private void validateEviction(Region.Eviction eviction) {
-    if (eviction == null) {
-      return;
-    }
-
-    Region.EvictionType type = eviction.getType();
-    if (type == null) {
-      throw new IllegalArgumentException("Eviction type must be set.");
-    }
-
-    switch (type) {
-      case ENTRY_COUNT:
-        if (eviction.getEntryCount() == null) {
-          throw new IllegalArgumentException(
-              "EntryCount must be set for: " + type);
-        }
-        if (eviction.getObjectSizer() != null) {
-          throw new IllegalArgumentException(
-              "ObjectSizer must not be set for: " + type);
-        }
-        break;
-      case MEMORY_SIZE:
-        if (eviction.getMemorySizeMb() == null) {
-          throw new IllegalArgumentException(
-              "MemorySizeMb must be set for: " + type);
-        }
-        break;
-    }
   }
 
   private void validate(Region.Expiration expiration) {

geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-management-serializables.txt

@@ -8,17 +8,14 @@ org/apache/geode/management/configuration/GroupableConfiguration,false,group:jav
 org/apache/geode/management/configuration/Index,false,expression:java/lang/String,keyIndex:java/lang/Boolean,name:java/lang/String,regionPath:java/lang/String
 org/apache/geode/management/configuration/Member,false,id:java/lang/String
 org/apache/geode/management/configuration/Pdx,false,autoSerializer:org/apache/geode/management/configuration/AutoSerializer,diskStoreName:java/lang/String,ignoreUnreadFields:java/lang/Boolean,pdxSerializer:org/apache/geode/management/configuration/ClassName,readSerialized:java/lang/Boolean
-org/apache/geode/management/configuration/Region,false,diskStoreName:java/lang/String,eviction:org/apache/geode/management/configuration/Region$Eviction,expirations:java/util/List,keyConstraint:java/lang/String,name:java/lang/String,redundantCopies:java/lang/Integer,type:org/apache/geode/management/configuration/RegionType,valueConstraint:java/lang/String
-org/apache/geode/management/configuration/Region$Eviction,false,action:org/apache/geode/management/configuration/Region$EvictionAction,limit:java/lang/Integer,objectSizer:org/apache/geode/management/configuration/ClassName,type:org/apache/geode/management/configuration/Region$EvictionType
-org/apache/geode/management/configuration/Region$EvictionAction,false
-org/apache/geode/management/configuration/Region$EvictionType,false
+org/apache/geode/management/configuration/Region,false,diskStoreName:java/lang/String,expirations:java/util/List,keyConstraint:java/lang/String,name:java/lang/String,redundantCopies:java/lang/Integer,type:org/apache/geode/management/configuration/RegionType,valueConstraint:java/lang/String
 org/apache/geode/management/configuration/Region$Expiration,false,action:org/apache/geode/management/configuration/Region$ExpirationAction,timeInSeconds:java/lang/Integer,type:org/apache/geode/management/configuration/Region$ExpirationType
 org/apache/geode/management/configuration/Region$ExpirationAction,false
 org/apache/geode/management/configuration/Region$ExpirationType,false
 org/apache/geode/management/configuration/RegionType,false
 org/apache/geode/management/runtime/CacheServerInfo,true,1,bindAddress:java/lang/String,isRunning:boolean,maxConnections:int,maxThreads:int,port:int
 org/apache/geode/management/runtime/GatewayReceiverInfo,false,bindAddress:java/lang/String,connectedSenders:java/lang/String[],hostnameForSenders:java/lang/String,port:int,running:boolean,senderCount:int
 org/apache/geode/management/runtime/MemberInformation,true,1,cacheServerList:java/util/List,cacheXmlFilePath:java/lang/String,clientCount:int,cpuUsage:double,groups:java/lang/String,heapUsage:long,host:java/lang/String,hostedRegions:java/util/Set,httpServiceBindAddress:java/lang/String,httpServicePort:int,id:java/lang/String,initHeapSize:long,isCoordinator:boolean,isSecured:boolean,isServer:boolean,locatorPort:int,locators:java/lang/String,logFilePath:java/lang/String,maxHeapSize:long,offHeapMemorySize:java/lang/String,processId:int,serverBindAddress:java/lang/String,statArchiveFilePath:java/lang/String,status:java/lang/String,webSSL:boolean,workingDirPath:java/lang/String
-org/apache/geode/management/runtime/PdxInfo,false,diskStoreName:java/lang/String,ignoreUnreadFields:boolean,pdxSerializer:java/lang/String,readSerialized:boolean
+ org/apache/geode/management/runtime/PdxInfo,false,diskStoreName:java/lang/String,ignoreUnreadFields:boolean,pdxSerializer:java/lang/String,readSerialized:boolean
 org/apache/geode/management/runtime/RuntimeInfo,false,memberName:java/lang/String
 org/apache/geode/management/runtime/RuntimeRegionInfo,false,entryCount:long

geode-core/src/test/java/org/apache/geode/cache/configuration/RegionAttributesTypeTest.java

@@ -108,35 +108,34 @@ public void expirationAttributesDetail() throws Exception {
 
   @Test
   public void generateEvictionAttributes() {
-    EvictionAttributes evictionAttributes =
-        EvictionAttributes.generate(null, null, null, (String) null);
+    EvictionAttributes evictionAttributes = EvictionAttributes.generate(null, null, null, null);
     assertThat(evictionAttributes).isNull();
 
-    assertThatThrownBy(() -> EvictionAttributes.generate(null, 8, null, (String) null))
+    assertThatThrownBy(() -> EvictionAttributes.generate(null, 8, null, null))
         .isInstanceOf(IllegalArgumentException.class);
 
-    evictionAttributes = EvictionAttributes.generate("local-destroy", null, null, (String) null);
+    evictionAttributes = EvictionAttributes.generate("local-destroy", null, null, null);
     assertThat(evictionAttributes.getLruHeapPercentage().getAction().value())
         .isEqualTo("local-destroy");
     assertThat(evictionAttributes.getLruMemorySize()).isNull();
     assertThat(evictionAttributes.getLruEntryCount()).isNull();
 
-    evictionAttributes = EvictionAttributes.generate("local-destroy", 10, null, (String) null);
+    evictionAttributes = EvictionAttributes.generate("local-destroy", 10, null, null);
     assertThat(evictionAttributes.getLruHeapPercentage()).isNull();
     assertThat(evictionAttributes.getLruMemorySize().getMaximum()).isEqualTo("10");
     assertThat(evictionAttributes.getLruMemorySize().getAction().value())
         .isEqualTo("local-destroy");
     assertThat(evictionAttributes.getLruEntryCount()).isNull();
 
     // maxEntryCount is ignored when maxMemory is specified
-    evictionAttributes = EvictionAttributes.generate("local-destroy", 10, 20, (String) null);
+    evictionAttributes = EvictionAttributes.generate("local-destroy", 10, 20, null);
     assertThat(evictionAttributes.getLruHeapPercentage()).isNull();
     assertThat(evictionAttributes.getLruMemorySize().getMaximum()).isEqualTo("10");
     assertThat(evictionAttributes.getLruMemorySize().getAction().value())
         .isEqualTo("local-destroy");
     assertThat(evictionAttributes.getLruEntryCount()).isNull();
 
-    evictionAttributes = EvictionAttributes.generate("local-destroy", null, 20, (String) null);
+    evictionAttributes = EvictionAttributes.generate("local-destroy", null, 20, null);
     assertThat(evictionAttributes.getLruHeapPercentage()).isNull();
     assertThat(evictionAttributes.getLruMemorySize()).isNull();
     assertThat(evictionAttributes.getLruEntryCount().getMaximum()).isEqualTo("20");