This is an automated email from the ASF dual-hosted git repository. ringles pushed a commit to branch GEODE-9375-Implement-ZRANGE-Radish-command in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/GEODE-9375-Implement-ZRANGE-Radish-command by this push: new ad61dd7 Warning cleanup, remove unused constant/code ad61dd7 is described below commit ad61dd7542117d343b39bbbd7a0e1ec022ffbdf5 Author: Ray Ingles <ring...@vmware.com> AuthorDate: Wed Jun 30 17:54:46 2021 -0400 Warning cleanup, remove unused constant/code --- .../executor/sortedset/AbstractZRangeIntegrationTest.java | 4 ++-- .../java/org/apache/geode/redis/internal/data/RedisSortedSet.java | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java b/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java index 7f75d46..d808d16 100755 --- a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java +++ b/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java @@ -82,7 +82,7 @@ public abstract class AbstractZRangeIntegrationTest implements RedisIntegrationT } @Test - public void shouldReturnSyntaxError_givenWrongWithscoresFlag() { + public void shouldReturnSyntaxError_givenWrongWithScoresFlag() { jedis.zadd(SORTED_SET_KEY, 1.0, "member"); assertThatThrownBy( () -> jedis.sendCommand(SORTED_SET_KEY, Protocol.Command.ZRANGE, SORTED_SET_KEY, "1", "2", @@ -115,7 +115,7 @@ public abstract class AbstractZRangeIntegrationTest implements RedisIntegrationT @Test public void shouldAlsoReturnScores_whenWithScoresSpecified() { - Set<Tuple> expected = new LinkedHashSet<Tuple>(); + Set<Tuple> expected = new LinkedHashSet<>(); for (int i = 0; i < members.size(); i++) { expected.add(new Tuple(members.get(i), scores.get(i))); } diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java index 3ab0e10..4f236af 100644 --- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java +++ b/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java @@ -423,8 +423,6 @@ public class RedisSortedSet extends AbstractRedisData { } static class OrderedSetEntry implements Comparable<OrderedSetEntry> { - public static final byte[] MAX_BYTES = "RaAdIsH_SeCrEt_MaX_ByTeS_VaL".getBytes(); - private final byte[] member; private final byte[] scoreBytes; private final Double score; @@ -441,11 +439,7 @@ public class RedisSortedSet extends AbstractRedisData { public int compareTo(OrderedSetEntry o) { int comparison = score.compareTo(o.score); if (comparison == 0) { - // MAX_BYTES always bigger than actual entry - if (member.equals(MAX_BYTES)) { - return -1; - } - // Scores equal, not MAX, try lexical ordering + // Scores equal, try lexical ordering return javaImplementationOfAnsiCMemCmp(member, o.member); } return comparison;