[geode] branch support/1.14 updated: Revert "GEODE-8859: Fix redis-compatability data structure bucket memory-usage reporting (#6084)" (#6260) (#6269)

[nn...@apache.org]

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

nnag pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.14 by this push:
     new e38d710  Revert "GEODE-8859: Fix redis-compatability data structure bucket memory-usage reporting (#6084)" (#6260) (#6269)
e38d710 is described below

commit e38d710f86f73360e36415ef5e28889be07036b2
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Mon Apr 5 18:20:37 2021 -0700

    Revert "GEODE-8859: Fix redis-compatability data structure bucket memory-usage reporting (#6084)" (#6260) (#6269)
    
    This reverts commit e927bdf42b64eac96758642fcd22c8a144a3890e.
    
    (cherry picked from commit 7a85b4df1b80518e7b3d1ff405d0f76ca45fa785)
---
 .../test/dunit/rules/RedisClusterStartupRule.java  |  7 --
 .../data/PartitionedRegionStatsUpdateTest.java     | 76 ----------------------
 .../geode/redis/internal/GeodeRedisServer.java     |  8 ---
 .../geode/redis/internal/GeodeRedisService.java    |  6 --
 .../geode/redis/internal/data/RedisData.java       |  4 --
 5 files changed, 101 deletions(-)

diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java b/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java
index 3112aed..103c175 100644
--- a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java
+++ b/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java
@@ -79,13 +79,6 @@ public class RedisClusterStartupRule extends ClusterStartupRule {
     return getRedisPort(getMember(vmNumber));
   }
 
-  public Long getDataStoreBytesInUseForDataRegion(MemberVM vm) {
-    return vm.invoke(() -> {
-      GeodeRedisService service = ClusterStartupRule.getCache().getService(GeodeRedisService.class);
-      return service.getDataStoreBytesInUseForDataRegion();
-    });
-  }
-
   public int getRedisPort(MemberVM vm) {
     return vm.invoke(() -> {
       GeodeRedisService service = ClusterStartupRule.getCache().getService(GeodeRedisService.class);
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java b/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java
deleted file mode 100644
index 5c28fca..0000000
--- a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- *
- */
-
-
-package org.apache.geode.redis.internal.data;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Properties;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import redis.clients.jedis.Jedis;
-
-import org.apache.geode.test.awaitility.GeodeAwaitility;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.dunit.rules.RedisClusterStartupRule;
-
-public class PartitionedRegionStatsUpdateTest {
-
-  @ClassRule
-  public static RedisClusterStartupRule clusterStartUpRule = new RedisClusterStartupRule(2);
-
-  private static MemberVM server1;
-  private static final String LOCAL_HOST = "127.0.0.1";
-  private static final int JEDIS_TIMEOUT =
-      Math.toIntExact(GeodeAwaitility.getTimeout().toMillis());
-
-  private static Jedis jedis1;
-
-  @BeforeClass
-  public static void classSetup() {
-    Properties locatorProperties = new Properties();
-    locatorProperties.setProperty(MAX_WAIT_TIME_RECONNECT, "15000");
-
-    MemberVM locator = clusterStartUpRule.startLocatorVM(0, locatorProperties);
-    int locatorPort = locator.getPort();
-
-    server1 = clusterStartUpRule.startRedisVM(1, locatorPort);
-    int redisServerPort1 = clusterStartUpRule.getRedisPort(1);
-
-    jedis1 = new Jedis(LOCAL_HOST, redisServerPort1, JEDIS_TIMEOUT);
-  }
-
-  @Test
-  public void should_showIncreaseInDatastoreBytesInUse_givenValueSizeIncreases() {
-    String KEY = "key";
-    String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE);
-    jedis1.set(KEY, "value");
-
-    long initialDataStoreBytesInUse =
-        clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1);
-
-    for (int i = 0; i < 1000; i++) {
-      jedis1.append(KEY, LONG_APPEND_VALUE);
-    }
-
-    long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1);
-    assertThat(initialDataStoreBytesInUse).isLessThan(finalDataStoreBytesInUse);
-  }
-}
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
index 2175046..1c6434d 100644
--- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
+++ b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
@@ -22,7 +22,6 @@ import org.apache.geode.annotations.VisibleForTesting;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.internal.statistics.StatisticsClockFactory;
 import org.apache.geode.logging.internal.executors.LoggingExecutors;
@@ -117,13 +116,6 @@ public class GeodeRedisServer {
   }
 
   @VisibleForTesting
-  protected Long getDataStoreBytesInUseForDataRegion() {
-    PartitionedRegion dataRegion = (PartitionedRegion) this.getRegionProvider().getDataRegion();
-    long dataStoreBytesInUse = dataRegion.getPrStats().getDataStoreBytesInUse();
-    return dataStoreBytesInUse;
-  }
-
-  @VisibleForTesting
   public void setAllowUnsupportedCommands(boolean allowUnsupportedCommands) {
     this.unsupportedCommandsEnabled = allowUnsupportedCommands;
   }
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java
index 2db0cfd..0885556 100644
--- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java
+++ b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java
@@ -17,7 +17,6 @@ package org.apache.geode.redis.internal;
 
 import org.apache.logging.log4j.Logger;
 
-import org.apache.geode.annotations.VisibleForTesting;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.ResourceEvent;
@@ -126,11 +125,6 @@ public class GeodeRedisService implements CacheService, ResourceEventsListener {
     return redisServer.getPort();
   }
 
-  @VisibleForTesting
-  public Long getDataStoreBytesInUseForDataRegion() {
-    return redisServer.getDataStoreBytesInUseForDataRegion();
-  }
-
   public void setEnableUnsupported(boolean unsupported) {
     redisServer.setAllowUnsupportedCommands(unsupported);
   }
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java
index ef1aab0..fddb58b 100644
--- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java
+++ b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java
@@ -57,8 +57,4 @@ public interface RedisData extends Delta, DataSerializableFixedID {
 
   boolean rename(Region<RedisKey, RedisData> region, RedisKey oldKey, RedisKey newKey);
 
-  default boolean getForceRecalculateSize() {
-    return true;
-  }
-
 }