jdeppe-pivotal commented on a change in pull request #7389: URL: https://github.com/apache/geode/pull/7389#discussion_r813329013
########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLRangeIntegrationTest.java ########## @@ -0,0 +1,272 @@ +/* + * 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.assertExactNumberOfArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_NOT_INTEGER; +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.Arrays; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +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 AbstractLRangeIntegrationTest implements RedisIntegrationTest { + private static final String NON_EXISTENT_LIST_KEY = "{tag1}nonExistentKey"; + private static final String LIST_KEY = "{tag1}listKey"; + private static final String[] LIST_ELEMENTS = + {"aardvark", "bats", "chameleon", "deer", "elephant", "flamingo", "goat"}; + private static final String[] LIST_ELEMENTS_REVERSE = + {"goat", "flamingo", "elephant", "deer", "chameleon", "bats", "aardvark"}; + private static final int LAST_INDEX = LIST_ELEMENTS.length; + + private JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + @Test + public void lrange_wrongNumberOfArgs_returnsError() { + assertExactNumberOfArgs(jedis, Protocol.Command.LRANGE, 3); + } + + @Test + public void lrange_withNonExistentSet_withStartIndexLessThanStopIndex_returnsEmptyList() { + assertThat(jedis.lrange(NON_EXISTENT_LIST_KEY, -10, 10)).isEmpty(); + } + + @Test + public void lrange_withNonExistentSet_withStartIndexGreaterThanStopIndex_returnsEmptyList() { Review comment: Did you mean to have `List` in the method name instead of `Set`? ########## File path: geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLRangeIntegrationTest.java ########## @@ -0,0 +1,272 @@ +/* + * 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.assertExactNumberOfArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_NOT_INTEGER; +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.Arrays; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +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 AbstractLRangeIntegrationTest implements RedisIntegrationTest { + private static final String NON_EXISTENT_LIST_KEY = "{tag1}nonExistentKey"; + private static final String LIST_KEY = "{tag1}listKey"; + private static final String[] LIST_ELEMENTS = + {"aardvark", "bats", "chameleon", "deer", "elephant", "flamingo", "goat"}; + private static final String[] LIST_ELEMENTS_REVERSE = + {"goat", "flamingo", "elephant", "deer", "chameleon", "bats", "aardvark"}; + private static final int LAST_INDEX = LIST_ELEMENTS.length; + + private JedisCluster jedis; + + @Before + public void setUp() { + jedis = new JedisCluster(new HostAndPort(BIND_ADDRESS, getPort()), REDIS_CLIENT_TIMEOUT); + } + + @After + public void tearDown() { + flushAll(); + jedis.close(); + } + + @Test + public void lrange_wrongNumberOfArgs_returnsError() { + assertExactNumberOfArgs(jedis, Protocol.Command.LRANGE, 3); + } + + @Test + public void lrange_withNonExistentSet_withStartIndexLessThanStopIndex_returnsEmptyList() { Review comment: Did you mean to have `List` in the method name instead of `Set`? ########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java ########## @@ -42,16 +46,65 @@ public RedisList() { this.elementList = new SizeableByteArrayList(); } + /** + * @param start start index of desired elments + * @param stop stop index of desired elments + * @return list of elements in the range (inclusive). + */ + public List<byte[]> lrange(int start, int stop) { + start = transformNegIndexToPosIndex(start); + stop = transformNegIndexToPosIndex(stop); + + // Out of range negative index changes to 0 + start = start < 0 ? 0 : start; Review comment: Intellij suggests converting to `Math.max(0, start)` ########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java ########## @@ -42,16 +46,65 @@ public RedisList() { this.elementList = new SizeableByteArrayList(); } + /** + * @param start start index of desired elments + * @param stop stop index of desired elments + * @return list of elements in the range (inclusive). + */ + public List<byte[]> lrange(int start, int stop) { + start = transformNegIndexToPosIndex(start); + stop = transformNegIndexToPosIndex(stop); + + // Out of range negative index changes to 0 + start = start < 0 ? 0 : start; + + int elementSize = elementList.size(); + if (start > stop || elementSize <= start) { + return Collections.emptyList(); + } + + // Out of range positive stop index changes to last index available + stop = elementSize <= stop ? elementSize - 1 : stop; + + List<byte[]> result = new LinkedList<>(); + int curIndex; + + // Finds the shortest distance to access nodes in range + if (start <= elementSize - stop - 1) { + // Starts at head to access nodes at start index then iterates forwards + ListIterator<byte[]> iterator = elementList.listIterator(); Review comment: You can call `listIterator` with a start index for a small optimization. -- 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]
