SGF-417 - Update apache-geode SDG branch based on the latest Apache Geode developments (snapshot 20150713182515).

This commit is contained in:
John Blum
2015-07-13 17:37:55 -07:00
parent 52b5162d93
commit 2ecbd7b53d
7 changed files with 110 additions and 58 deletions

View File

@@ -31,7 +31,8 @@ import com.gemstone.gemfire.cache.DataPolicy;
public class DataPolicyConverter implements Converter<String, DataPolicy> {
static enum Policy {
DEFAULT, EMPTY, NORMAL, PRELOADED, PARTITION, PERSISTENT_PARTITION, REPLICATE, PERSISTENT_REPLICATE;
DEFAULT, EMPTY, NORMAL, PRELOADED, PARTITION, PERSISTENT_PARTITION, HDFS_PARTITION, HDFS_PERSISTENT_PARTITION,
REPLICATE, PERSISTENT_REPLICATE;
private static String toUpperCase(String value) {
return (value == null ? null : value.toUpperCase());
@@ -58,6 +59,10 @@ public class DataPolicyConverter implements Converter<String, DataPolicy> {
return DataPolicy.PARTITION;
case PERSISTENT_PARTITION:
return DataPolicy.PERSISTENT_PARTITION;
case HDFS_PARTITION:
return DataPolicy.HDFS_PARTITION;
case HDFS_PERSISTENT_PARTITION:
return DataPolicy.HDFS_PERSISTENT_PARTITION;
case REPLICATE:
return DataPolicy.REPLICATE;
case PERSISTENT_REPLICATE:

View File

@@ -36,6 +36,7 @@ public enum RegionShortcutWrapper {
LOCAL_PERSISTENT(RegionShortcut.LOCAL_PERSISTENT),
LOCAL_PERSISTENT_OVERFLOW(RegionShortcut.LOCAL_PERSISTENT_OVERFLOW),
PARTITION(RegionShortcut.PARTITION),
PARTITION_HDFS(RegionShortcut.PARTITION_HDFS),
PARTITION_HEAP_LRU(RegionShortcut.PARTITION_HEAP_LRU),
PARTITION_OVERFLOW(RegionShortcut.PARTITION_OVERFLOW),
PARTITION_PERSISTENT(RegionShortcut.PARTITION_PERSISTENT),
@@ -44,9 +45,12 @@ public enum RegionShortcutWrapper {
PARTITION_PROXY_REDUNDANT(RegionShortcut.PARTITION_PROXY_REDUNDANT),
PARTITION_REDUNDANT(RegionShortcut.PARTITION_REDUNDANT),
PARTITION_REDUNDANT_HEAP_LRU(RegionShortcut.PARTITION_REDUNDANT_HEAP_LRU),
PARTITION_REDUNDANT_HDFS(RegionShortcut.PARTITION_REDUNDANT_HDFS),
PARTITION_REDUNDANT_OVERFLOW(RegionShortcut.PARTITION_REDUNDANT_OVERFLOW),
PARTITION_REDUNDANT_PERSISTENT(RegionShortcut.PARTITION_REDUNDANT_PERSISTENT),
PARTITION_REDUNDANT_PERSISTENT_OVERFLOW(RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW),
PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE(RegionShortcut.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE),
PARTITION_WRITEONLY_HDFS_STORE(RegionShortcut.PARTITION_WRITEONLY_HDFS_STORE),
REPLICATE(RegionShortcut.REPLICATE),
REPLICATE_HEAP_LRU(RegionShortcut.REPLICATE_HEAP_LRU),
REPLICATE_OVERFLOW(RegionShortcut.REPLICATE_OVERFLOW),