DonalEvans commented on a change in pull request #7261: URL: https://github.com/apache/geode/pull/7261#discussion_r797984534
########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java ########## @@ -0,0 +1,118 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertAtMostNArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_WRONG_TYPE; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.concurrent.atomic.AtomicLong; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; +import redis.clients.jedis.Protocol; + +import org.apache.geode.redis.ConcurrentLoopingThreads; +import org.apache.geode.redis.RedisIntegrationTest; + +public abstract class AbstractLPopIntegrationTest implements RedisIntegrationTest { + public static final String KEY = "key"; + public static final String PREEXISTING_VALUE = "preexistingValue"; + // TODO: make private when we implement Redis 6.2+ behavior for LPOP + protected JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + // Overridden in LPopIntegrationTest until we implement Redis 6.2+ semantics + @Test + public void lpop_givenWrongNumOfArgs_returnsError() { + assertAtMostNArgs(jedis, Protocol.Command.LPOP, 2); + } + + @Test + public void lpop_withNonListKey_Fails() { + jedis.set("string", PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpop("string")).hasMessageContaining(ERROR_WRONG_TYPE); + } + + @Test + public void lpop_withNonExistentKey_returnsNull() { + assertThat(jedis.lpop("nonexistent")).isNull(); + } + + @Test + public void lpop_returnsLeftmostMember() { + jedis.lpush(KEY, "e1", "e2"); + String result = jedis.lpop(KEY); + assertThat(result).isEqualTo("e2"); + } + + @Test + public void lpop_removesKey_whenLastElementRemoved() { + final String keyWithTagForKeysCommand = "{tag}" + KEY; + + jedis.lpush(keyWithTagForKeysCommand, "e1"); + jedis.lpop(keyWithTagForKeysCommand); + assertThat(jedis.keys(keyWithTagForKeysCommand)).isEmpty(); Review comment: Rather than using `jedis.keys()` here, it would be better to use `jedis.exists(KEY)`. This would also remove the need to use a hashtag on the key. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopAndCrashesDUnitTest.java ########## @@ -0,0 +1,108 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopAndCrashesDUnitTest { + public static final int NUM_VMS = 4; Review comment: The default number of VMs started by `ClusterStartupRule` is 4, so it's not necessary to specify it here. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopAndCrashesDUnitTest.java ########## @@ -0,0 +1,108 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopAndCrashesDUnitTest { Review comment: I'm not sure that this test needs its own class. It should be possible to run all of the DUnit tests for LPOP from the same class as long as the `@Before` and `@After` methods are set up correctly. Specifically, if you're crashing VMs, the setup needs to be in a `@Before` rather than a `@BeforeClass` otherwise the VM won't get restarted between runs. ########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java ########## @@ -0,0 +1,118 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertAtMostNArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_WRONG_TYPE; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.concurrent.atomic.AtomicLong; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; +import redis.clients.jedis.Protocol; + +import org.apache.geode.redis.ConcurrentLoopingThreads; +import org.apache.geode.redis.RedisIntegrationTest; + +public abstract class AbstractLPopIntegrationTest implements RedisIntegrationTest { + public static final String KEY = "key"; + public static final String PREEXISTING_VALUE = "preexistingValue"; + // TODO: make private when we implement Redis 6.2+ behavior for LPOP + protected JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + // Overridden in LPopIntegrationTest until we implement Redis 6.2+ semantics + @Test + public void lpop_givenWrongNumOfArgs_returnsError() { + assertAtMostNArgs(jedis, Protocol.Command.LPOP, 2); + } + + @Test + public void lpop_withNonListKey_Fails() { + jedis.set("string", PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpop("string")).hasMessageContaining(ERROR_WRONG_TYPE); + } + + @Test + public void lpop_withNonExistentKey_returnsNull() { + assertThat(jedis.lpop("nonexistent")).isNull(); + } + + @Test + public void lpop_returnsLeftmostMember() { + jedis.lpush(KEY, "e1", "e2"); + String result = jedis.lpop(KEY); + assertThat(result).isEqualTo("e2"); + } + + @Test + public void lpop_removesKey_whenLastElementRemoved() { + final String keyWithTagForKeysCommand = "{tag}" + KEY; + + jedis.lpush(keyWithTagForKeysCommand, "e1"); + jedis.lpop(keyWithTagForKeysCommand); + assertThat(jedis.keys(keyWithTagForKeysCommand)).isEmpty(); + } + + @Test + public void lpop_removesKey_whenLastElementRemoved_multipleTimes() { + final String keyWithTagForKeysCommand = "{tag}" + KEY; + + jedis.lpush(keyWithTagForKeysCommand, "e1"); + assertThat(jedis.lpop(keyWithTagForKeysCommand)).isEqualTo("e1"); + assertThat(jedis.lpop(keyWithTagForKeysCommand)).isNull(); + assertThat(jedis.lpop(keyWithTagForKeysCommand)).isNull(); + assertThat(jedis.keys(keyWithTagForKeysCommand)).isEmpty(); Review comment: Rather than using `jedis.keys()` here, it would be better to use `jedis.exists(KEY)`. This would also remove the need to use a hashtag on the key. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,166 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopDUnitTest { + public static final int NUM_VMS = 4; + public static final int MINIMUM_ITERATIONS = 10000; + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(NUM_VMS); + + @Rule + public ExecutorServiceRule executor = new ExecutorServiceRule(); + + private static JedisCluster jedis; + + @BeforeClass + public static void classSetup() { + MemberVM locator = clusterStartUp.startLocatorVM(0); + clusterStartUp.startRedisVM(1, locator.getPort()); + clusterStartUp.startRedisVM(2, locator.getPort()); + clusterStartUp.startRedisVM(3, locator.getPort()); + + int redisServerPort = clusterStartUp.getRedisPort(1); + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, redisServerPort), REDIS_CLIENT_TIMEOUT); + } + + @Before + public void testSetup() { + clusterStartUp.flushAll(); + } + + @AfterClass + public static void tearDown() { + jedis.close(); + } + + @Test + public void givenBucketsMoveDuringLpop_thenOperationsAreNotLost() throws Exception { + AtomicBoolean running = new AtomicBoolean(true); + + List<String> listHashtags = new ArrayList<>(); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 1)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 2)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 3)); + + lpushPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0)); + lpushPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1)); + lpushPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2)); + + Runnable task1 = + () -> lpopPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0), running); + Runnable task2 = + () -> lpopPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1), running); + Runnable task3 = + () -> lpopPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2), running); + + Future<Void> future1 = executor.runAsync(task1); + Future<Void> future2 = executor.runAsync(task2); + Future<Void> future3 = executor.runAsync(task3); + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + running.set(false); + + future1.get(); + future2.get(); + future3.get(); + } + + private void lpushPerformAndVerify(int index, int minimumIterations, String hashtag) { Review comment: Since we're focusing on testing LPOP in this class, it might be better to have LPUSH called just once, with a pre-populated list of elements. Also, that way, we can pass that same list of elements into the `lpopPerformAndVerify()` method and assert that we're popping them in the correct order rather than just asserting that we don't get duplicates. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,166 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopDUnitTest { + public static final int NUM_VMS = 4; + public static final int MINIMUM_ITERATIONS = 10000; + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(NUM_VMS); + + @Rule + public ExecutorServiceRule executor = new ExecutorServiceRule(); + + private static JedisCluster jedis; + + @BeforeClass + public static void classSetup() { + MemberVM locator = clusterStartUp.startLocatorVM(0); + clusterStartUp.startRedisVM(1, locator.getPort()); + clusterStartUp.startRedisVM(2, locator.getPort()); + clusterStartUp.startRedisVM(3, locator.getPort()); + + int redisServerPort = clusterStartUp.getRedisPort(1); + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, redisServerPort), REDIS_CLIENT_TIMEOUT); + } + + @Before + public void testSetup() { + clusterStartUp.flushAll(); + } + + @AfterClass + public static void tearDown() { + jedis.close(); + } + + @Test + public void givenBucketsMoveDuringLpop_thenOperationsAreNotLost() throws Exception { + AtomicBoolean running = new AtomicBoolean(true); + + List<String> listHashtags = new ArrayList<>(); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 1)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 2)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 3)); + + lpushPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0)); + lpushPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1)); + lpushPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2)); + + Runnable task1 = + () -> lpopPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0), running); + Runnable task2 = + () -> lpopPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1), running); + Runnable task3 = + () -> lpopPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2), running); + + Future<Void> future1 = executor.runAsync(task1); + Future<Void> future2 = executor.runAsync(task2); + Future<Void> future3 = executor.runAsync(task3); + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + running.set(false); + + future1.get(); + future2.get(); + future3.get(); + } + + private void lpushPerformAndVerify(int index, int minimumIterations, String hashtag) { + String key = makeListKeyWithHashtag(index, hashtag); + int iterationCount = 0; + + while (iterationCount < minimumIterations) { + String elementString = makeElementString(key, iterationCount); + try { + jedis.lpush(key, elementString); + } catch (Exception ex) { + throw new RuntimeException("Exception performing LPUSH " + elementString, ex); + } + iterationCount += 1; + } + + Long listLength = jedis.llen(key); + assertThat(listLength).isEqualTo(minimumIterations).withFailMessage("Initial list '" Review comment: To use `withFailMessage()` correctly, it needs to be placed immediately after the `assertThat()` clause. However, since `withFailMessage()` overwrites the standard assertion error output entirely, it would be better to change this to `as()` with a description that only mentions the key that failed the assertion, since the lengths will be automatically reported by AssertJ. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPushDUnitTest.java ########## @@ -0,0 +1,135 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.redis.ConcurrentLoopingThreads; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; + +public class LPushDUnitTest { Review comment: This class hasn't been updated to have meaningful DUnit tests added. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopAndCrashesDUnitTest.java ########## @@ -0,0 +1,108 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopAndCrashesDUnitTest { + public static final int NUM_VMS = 4; + public static final int MINIMUM_ITERATIONS = 10000; + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(NUM_VMS); + + @Rule + public ExecutorServiceRule executor = new ExecutorServiceRule(); + + private static JedisCluster jedis; + + @BeforeClass + public static void classSetup() { + MemberVM locator = clusterStartUp.startLocatorVM(0); + clusterStartUp.startRedisVM(1, locator.getPort()); + clusterStartUp.startRedisVM(2, locator.getPort()); + clusterStartUp.startRedisVM(3, locator.getPort()); + + int redisServerPort = clusterStartUp.getRedisPort(1); + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, redisServerPort), REDIS_CLIENT_TIMEOUT); + } + + @Before + public void testSetup() { + clusterStartUp.flushAll(); + } + + @AfterClass + public static void tearDown() { + jedis.close(); + } + + + @Test + public void shouldDistributeDataAmongCluster_andRetainDataAfterServerCrash() { Review comment: This test is not really testing the distributed behaviour of LPOP, since we don't perform any LPOP commands until after we crash the server. A better test would be to pre-load server1 with a large list, pop all but the last element, then crash the server and assert that the data is consistent with what we expect. That way, if there is a problem with Delta propagation or some other distributed aspect of LPOP, we can see it. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,166 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopDUnitTest { + public static final int NUM_VMS = 4; + public static final int MINIMUM_ITERATIONS = 10000; + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(NUM_VMS); + + @Rule + public ExecutorServiceRule executor = new ExecutorServiceRule(); + + private static JedisCluster jedis; + + @BeforeClass + public static void classSetup() { + MemberVM locator = clusterStartUp.startLocatorVM(0); + clusterStartUp.startRedisVM(1, locator.getPort()); + clusterStartUp.startRedisVM(2, locator.getPort()); + clusterStartUp.startRedisVM(3, locator.getPort()); + + int redisServerPort = clusterStartUp.getRedisPort(1); + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, redisServerPort), REDIS_CLIENT_TIMEOUT); + } + + @Before + public void testSetup() { + clusterStartUp.flushAll(); + } + + @AfterClass + public static void tearDown() { + jedis.close(); + } + + @Test + public void givenBucketsMoveDuringLpop_thenOperationsAreNotLost() throws Exception { + AtomicBoolean running = new AtomicBoolean(true); + + List<String> listHashtags = new ArrayList<>(); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 1)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 2)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 3)); + + lpushPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0)); + lpushPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1)); + lpushPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2)); + + Runnable task1 = + () -> lpopPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0), running); + Runnable task2 = + () -> lpopPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1), running); + Runnable task3 = + () -> lpopPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2), running); + + Future<Void> future1 = executor.runAsync(task1); + Future<Void> future2 = executor.runAsync(task2); + Future<Void> future3 = executor.runAsync(task3); + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + running.set(false); + + future1.get(); + future2.get(); + future3.get(); + } + + private void lpushPerformAndVerify(int index, int minimumIterations, String hashtag) { + String key = makeListKeyWithHashtag(index, hashtag); + int iterationCount = 0; + + while (iterationCount < minimumIterations) { + String elementString = makeElementString(key, iterationCount); + try { + jedis.lpush(key, elementString); + } catch (Exception ex) { + throw new RuntimeException("Exception performing LPUSH " + elementString, ex); + } + iterationCount += 1; + } + + Long listLength = jedis.llen(key); + assertThat(listLength).isEqualTo(minimumIterations).withFailMessage("Initial list '" + + key + "' length " + listLength + " less than target " + minimumIterations); + } + + private void lpopPerformAndVerify(int index, int minimumIterations, String hashtag, + AtomicBoolean isRunning) { + String key = makeListKeyWithHashtag(index, hashtag); + int iterationCount = 0; + + List<String> elementList = new ArrayList<>(); + while (iterationCount < minimumIterations && isRunning.get()) { Review comment: Depending on timing, this loop could pop all the elements off the lists before we finish moving buckets around, in which case the test is just doing meaningless work. It might be better to change the way the test works so that, as long as we still have elements to pop, we keep moving buckets, but as soon as the list is empty, we stop. ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,166 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; + +import org.apache.geode.test.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; +import org.apache.geode.test.junit.rules.ExecutorServiceRule; + +public class LPopDUnitTest { + public static final int NUM_VMS = 4; + public static final int MINIMUM_ITERATIONS = 10000; + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(NUM_VMS); + + @Rule + public ExecutorServiceRule executor = new ExecutorServiceRule(); + + private static JedisCluster jedis; + + @BeforeClass + public static void classSetup() { + MemberVM locator = clusterStartUp.startLocatorVM(0); + clusterStartUp.startRedisVM(1, locator.getPort()); + clusterStartUp.startRedisVM(2, locator.getPort()); + clusterStartUp.startRedisVM(3, locator.getPort()); + + int redisServerPort = clusterStartUp.getRedisPort(1); + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, redisServerPort), REDIS_CLIENT_TIMEOUT); + } + + @Before + public void testSetup() { + clusterStartUp.flushAll(); + } + + @AfterClass + public static void tearDown() { + jedis.close(); + } + + @Test + public void givenBucketsMoveDuringLpop_thenOperationsAreNotLost() throws Exception { + AtomicBoolean running = new AtomicBoolean(true); + + List<String> listHashtags = new ArrayList<>(); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 1)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 2)); + listHashtags.add(clusterStartUp.getKeyOnServer("lpop", 3)); + + lpushPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0)); + lpushPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1)); + lpushPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2)); + + Runnable task1 = + () -> lpopPerformAndVerify(1, MINIMUM_ITERATIONS, listHashtags.get(0), running); + Runnable task2 = + () -> lpopPerformAndVerify(2, MINIMUM_ITERATIONS, listHashtags.get(1), running); + Runnable task3 = + () -> lpopPerformAndVerify(3, MINIMUM_ITERATIONS, listHashtags.get(2), running); + + Future<Void> future1 = executor.runAsync(task1); + Future<Void> future2 = executor.runAsync(task2); + Future<Void> future3 = executor.runAsync(task3); + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } + + for (int i = 0; i < 100 && running.get(); i++) { + clusterStartUp.moveBucketForKey(listHashtags.get(i % listHashtags.size())); + GeodeAwaitility.await().during(Duration.ofMillis(200)).until(() -> true); + } Review comment: This loop is duplicated, so we can remove one of the copies. ########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java ########## @@ -0,0 +1,118 @@ +/* + * 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.commands.executor.list; + +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertAtMostNArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_WRONG_TYPE; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.BIND_ADDRESS; +import static org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.concurrent.atomic.AtomicLong; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; +import redis.clients.jedis.Protocol; + +import org.apache.geode.redis.ConcurrentLoopingThreads; +import org.apache.geode.redis.RedisIntegrationTest; + +public abstract class AbstractLPopIntegrationTest implements RedisIntegrationTest { + public static final String KEY = "key"; + public static final String PREEXISTING_VALUE = "preexistingValue"; + // TODO: make private when we implement Redis 6.2+ behavior for LPOP + protected JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + // Overridden in LPopIntegrationTest until we implement Redis 6.2+ semantics + @Test + public void lpop_givenWrongNumOfArgs_returnsError() { + assertAtMostNArgs(jedis, Protocol.Command.LPOP, 2); + } + + @Test + public void lpop_withNonListKey_Fails() { + jedis.set("string", PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpop("string")).hasMessageContaining(ERROR_WRONG_TYPE); + } + + @Test + public void lpop_withNonExistentKey_returnsNull() { + assertThat(jedis.lpop("nonexistent")).isNull(); + } + + @Test + public void lpop_returnsLeftmostMember() { + jedis.lpush(KEY, "e1", "e2"); + String result = jedis.lpop(KEY); + assertThat(result).isEqualTo("e2"); + } + + @Test + public void lpop_removesKey_whenLastElementRemoved() { + final String keyWithTagForKeysCommand = "{tag}" + KEY; + + jedis.lpush(keyWithTagForKeysCommand, "e1"); + jedis.lpop(keyWithTagForKeysCommand); + assertThat(jedis.keys(keyWithTagForKeysCommand)).isEmpty(); + } + + @Test + public void lpop_removesKey_whenLastElementRemoved_multipleTimes() { + final String keyWithTagForKeysCommand = "{tag}" + KEY; + + jedis.lpush(keyWithTagForKeysCommand, "e1"); + assertThat(jedis.lpop(keyWithTagForKeysCommand)).isEqualTo("e1"); + assertThat(jedis.lpop(keyWithTagForKeysCommand)).isNull(); + assertThat(jedis.lpop(keyWithTagForKeysCommand)).isNull(); + assertThat(jedis.keys(keyWithTagForKeysCommand)).isEmpty(); + } + + @Test + public void lpop_withConcurrentLPush_returnsCorrectValue() { + String[] valuesInitial = new String[] {"one", "two", "three"}; + String[] valuesToAdd = new String[] {"pear", "apple", "plum", "orange", "peach"}; + jedis.lpush(KEY, valuesInitial); + + final AtomicLong lpopReference = new AtomicLong(); + new ConcurrentLoopingThreads(1000, + i -> jedis.lpush(KEY, valuesToAdd), + i -> lpopReference.set(jedis.llen(KEY))) Review comment: This test is testing LLEN, not LPOP. This should be changed to `jedis.lpop(KEY)` and the assertions changed to verify that we either get back the last element in the original values or the last element in the added values. The final looped LPOP calls will also need to be replaced with a DEL followed by a LPUSH of the initial values, as otherwise the test will progressively muck up the original list contents and fail. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
