[geode] branch develop updated: The RedisData region name now starts with "__". (#5181)

[jensdeppe]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 83b40f5  The RedisData region name now starts with "__". (#5181)
83b40f5 is described below

commit 83b40f5c46f3b35ac41cc22051c83092223c30b5
Author: Darrel Schneider <dschnei...@pivotal.io>
AuthorDate: Fri May 29 06:52:02 2020 -0700

    The RedisData region name now starts with "__". (#5181)
    
    - Also it now always tries to create the region and will fail
    if it already exists.
---
 .../org/apache/geode/redis/internal/GeodeRedisServer.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git 
a/geode-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
 
b/geode-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
index 8d16729..0de1d0d 100644
--- 
a/geode-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
+++ 
b/geode-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
@@ -149,7 +149,7 @@ public class GeodeRedisServer {
   /**
    * The name of the region that holds data stored in redis.
    */
-  public static final String REDIS_DATA_REGION = "REDIS_DATA";
+  public static final String REDIS_DATA_REGION = "__REDIS_DATA";
 
   /**
    * System property name that can be used to set the number of threads to be 
used by the
@@ -302,12 +302,10 @@ public class GeodeRedisServer {
       Region<ByteArrayWrapper, RedisData> redisData;
       InternalCache gemFireCache = (InternalCache) cache;
 
-      if ((redisData = cache.getRegion(REDIS_DATA_REGION)) == null) {
-        InternalRegionFactory<ByteArrayWrapper, RedisData> 
redisMetaDataFactory =
-            gemFireCache.createInternalRegionFactory(DEFAULT_REGION_TYPE);
-        
redisMetaDataFactory.setInternalRegion(true).setIsUsedForMetaRegion(true);
-        redisData = redisMetaDataFactory.create(REDIS_DATA_REGION);
-      }
+      InternalRegionFactory<ByteArrayWrapper, RedisData> redisMetaDataFactory =
+          gemFireCache.createInternalRegionFactory(DEFAULT_REGION_TYPE);
+      
redisMetaDataFactory.setInternalRegion(true).setIsUsedForMetaRegion(true);
+      redisData = redisMetaDataFactory.create(REDIS_DATA_REGION);
 
       pubSub = new PubSubImpl(new Subscriptions());
       regionProvider = new RegionProvider(redisData);