ringles commented on a change in pull request #7261: URL: https://github.com/apache/geode/pull/7261#discussion_r788173018
########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractListsIntegrationTest.java ########## @@ -0,0 +1,143 @@ +/* + * 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.assertAtLeastNArgs; +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertExactNumberOfArgs; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +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 redis.clients.jedis.exceptions.JedisDataException; + +import org.apache.geode.redis.RedisIntegrationTest; +import org.apache.geode.test.awaitility.GeodeAwaitility; + +public abstract class AbstractListsIntegrationTest implements RedisIntegrationTest { + + public static final String KEY = "key"; + public static final String PREEXISTING_VALUE = "preexistingValue"; + private static final int REDIS_CLIENT_TIMEOUT = + Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort("localhost", getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + @Test + public void lpushErrors_givenTooFewArguments() { + assertAtLeastNArgs(jedis, Protocol.Command.LPUSH, 2); + } + + @Test + public void lpushErrors_withExistingKey_ofWrongType() { + String[] elementValue = new String[1]; + elementValue[0] = "list element value that should never get added"; + + jedis.set(KEY, PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpush(KEY, elementValue)) + .hasMessageContaining("Operation against a key holding the wrong kind of value"); + } + + @Test + public void lpush_withExistingKey_ofWrongType_shouldNotOverWriteExistingKey() { + String[] elementValue = new String[1]; + elementValue[0] = "set value that should never get added"; + + jedis.set(KEY, PREEXISTING_VALUE); + + assertThatThrownBy(() -> jedis.lpush(KEY, elementValue)).isInstanceOf(JedisDataException.class); + + String result = jedis.get(KEY); + + assertThat(result).isEqualTo(PREEXISTING_VALUE); + } + + @Test + public void lpush_canStoreBinaryData() { + byte[] blob = new byte[256]; + for (int i = 0; i < 256; i++) { + blob[i] = (byte) i; + } + + jedis.lpush(KEY.getBytes(), blob, blob); + + byte[] result = jedis.lpop(KEY.getBytes()); + assertThat(result).containsExactly(blob); + result = jedis.lpop(KEY.getBytes()); + assertThat(result).containsExactly(blob); + } + + // not checking LPOP argument count here, see AbstractLPopArgumentCountIntegrationTest + + @Test + public void lpop_withStringFails() { + jedis.set("string", PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpop("string")).hasMessageContaining("WRONGTYPE"); Review comment: Refactored ########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractListsIntegrationTest.java ########## @@ -0,0 +1,143 @@ +/* + * 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.assertAtLeastNArgs; +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertExactNumberOfArgs; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +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 redis.clients.jedis.exceptions.JedisDataException; + +import org.apache.geode.redis.RedisIntegrationTest; +import org.apache.geode.test.awaitility.GeodeAwaitility; + +public abstract class AbstractListsIntegrationTest implements RedisIntegrationTest { + + public static final String KEY = "key"; + public static final String PREEXISTING_VALUE = "preexistingValue"; + private static final int REDIS_CLIENT_TIMEOUT = + Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort("localhost", getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + @Test + public void lpushErrors_givenTooFewArguments() { + assertAtLeastNArgs(jedis, Protocol.Command.LPUSH, 2); + } + + @Test + public void lpushErrors_withExistingKey_ofWrongType() { + String[] elementValue = new String[1]; + elementValue[0] = "list element value that should never get added"; + + jedis.set(KEY, PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpush(KEY, elementValue)) + .hasMessageContaining("Operation against a key holding the wrong kind of value"); + } + + @Test + public void lpush_withExistingKey_ofWrongType_shouldNotOverWriteExistingKey() { + String[] elementValue = new String[1]; + elementValue[0] = "set value that should never get added"; + + jedis.set(KEY, PREEXISTING_VALUE); + + assertThatThrownBy(() -> jedis.lpush(KEY, elementValue)).isInstanceOf(JedisDataException.class); + + String result = jedis.get(KEY); + + assertThat(result).isEqualTo(PREEXISTING_VALUE); + } + + @Test + public void lpush_canStoreBinaryData() { + byte[] blob = new byte[256]; + for (int i = 0; i < 256; i++) { + blob[i] = (byte) i; + } + + jedis.lpush(KEY.getBytes(), blob, blob); + + byte[] result = jedis.lpop(KEY.getBytes()); + assertThat(result).containsExactly(blob); + result = jedis.lpop(KEY.getBytes()); + assertThat(result).containsExactly(blob); + } + + // not checking LPOP argument count here, see AbstractLPopArgumentCountIntegrationTest + + @Test + public void lpop_withStringFails() { + jedis.set("string", PREEXISTING_VALUE); + assertThatThrownBy(() -> jedis.lpop("string")).hasMessageContaining("WRONGTYPE"); + } + + @Test + public void lpop_withNonExistentKey_returnsNull() { + assertThat(jedis.lpop("nonexistent")).isNull(); + } + + @Test + public void lpop_returnsOneMember() { + jedis.lpush(KEY, "e1", "e2"); + String result = jedis.lpop(KEY); + assertThat(result).isIn("e1", "e2"); Review comment: Tweaked ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,155 @@ +/* + * 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.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.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; + +public class LPopDUnitTest { + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(4); + + private static final String LOCAL_HOST = "127.0.0.1"; + private static final int LIST_SIZE = 1000; + private static final int JEDIS_TIMEOUT = Review comment: Imported ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,155 @@ +/* + * 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.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.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; + +public class LPopDUnitTest { + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(4); + + private static final String LOCAL_HOST = "127.0.0.1"; + private static final int LIST_SIZE = 1000; + private static final int JEDIS_TIMEOUT = + Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static JedisCluster jedis; + + private static MemberVM locator; Review comment: Done ########## File path: geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java ########## @@ -0,0 +1,155 @@ +/* + * 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.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.awaitility.GeodeAwaitility; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.dunit.rules.RedisClusterStartupRule; + +public class LPopDUnitTest { + + @ClassRule + public static RedisClusterStartupRule clusterStartUp = new RedisClusterStartupRule(4); + + private static final String LOCAL_HOST = "127.0.0.1"; + private static final int LIST_SIZE = 1000; + private static final int JEDIS_TIMEOUT = + Math.toIntExact(GeodeAwaitility.getTimeout().toMillis()); + private static JedisCluster jedis; + + private static MemberVM locator; + private static MemberVM server1; + private static MemberVM server2; + private static MemberVM server3; + + @BeforeClass + public static void classSetup() { + locator = clusterStartUp.startLocatorVM(0); + server1 = clusterStartUp.startRedisVM(1, locator.getPort()); + server2 = clusterStartUp.startRedisVM(2, locator.getPort()); + server3 = clusterStartUp.startRedisVM(3, locator.getPort()); + + int redisServerPort = clusterStartUp.getRedisPort(1); + jedis = new JedisCluster(new HostAndPort(LOCAL_HOST, redisServerPort), JEDIS_TIMEOUT); + } + + @Before + public void testSetup() { + clusterStartUp.flushAll(); + } + + @AfterClass + public static void tearDown() { + jedis.close(); + + server1.stop(); + server2.stop(); + server3.stop(); Review comment: Removed ########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java ########## @@ -0,0 +1,223 @@ +/* + * 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.internal.JvmSizeUtils.memoryOverhead; +import static org.apache.geode.redis.internal.data.RedisDataType.REDIS_LIST; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +import org.apache.geode.DataSerializer; +import org.apache.geode.annotations.VisibleForTesting; +import org.apache.geode.cache.Region; +import org.apache.geode.internal.serialization.DeserializationContext; +import org.apache.geode.internal.serialization.KnownVersion; +import org.apache.geode.internal.serialization.SerializationContext; +import org.apache.geode.redis.internal.data.collections.SizeableList; +import org.apache.geode.redis.internal.data.delta.AddByteArrays; +import org.apache.geode.redis.internal.data.delta.RemoveByteArrays; + +public class RedisList extends AbstractRedisData { + protected static final int REDIS_LIST_OVERHEAD = memoryOverhead(RedisList.class); + private ElementList elements; + + public RedisList(Collection<byte[]> collection) { + this.elements = new ElementList(collection); + } + + /** + * For deserialization only. + */ + public RedisList() {} + + /** + * @param elementsToAdd members to add to this set; NOTE this list may by + * modified by this call + * @param region the region this instance is stored in + * @param key the name of the set to add to + * @return the number of members actually added + */ + public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData> region, RedisKey key) { + for (byte[] element : elementsToAdd) { + prependElement(element); + } + int elementsAdded = elementsToAdd.size(); + if (elementsAdded != 0) { + storeChanges(region, key, new AddByteArrays(elementsToAdd)); + } + return elementsAdded; + } + + /** + * @param region the region this instance is stored in + * @param key the name of the set to add to + * @return the element actually popped + */ + public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) { + int originalSize = elements.size(); + if (originalSize == 0) { + return null; + } + + byte[] popped = elements.remove(0); + if (popped != null) { + RemoveByteArrays removed = new RemoveByteArrays(); + removed.add(popped); + storeChanges(region, key, removed); + } + return popped; + } + + /** + * @return the number of elements in the list + */ + public int llen(Region<RedisKey, RedisData> region, RedisKey key) { Review comment: Stripped. ########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java ########## @@ -286,6 +289,12 @@ ZUNIONSTORE(new ZUnionStoreExecutor(), SUPPORTED, new Parameter().min(4).flags(WRITE, DENYOOM, MOVABLEKEYS)), + /************** Lists *****************/ + + LLEN(new LLenExecutor(), SUPPORTED, new Parameter().exact(2).flags(READONLY, FAST)), + LPOP(new LPopExecutor(), SUPPORTED, new Parameter().min(2).flags(WRITE, FAST)), Review comment: Currently, I have the LPOP executor check for more than two args and throw the appropriate error there. (Marked with a TODO comment, but it'll be found pretty fast as soon as we implement Redis 6.2+ semantics.) I think it better to keep the 'special case' logic where LPOP is implemented and tested. -- 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]
