ringles commented on a change in pull request #6715: URL: https://github.com/apache/geode/pull/6715#discussion_r679186367
########## File path: geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByScoreIntegrationTest.java ########## @@ -0,0 +1,342 @@ +/* + * 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.executor.sortedset; + +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertAtLeastNArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_MIN_MAX_NOT_A_FLOAT; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_NOT_INTEGER; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_SYNTAX; +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.apache.geode.util.internal.UncheckedUtils.uncheckedCast; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import junitparams.JUnitParamsRunner; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; +import redis.clients.jedis.Protocol; +import redis.clients.jedis.Tuple; + +import org.apache.geode.redis.RedisIntegrationTest; + +@RunWith(JUnitParamsRunner.class) +public abstract class AbstractZRevRangeByScoreIntegrationTest implements RedisIntegrationTest { + private static final String MEMBER_BASE_NAME = "member"; + private static final String KEY = "key"; + private JedisCluster jedis; + private static final List<Double> scores = + Arrays.asList(Double.NEGATIVE_INFINITY, -10.5, 0.0, 10.5, Double.POSITIVE_INFINITY); + + @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 shouldError_givenWrongNumberOfArguments() { + assertAtLeastNArgs(jedis, Protocol.Command.ZREVRANGEBYSCORE, 3); + } + + @Test + public void shouldError_givenInvalidMinOrMax() { + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "notANumber", "1")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "notANumber")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "notANumber", "notANumber")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "((", "1")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "((")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "(a", "(b")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "str", "1")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "str")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "NaN")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + } + + @Test + public void shouldReturnSyntaxError_givenInvalidWithScoresFlag() { + jedis.zadd(KEY, 1.0, MEMBER_BASE_NAME); + assertThatThrownBy( + () -> jedis.sendCommand(KEY, Protocol.Command.ZREVRANGEBYSCORE, KEY, "1", "2", "WITSCOREZ")) + .hasMessageContaining(ERROR_SYNTAX); + } + + @Test + public void shouldReturnEmptyList_givenNonExistentKey() { + assertThat(jedis.zrevrangeByScore("fakeKey", "-inf", "inf")).isEmpty(); + } + + @Test + public void shouldReturnEmptyList_givenMaxLessThanMin() { + jedis.zadd(KEY, 1, "member"); + + // Range -inf >= score >= +inf + assertThat(jedis.zrevrangeByScore(KEY, "-inf", "+inf")).isEmpty(); + } + + @Test + public void shouldReturnElement_givenRangeIncludingScore() { + jedis.zadd(KEY, 1, "member"); + + // Range inf >= score >= -inf + assertThat(jedis.zrevrangeByScore(KEY, "inf", "-inf")) + .containsExactly("member"); + } + + @Test + public void shouldReturnEmptyArray_givenRangeExcludingScore() { + int score = 1; + jedis.zadd(KEY, score, "member"); + + // Range 2 <= score <= 3 + assertThat(jedis.zrevrangeByScore(KEY, score + 2, score + 1)).isEmpty(); + } + + @Test + public void shouldReturnRange_givenMinAndMaxEqualToScore() { + int score = 1; + jedis.zadd(KEY, score, "member"); + + // Range 1 <= score <= 1 + assertThat(jedis.zrevrangeByScore(KEY, score, score)) + .containsExactly("member"); + } + + @Test + public void shouldReturnRange_givenMultipleMembersWithDifferentScores() { + Map<String, Double> map = new HashMap<>(); + + map.put("member1", -10.0); + map.put("member2", 1.0); + map.put("member3", 10.0); + + jedis.zadd(KEY, map); + + // Range -5 <= score <= 15 + assertThat(jedis.zrevrangeByScore(KEY, "15", "-5")) + .containsExactly("member3", "member2"); + } + + @Test + public void shouldReturnRange_givenMultipleMembersWithTheSameScoreAndMinAndMaxEqualToScore() { + Map<String, Double> map = new HashMap<>(); + double score = 1; + map.put("member1", score); + map.put("member2", score); + map.put("member3", score); + + jedis.zadd(KEY, map); + + // Range 1 <= score <= 1 + assertThat(jedis.zrevrangeByScore(KEY, score, score)) + .containsExactly("member3", "member2", "member1"); + } + + @Test + public void shouldReturnRange_basicExclusivity() { + Map<String, Double> map = new HashMap<>(); + + map.put("member0", 0.0); + map.put("member1", 1.0); + map.put("member2", 2.0); + map.put("member3", 3.0); + map.put("member4", 4.0); + + jedis.zadd(KEY, map); + + assertThat(jedis.zrevrangeByScore(KEY, "(3.0", "(1.0")) + .containsExactly("member2"); + assertThat(jedis.zrevrangeByScore(KEY, "(3.0", "1.0")) + .containsExactly("member2", "member1"); + assertThat(jedis.zrevrangeByScore(KEY, "3.0", "(1.0")) + .containsExactly("member3", "member2"); + } + + private Map<String, Double> getExclusiveTestMap() { Review comment: Done ########## File path: geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByScoreIntegrationTest.java ########## @@ -0,0 +1,342 @@ +/* + * 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.executor.sortedset; + +import static org.apache.geode.redis.RedisCommandArgumentsTestHelper.assertAtLeastNArgs; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_MIN_MAX_NOT_A_FLOAT; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_NOT_INTEGER; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_SYNTAX; +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.apache.geode.util.internal.UncheckedUtils.uncheckedCast; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import junitparams.JUnitParamsRunner; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.JedisCluster; +import redis.clients.jedis.Protocol; +import redis.clients.jedis.Tuple; + +import org.apache.geode.redis.RedisIntegrationTest; + +@RunWith(JUnitParamsRunner.class) +public abstract class AbstractZRevRangeByScoreIntegrationTest implements RedisIntegrationTest { + private static final String MEMBER_BASE_NAME = "member"; + private static final String KEY = "key"; + private JedisCluster jedis; + private static final List<Double> scores = + Arrays.asList(Double.NEGATIVE_INFINITY, -10.5, 0.0, 10.5, Double.POSITIVE_INFINITY); + + @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 shouldError_givenWrongNumberOfArguments() { + assertAtLeastNArgs(jedis, Protocol.Command.ZREVRANGEBYSCORE, 3); + } + + @Test + public void shouldError_givenInvalidMinOrMax() { + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "notANumber", "1")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "notANumber")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "notANumber", "notANumber")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "((", "1")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "((")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "(a", "(b")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "str", "1")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "str")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + assertThatThrownBy(() -> jedis.zrevrangeByScore("fakeKey", "1", "NaN")) + .hasMessageContaining(ERROR_MIN_MAX_NOT_A_FLOAT); + } + + @Test + public void shouldReturnSyntaxError_givenInvalidWithScoresFlag() { + jedis.zadd(KEY, 1.0, MEMBER_BASE_NAME); + assertThatThrownBy( + () -> jedis.sendCommand(KEY, Protocol.Command.ZREVRANGEBYSCORE, KEY, "1", "2", "WITSCOREZ")) + .hasMessageContaining(ERROR_SYNTAX); + } + + @Test + public void shouldReturnEmptyList_givenNonExistentKey() { + assertThat(jedis.zrevrangeByScore("fakeKey", "-inf", "inf")).isEmpty(); + } + + @Test + public void shouldReturnEmptyList_givenMaxLessThanMin() { + jedis.zadd(KEY, 1, "member"); + + // Range -inf >= score >= +inf + assertThat(jedis.zrevrangeByScore(KEY, "-inf", "+inf")).isEmpty(); + } + + @Test + public void shouldReturnElement_givenRangeIncludingScore() { + jedis.zadd(KEY, 1, "member"); + + // Range inf >= score >= -inf + assertThat(jedis.zrevrangeByScore(KEY, "inf", "-inf")) + .containsExactly("member"); + } + + @Test + public void shouldReturnEmptyArray_givenRangeExcludingScore() { + int score = 1; + jedis.zadd(KEY, score, "member"); + + // Range 2 <= score <= 3 + assertThat(jedis.zrevrangeByScore(KEY, score + 2, score + 1)).isEmpty(); + } + + @Test + public void shouldReturnRange_givenMinAndMaxEqualToScore() { + int score = 1; + jedis.zadd(KEY, score, "member"); + + // Range 1 <= score <= 1 + assertThat(jedis.zrevrangeByScore(KEY, score, score)) + .containsExactly("member"); + } + + @Test + public void shouldReturnRange_givenMultipleMembersWithDifferentScores() { + Map<String, Double> map = new HashMap<>(); + + map.put("member1", -10.0); + map.put("member2", 1.0); + map.put("member3", 10.0); + + jedis.zadd(KEY, map); + + // Range -5 <= score <= 15 + assertThat(jedis.zrevrangeByScore(KEY, "15", "-5")) + .containsExactly("member3", "member2"); + } + + @Test + public void shouldReturnRange_givenMultipleMembersWithTheSameScoreAndMinAndMaxEqualToScore() { + Map<String, Double> map = new HashMap<>(); + double score = 1; + map.put("member1", score); + map.put("member2", score); + map.put("member3", score); + + jedis.zadd(KEY, map); + + // Range 1 <= score <= 1 + assertThat(jedis.zrevrangeByScore(KEY, score, score)) + .containsExactly("member3", "member2", "member1"); + } + + @Test + public void shouldReturnRange_basicExclusivity() { + Map<String, Double> map = new HashMap<>(); + + map.put("member0", 0.0); + map.put("member1", 1.0); + map.put("member2", 2.0); + map.put("member3", 3.0); + map.put("member4", 4.0); + + jedis.zadd(KEY, map); + + assertThat(jedis.zrevrangeByScore(KEY, "(3.0", "(1.0")) + .containsExactly("member2"); + assertThat(jedis.zrevrangeByScore(KEY, "(3.0", "1.0")) + .containsExactly("member2", "member1"); + assertThat(jedis.zrevrangeByScore(KEY, "3.0", "(1.0")) + .containsExactly("member3", "member2"); + } + + private Map<String, Double> getExclusiveTestMap() { + Map<String, Double> map = new HashMap<>(); + + map.put("member1", Double.NEGATIVE_INFINITY); + map.put("member2", 1.0); + map.put("member3", Double.POSITIVE_INFINITY); + return map; + } + + @Test + public void shouldReturnRange_givenExclusiveMin() { + Map<String, Double> map = getExclusiveTestMap(); + + jedis.zadd(KEY, map); + + // Range +inf >= score > -inf + assertThat(jedis.zrevrangeByScore(KEY, "+inf", "(-inf")) + .containsExactly("member3", "member2"); + } + + @Test + public void shouldReturnEmptyList_givenExclusiveMinAndMaxEqualToScore() { + double score = 1; + jedis.zadd(KEY, score, "member"); + + String scoreExclusive = "(" + score; + assertThat(jedis.zrevrangeByScore(KEY, scoreExclusive, scoreExclusive)).isEmpty(); + } + + @Test + // Using only "(" as either the min or the max is equivalent to "(0" + public void shouldReturnRange_givenLeftParenOnlyForMinOrMax() { + Map<String, Double> map = new HashMap<>(); + + map.put("slightlyLessThanZero", -0.01); + map.put("zero", 0.0); + map.put("slightlyMoreThanZero", 0.01); + + jedis.zadd(KEY, map); + + // Range inf >= score > 0 + assertThat(jedis.zrevrangeByScore(KEY, "inf", "(")).containsExactly("slightlyMoreThanZero"); + + // Range 0 >= score > -inf + assertThat(jedis.zrevrangeByScore(KEY, "(", "-inf")).containsExactly("slightlyLessThanZero"); + } + + private void createZSetRangeTestMap() { Review comment: Done -- 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]
