sabbey37 commented on a change in pull request #6296: URL: https://github.com/apache/geode/pull/6296#discussion_r612515511
########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { Review comment: Not a big deal, but this should be "Increase" instead of "Increases" ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { + jedis1.sadd(SET_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.sadd(SET_KEY, "value"); + jedis1.del(SET_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueSizeDecreases() { + for (int i = 0; i < 10; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 10; i++) { + jedis1.srem(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHashValueSizeIncreases() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hset(HASH_KEY, FIELD + i, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_ShowNoIncreaseInDatastoreBytesInUse_givenHashValueSizeDoesNotIncrease() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenHashValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.hset(HASH_KEY, FIELD, "value"); + jedis1.del(HASH_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetDoesNotIncreaseHashSize() { + jedis2.hset(HASH_KEY, FIELD, "initialvalue"); // two hsets are required to force + jedis2.hset(HASH_KEY, FIELD, "value"); // deserialization on both servers Review comment: Are we supposed to be checking both servers here? Or checking a different server from the one our client is connected to? (Looks like we're using `jedis2`, which is connected to `server2`, but only checking the bytes for `server2`) ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { + jedis1.sadd(SET_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.sadd(SET_KEY, "value"); + jedis1.del(SET_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueSizeDecreases() { + for (int i = 0; i < 10; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 10; i++) { + jedis1.srem(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHashValueSizeIncreases() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hset(HASH_KEY, FIELD + i, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_ShowNoIncreaseInDatastoreBytesInUse_givenHashValueSizeDoesNotIncrease() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenHashValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.hset(HASH_KEY, FIELD, "value"); + jedis1.del(HASH_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetDoesNotIncreaseHashSize() { + jedis2.hset(HASH_KEY, FIELD, "initialvalue"); // two hsets are required to force + jedis2.hset(HASH_KEY, FIELD, "value"); // deserialization on both servers + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + for (int i = 0; i < 10; i++) { + jedis2.hset(HASH_KEY, FIELD, "value"); + } + + assertThat(jedis2.hgetAll(HASH_KEY).size()).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHSetNXIncreasesHashSize() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD + i, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetNXDoesNotIncreaseHashSize() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + // confirm that the other member agrees upon size + + @Test + public void should_showMembersAgreeUponUsedHashMemory_afterDeltaPropagation() { Review comment: If we're checking that the members agree upon used memory, should we be checking the bytes in use for both server1 and server2 and asserting they are equal after each step (after we do the initial hsets and after the hsets in the for loop)? ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { Review comment: Not a big deal, but this should be "Increase" instead of "Increases" ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { + jedis1.sadd(SET_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + Review comment: For this test as well as the `givenXDeleted` tests below, we aren't actually testing that the bytes decreased as the test name suggests. We are testing that they return to their initial values. The above test (`should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted`) does test that the bytes decrease.... we could potentially do both things (get the bytes before any operation, get the bytes after an operation, and get the bytes after a del, then verify the bytes decreased and then returned to their initial value)... ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { + jedis1.sadd(SET_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.sadd(SET_KEY, "value"); + jedis1.del(SET_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueSizeDecreases() { + for (int i = 0; i < 10; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 10; i++) { + jedis1.srem(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHashValueSizeIncreases() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hset(HASH_KEY, FIELD + i, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_ShowNoIncreaseInDatastoreBytesInUse_givenHashValueSizeDoesNotIncrease() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenHashValueDeleted() { Review comment: Same comment as above (regarding not actually testing what the test name suggests). ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { + jedis1.sadd(SET_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.sadd(SET_KEY, "value"); + jedis1.del(SET_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueSizeDecreases() { + for (int i = 0; i < 10; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 10; i++) { + jedis1.srem(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHashValueSizeIncreases() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hset(HASH_KEY, FIELD + i, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_ShowNoIncreaseInDatastoreBytesInUse_givenHashValueSizeDoesNotIncrease() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenHashValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.hset(HASH_KEY, FIELD, "value"); + jedis1.del(HASH_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetDoesNotIncreaseHashSize() { + jedis2.hset(HASH_KEY, FIELD, "initialvalue"); // two hsets are required to force + jedis2.hset(HASH_KEY, FIELD, "value"); // deserialization on both servers + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + for (int i = 0; i < 10; i++) { + jedis2.hset(HASH_KEY, FIELD, "value"); + } + + assertThat(jedis2.hgetAll(HASH_KEY).size()).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHSetNXIncreasesHashSize() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD + i, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetNXDoesNotIncreaseHashSize() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + // confirm that the other member agrees upon size + + @Test + public void should_showMembersAgreeUponUsedHashMemory_afterDeltaPropagation() { + jedis1.hset(HASH_KEY, FIELD, "initialvalue"); // two hsets are required to force + jedis1.hset(HASH_KEY, FIELD, "finalvalue"); // deserialization on both servers + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + for (int i = 0; i < 10; i++) { + jedis1.hset(HASH_KEY, FIELD, "finalvalue"); + } + + assertThat(jedis1.hgetAll(HASH_KEY).size()).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showMembersAgreeUponUsedSetMemory_afterDeltaPropagation() { + jedis1.sadd(SET_KEY, "value"); // two sadds are required to force + jedis1.sadd(SET_KEY, "value"); // deserialization on both servers + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + for (int i = 0; i < 10; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showMembersAgreeUponUsedStringMemory_afterDeltaPropagation() { Review comment: same comment as above. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java ########## @@ -58,6 +59,9 @@ private ConcurrentHashMap<UUID, List<ByteArrayWrapper>> hScanSnapShots; private ConcurrentHashMap<UUID, Long> hScanSnapShotCreationTimes; private ScheduledExecutorService HSCANSnapshotExpirationExecutor = null; + private static final int PER_STRING_OVERHEAD = PER_OBJECT_OVERHEAD + 46; + private static final int PER_HASH_OVERHEAD = PER_OBJECT_OVERHEAD + 116; Review comment: Apologies if this is obvious, but how did we come up with the `46` and `116` here? ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.set(STRING_KEY, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenSetValueSizeIncreases() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenSetValueSizeDoesNotIncreases() { + jedis1.sadd(SET_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.sadd(SET_KEY, "value"); + } + + assertThat(jedis1.scard(SET_KEY)).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.sadd(SET_KEY, "value"); + jedis1.del(SET_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenSetValueSizeDecreases() { + for (int i = 0; i < 10; i++) { + jedis1.sadd(SET_KEY, "value" + i); + } + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 10; i++) { + jedis1.srem(SET_KEY, "value" + i); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHashValueSizeIncreases() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hset(HASH_KEY, FIELD + i, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_ShowNoIncreaseInDatastoreBytesInUse_givenHashValueSizeDoesNotIncrease() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenHashValueDeleted() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.hset(HASH_KEY, FIELD, "value"); + jedis1.del(HASH_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetDoesNotIncreaseHashSize() { + jedis2.hset(HASH_KEY, FIELD, "initialvalue"); // two hsets are required to force + jedis2.hset(HASH_KEY, FIELD, "value"); // deserialization on both servers + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + for (int i = 0; i < 10; i++) { + jedis2.hset(HASH_KEY, FIELD, "value"); + } + + assertThat(jedis2.hgetAll(HASH_KEY).size()).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenHSetNXIncreasesHashSize() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD + i, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenHSetNXDoesNotIncreaseHashSize() { + jedis1.hset(HASH_KEY, FIELD, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.hsetnx(HASH_KEY, FIELD, "value"); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + // confirm that the other member agrees upon size + + @Test + public void should_showMembersAgreeUponUsedHashMemory_afterDeltaPropagation() { + jedis1.hset(HASH_KEY, FIELD, "initialvalue"); // two hsets are required to force + jedis1.hset(HASH_KEY, FIELD, "finalvalue"); // deserialization on both servers + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + for (int i = 0; i < 10; i++) { + jedis1.hset(HASH_KEY, FIELD, "finalvalue"); + } + + assertThat(jedis1.hgetAll(HASH_KEY).size()).isEqualTo(1); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server2); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showMembersAgreeUponUsedSetMemory_afterDeltaPropagation() { + jedis1.sadd(SET_KEY, "value"); // two sadds are required to force Review comment: same comment as above. ########## File path: geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java ########## @@ -0,0 +1,512 @@ +/* + * 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.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import org.assertj.core.data.Offset; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.Jedis; + +import org.apache.geode.internal.size.ReflectionObjectSizer; +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(3); + + private static MemberVM server1; + private static MemberVM server2; + + private static Jedis jedis1; + private static Jedis jedis2; + + private static final int JEDIS_TIMEOUT = Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static final String LOCAL_HOST = "127.0.0.1"; + public static final String STRING_KEY = "string key"; + public static final String SET_KEY = "set key"; + public static final String HASH_KEY = "hash key"; + public static final String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + public static final String FIELD = "field"; + private static final int SET_SIZE = 1000; + + private ReflectionObjectSizer ros = ReflectionObjectSizer.getInstance(); + + @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); + + server2 = clusterStartUpRule.startRedisVM(2, locatorPort); + int redisServerPort2 = clusterStartUpRule.getRedisPort(1); + jedis2 = new Jedis(LOCAL_HOST, redisServerPort2, JEDIS_TIMEOUT); + } + + @Before + public void setup() { + jedis1.flushAll(); + } + + @Test + public void should_showIncreaseInDatastoreBytesInUse_givenStringValueSizeIncreases() { + String LONG_APPEND_VALUE = String.valueOf(Integer.MAX_VALUE); + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + for (int i = 0; i < 1000; i++) { + jedis1.append(STRING_KEY, LONG_APPEND_VALUE); + } + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isGreaterThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueDeleted() { + jedis1.set(STRING_KEY, "value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.del(STRING_KEY); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_showDecreaseInDatastoreBytesInUse_givenStringValueShortened() { + jedis1.set(STRING_KEY, "longer value"); + + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + jedis1.set(STRING_KEY, "value"); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isLessThan(initialDataStoreBytesInUse); + } + + @Test + public void should_resetMemoryUsage_givenFlushAllCommand() { + long initialDataStoreBytesInUse = + clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(initialDataStoreBytesInUse).isEqualTo(0L); + + jedis1.set(STRING_KEY, "value"); + + jedis1.flushAll(); + + long finalDataStoreBytesInUse = clusterStartUpRule.getDataStoreBytesInUseForDataRegion(server1); + + assertThat(finalDataStoreBytesInUse).isEqualTo(initialDataStoreBytesInUse); + } + + @Test + public void should_showNoIncreaseInDatastoreBytesInUse_givenStringValueSizeDoesNotIncreases() { Review comment: Not a big deal, but this should be "Increase" instead of "Increases" -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
