From c05948bd877dfcd0447577977d9ebe6bfbc034ec Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Wed, 29 May 2019 00:43:44 +0300 Subject: [PATCH 01/11] implemented ZPOPMIN . no test method yet --- .../java/redis/clients/jedis/BinaryClient.java | 8 ++++++++ .../java/redis/clients/jedis/BinaryJedis.java | 16 ++++++++++++++++ .../redis/clients/jedis/BinaryShardedJedis.java | 12 ++++++++++++ src/main/java/redis/clients/jedis/Client.java | 10 ++++++++++ src/main/java/redis/clients/jedis/Jedis.java | 16 ++++++++++++++++ src/main/java/redis/clients/jedis/Protocol.java | 2 +- .../java/redis/clients/jedis/ShardedJedis.java | 12 ++++++++++++ .../jedis/commands/BinaryJedisCommands.java | 4 ++++ .../redis/clients/jedis/commands/Commands.java | 4 ++++ .../clients/jedis/commands/JedisCommands.java | 4 ++++ 10 files changed, 87 insertions(+), 1 deletion(-) diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 39be157f08..84abee8e1e 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -503,6 +503,14 @@ public void zscore(final byte[] key, final byte[] member) { sendCommand(ZSCORE, key, member); } + public void zpopmin(final byte[] key) { + sendCommand(ZPOPMIN, key); + } + + public void zpopmin(final byte[] key, final long count) { + sendCommand(ZPOPMIN, key, toByteArray(count)); + } + public void multi() { sendCommand(MULTI); isInMulti = true; diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 40bb8c2c45..034788dc08 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1841,6 +1841,22 @@ public Double zscore(final byte[] key, final byte[] member) { return (score != null ? new Double(score) : null); } + + + @Override + public byte[] zpopmin(final byte[] key) { + checkIsInMultiOrPipeline(); + client.zpopmin(key); + return client.getBinaryBulkReply(); + } + + @Override + public Set zpopmin(final byte[] key, final long count) { + checkIsInMultiOrPipeline(); + client.zpopmin(key, count); + return SetFromList.of(client.getBinaryMultiBulkReply()); + } + public Transaction multi() { client.multi(); client.getOne(); // expected OK diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java index 7d096c9b80..327efcfd6b 100644 --- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java @@ -534,6 +534,18 @@ public Double zscore(final byte[] key, final byte[] member) { return j.zscore(key, member); } + @Override + public byte[] zpopmin(final byte[] key) { + Jedis j = getShard(key); + return j.zpopmin(key); + } + + @Override + public Set zpopmin(final byte[] key, final long count) { + Jedis j = getShard(key); + return j.zpopmin(key, count); + } + @Override public List sort(final byte[] key) { Jedis j = getShard(key); diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index 20193fb911..f1b97b686e 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -465,6 +465,16 @@ public void zscore(final String key, final String member) { zscore(SafeEncoder.encode(key), SafeEncoder.encode(member)); } + @Override + public void zpopmin(final String key) { + spop(SafeEncoder.encode(key)); + } + + @Override + public void zpopmin(final String key, final long count) { + spop(SafeEncoder.encode(key), count); + } + @Override public void watch(final String... keys) { watch(SafeEncoder.encodeMany(keys)); diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index f32a4aab1e..0c5747a3b8 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1673,6 +1673,22 @@ public Double zscore(final String key, final String member) { return BuilderFactory.DOUBLE.build(client.getOne()); } + + @Override + public String zpopmin(final String key) { + checkIsInMultiOrPipeline(); + client.zpopmin(key); + return client.getBulkReply(); + } + + @Override + public Set zpopmin(final String key, final long count) { + checkIsInMultiOrPipeline(); + client.zpopmin(key, count); + final List members = client.getMultiBulkReply(); + return SetFromList.of(members); + } + @Override public String watch(final String... keys) { client.watch(keys); diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java index 130eb3f5c3..e7e4217f6d 100644 --- a/src/main/java/redis/clients/jedis/Protocol.java +++ b/src/main/java/redis/clients/jedis/Protocol.java @@ -249,7 +249,7 @@ public static enum Command implements ProtocolCommand { HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, - ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, + ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN,MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBSUB, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, ZLEXCOUNT, ZRANGEBYLEX, ZREVRANGEBYLEX, ZREMRANGEBYLEX, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index 7552563f8e..68edb94caf 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -572,6 +572,18 @@ public Double zscore(final String key, final String member) { return j.zscore(key, member); } + @Override + public String zpopmin(final String key) { + Jedis j = getShard(key); + return j.zpopmin(key); + } + + @Override + public Set zpopmin(final String key, final long count) { + Jedis j = getShard(key); + return j.zpopmin(key, count); + } + @Override public List sort(final String key) { Jedis j = getShard(key); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java index cff42790c4..0d3f9e68da 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java @@ -184,6 +184,10 @@ public interface BinaryJedisCommands { Double zscore(byte[] key, byte[] member); + byte[] zpopmin(byte[] key); + + Set zpopmin(byte[] key, long count); + List sort(byte[] key); List sort(byte[] key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/commands/Commands.java b/src/main/java/redis/clients/jedis/commands/Commands.java index 1ca788908a..36af87239c 100644 --- a/src/main/java/redis/clients/jedis/commands/Commands.java +++ b/src/main/java/redis/clients/jedis/commands/Commands.java @@ -197,6 +197,10 @@ public interface Commands { void zscore(String key, String member); + void zpopmin(String key); + + void zpopmin(String key, long count); + void watch(String... keys); void sort(String key); diff --git a/src/main/java/redis/clients/jedis/commands/JedisCommands.java b/src/main/java/redis/clients/jedis/commands/JedisCommands.java index 9866cfce0f..ad0d53ee01 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisCommands.java @@ -187,6 +187,10 @@ public interface JedisCommands { Double zscore(String key, String member); + String zpopmin(String key); + + Set zpopmin(String key, long count); + List sort(String key); List sort(String key, SortingParams sortingParameters); From 1e5553aeb12b6c8f242b855843b376d06014c767 Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Fri, 31 May 2019 01:08:39 +0300 Subject: [PATCH 02/11] ZPOPMIN test added. ZPOPMIN fixed after testing --- .../java/redis/clients/jedis/BinaryJedis.java | 8 +-- .../clients/jedis/BinaryShardedJedis.java | 4 +- src/main/java/redis/clients/jedis/Client.java | 4 +- src/main/java/redis/clients/jedis/Jedis.java | 9 ++-- .../redis/clients/jedis/ShardedJedis.java | 4 +- .../jedis/commands/BinaryJedisCommands.java | 4 +- .../clients/jedis/commands/JedisCommands.java | 4 +- .../tests/commands/SortedSetCommandsTest.java | 49 +++++++++++++++++++ 8 files changed, 67 insertions(+), 19 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 034788dc08..7448deadd9 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1844,17 +1844,17 @@ public Double zscore(final byte[] key, final byte[] member) { @Override - public byte[] zpopmin(final byte[] key) { + public Set zpopmin(final byte[] key) { checkIsInMultiOrPipeline(); client.zpopmin(key); - return client.getBinaryBulkReply(); + return getTupledSet(); } @Override - public Set zpopmin(final byte[] key, final long count) { + public Set zpopmin(final byte[] key, final long count) { checkIsInMultiOrPipeline(); client.zpopmin(key, count); - return SetFromList.of(client.getBinaryMultiBulkReply()); + return getTupledSet(); } public Transaction multi() { diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java index 327efcfd6b..a805483183 100644 --- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java @@ -535,13 +535,13 @@ public Double zscore(final byte[] key, final byte[] member) { } @Override - public byte[] zpopmin(final byte[] key) { + public Set zpopmin(final byte[] key) { Jedis j = getShard(key); return j.zpopmin(key); } @Override - public Set zpopmin(final byte[] key, final long count) { + public Set zpopmin(final byte[] key, final long count) { Jedis j = getShard(key); return j.zpopmin(key, count); } diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index f1b97b686e..6928d00ef2 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -467,12 +467,12 @@ public void zscore(final String key, final String member) { @Override public void zpopmin(final String key) { - spop(SafeEncoder.encode(key)); + zpopmin(SafeEncoder.encode(key)); } @Override public void zpopmin(final String key, final long count) { - spop(SafeEncoder.encode(key), count); + zpopmin(SafeEncoder.encode(key), count); } @Override diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index 0c5747a3b8..443e4fd962 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1675,18 +1675,17 @@ public Double zscore(final String key, final String member) { @Override - public String zpopmin(final String key) { + public Set zpopmin(final String key) { checkIsInMultiOrPipeline(); client.zpopmin(key); - return client.getBulkReply(); + return getTupledSet(); } @Override - public Set zpopmin(final String key, final long count) { + public Set zpopmin(final String key, final long count) { checkIsInMultiOrPipeline(); client.zpopmin(key, count); - final List members = client.getMultiBulkReply(); - return SetFromList.of(members); + return getTupledSet(); } @Override diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index 68edb94caf..8f1319a9fc 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -573,13 +573,13 @@ public Double zscore(final String key, final String member) { } @Override - public String zpopmin(final String key) { + public Set zpopmin(final String key) { Jedis j = getShard(key); return j.zpopmin(key); } @Override - public Set zpopmin(final String key, final long count) { + public Set zpopmin(final String key, final long count) { Jedis j = getShard(key); return j.zpopmin(key, count); } diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java index 0d3f9e68da..a71f164819 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java @@ -184,9 +184,9 @@ public interface BinaryJedisCommands { Double zscore(byte[] key, byte[] member); - byte[] zpopmin(byte[] key); + Set zpopmin(byte[] key); - Set zpopmin(byte[] key, long count); + Set zpopmin(byte[] key, long count); List sort(byte[] key); diff --git a/src/main/java/redis/clients/jedis/commands/JedisCommands.java b/src/main/java/redis/clients/jedis/commands/JedisCommands.java index ad0d53ee01..c181049bda 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisCommands.java @@ -187,9 +187,9 @@ public interface JedisCommands { Double zscore(String key, String member); - String zpopmin(String key); + Set zpopmin(String key); - Set zpopmin(String key, long count); + Set zpopmin(String key, long count); List sort(String key); diff --git a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java index 98bb4221f1..0414dcc5eb 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java @@ -544,6 +544,55 @@ public void zscore() { } @Test + public void zpopmin() { + + jedis.zadd("foo", 1d, "a",ZAddParams.zAddParams().nx()); + jedis.zadd("foo", 10d, "b",ZAddParams.zAddParams().nx()); + jedis.zadd("foo", 0.1d, "c",ZAddParams.zAddParams().nx()); + jedis.zadd("foo", 2d, "a",ZAddParams.zAddParams().nx()); + + Set range = jedis.zpopmin("foo", 2); + + Set expected = new LinkedHashSet(); + expected.add(new Tuple("c", 0.1d)); + expected.add(new Tuple("a", 1d)); + + assertEquals(expected, range); + + + range = jedis.zpopmin("foo"); + + expected = new LinkedHashSet(); + expected.add(new Tuple("b", 10d)); + + assertEquals(expected, range); + + + + // Binary + + jedis.zadd(bfoo, 1d, ba); + jedis.zadd(bfoo, 10d, bb); + jedis.zadd(bfoo, 0.1d, bc); + jedis.zadd(bfoo, 2d, ba); + + Set brange = jedis.zpopmin(bfoo, 2); + + Set bexpected = new LinkedHashSet(); + bexpected.add(new Tuple(bc, 0.1d)); + bexpected.add(new Tuple(ba, 2d)); + + assertEquals(bexpected, brange); + + brange = jedis.zpopmin(bfoo); + + bexpected = new LinkedHashSet(); + bexpected.add(new Tuple(bb, 10d)); + + assertEquals(bexpected, brange); + } + + @Test public void zcount() { jedis.zadd("foo", 1d, "a"); jedis.zadd("foo", 10d, "b"); From cf518b6b26cdfe148df91957433ab23b6e61c670 Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Sat, 1 Jun 2019 02:36:14 +0300 Subject: [PATCH 03/11] created test for ZPOPMIN implemented ZPOPMAX . created test for ZPOPMAX --- .../redis/clients/jedis/BinaryClient.java | 8 +++ .../java/redis/clients/jedis/BinaryJedis.java | 14 ++++++ .../clients/jedis/BinaryShardedJedis.java | 12 +++++ src/main/java/redis/clients/jedis/Client.java | 10 ++++ src/main/java/redis/clients/jedis/Jedis.java | 14 ++++++ .../java/redis/clients/jedis/Protocol.java | 2 +- .../redis/clients/jedis/ShardedJedis.java | 12 +++++ .../jedis/commands/BinaryJedisCommands.java | 4 ++ .../clients/jedis/commands/Commands.java | 4 ++ .../clients/jedis/commands/JedisCommands.java | 4 ++ .../tests/commands/SortedSetCommandsTest.java | 49 +++++++++++++++++++ 11 files changed, 132 insertions(+), 1 deletion(-) diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 84abee8e1e..437ab8d859 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -511,6 +511,14 @@ public void zpopmin(final byte[] key, final long count) { sendCommand(ZPOPMIN, key, toByteArray(count)); } + public void zpopmax(final byte[] key) { + sendCommand(ZPOPMAX, key); + } + + public void zpopmax(final byte[] key, final long count) { + sendCommand(ZPOPMAX, key, toByteArray(count)); + } + public void multi() { sendCommand(MULTI); isInMulti = true; diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 7448deadd9..ec4bb9d9ff 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1857,6 +1857,20 @@ public Set zpopmin(final byte[] key, final long count) { return getTupledSet(); } + @Override + public Set zpopmax(final byte[] key) { + checkIsInMultiOrPipeline(); + client.zpopmax(key); + return getTupledSet(); + } + + @Override + public Set zpopmax(final byte[] key, final long count) { + checkIsInMultiOrPipeline(); + client.zpopmax(key, count); + return getTupledSet(); + } + public Transaction multi() { client.multi(); client.getOne(); // expected OK diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java index a805483183..bc9067ec7d 100644 --- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java @@ -546,6 +546,18 @@ public Set zpopmin(final byte[] key, final long count) { return j.zpopmin(key, count); } + @Override + public Set zpopmax(final byte[] key) { + Jedis j = getShard(key); + return j.zpopmax(key); + } + + @Override + public Set zpopmax(final byte[] key, final long count) { + Jedis j = getShard(key); + return j.zpopmax(key, count); + } + @Override public List sort(final byte[] key) { Jedis j = getShard(key); diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index 6928d00ef2..0de15ba6e9 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -475,6 +475,16 @@ public void zpopmin(final String key, final long count) { zpopmin(SafeEncoder.encode(key), count); } + @Override + public void zpopmax(final String key) { + zpopmax(SafeEncoder.encode(key)); + } + + @Override + public void zpopmax(final String key, final long count) { + zpopmax(SafeEncoder.encode(key), count); + } + @Override public void watch(final String... keys) { watch(SafeEncoder.encodeMany(keys)); diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index 443e4fd962..bd1d217766 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1688,6 +1688,20 @@ public Set zpopmin(final String key, final long count) { return getTupledSet(); } + @Override + public Set zpopmax(final String key) { + checkIsInMultiOrPipeline(); + client.zpopmax(key); + return getTupledSet(); + } + + @Override + public Set zpopmax(final String key, final long count) { + checkIsInMultiOrPipeline(); + client.zpopmax(key, count); + return getTupledSet(); + } + @Override public String watch(final String... keys) { client.watch(keys); diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java index e7e4217f6d..bfa9148e34 100644 --- a/src/main/java/redis/clients/jedis/Protocol.java +++ b/src/main/java/redis/clients/jedis/Protocol.java @@ -249,7 +249,7 @@ public static enum Command implements ProtocolCommand { HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, - ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN,MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, + ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN, ZPOPMAX, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBSUB, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, ZLEXCOUNT, ZRANGEBYLEX, ZREVRANGEBYLEX, ZREMRANGEBYLEX, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index 8f1319a9fc..01380ecc8c 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -584,6 +584,18 @@ public Set zpopmin(final String key, final long count) { return j.zpopmin(key, count); } + @Override + public Set zpopmax(final String key) { + Jedis j = getShard(key); + return j.zpopmax(key); + } + + @Override + public Set zpopmax(final String key, final long count) { + Jedis j = getShard(key); + return j.zpopmax(key, count); + } + @Override public List sort(final String key) { Jedis j = getShard(key); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java index a71f164819..7d7a6bd2b0 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java @@ -188,6 +188,10 @@ public interface BinaryJedisCommands { Set zpopmin(byte[] key, long count); + Set zpopmax(byte[] key); + + Set zpopmax(byte[] key, long count); + List sort(byte[] key); List sort(byte[] key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/commands/Commands.java b/src/main/java/redis/clients/jedis/commands/Commands.java index 36af87239c..e7a16a8dce 100644 --- a/src/main/java/redis/clients/jedis/commands/Commands.java +++ b/src/main/java/redis/clients/jedis/commands/Commands.java @@ -201,6 +201,10 @@ public interface Commands { void zpopmin(String key, long count); + void zpopmax(String key); + + void zpopmax(String key, long count); + void watch(String... keys); void sort(String key); diff --git a/src/main/java/redis/clients/jedis/commands/JedisCommands.java b/src/main/java/redis/clients/jedis/commands/JedisCommands.java index c181049bda..226bd06614 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisCommands.java @@ -191,6 +191,10 @@ public interface JedisCommands { Set zpopmin(String key, long count); + Set zpopmax(String key); + + Set zpopmax(String key, long count); + List sort(String key); List sort(String key, SortingParams sortingParameters); diff --git a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java index 0414dcc5eb..b2be1dcd08 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java @@ -592,6 +592,55 @@ public void zpopmin() { assertEquals(bexpected, brange); } + @Test + public void zpopmax() { + + jedis.zadd("foo", 1d, "a",ZAddParams.zAddParams().nx()); + jedis.zadd("foo", 10d, "b",ZAddParams.zAddParams().nx()); + jedis.zadd("foo", 0.1d, "c",ZAddParams.zAddParams().nx()); + jedis.zadd("foo", 2d, "a",ZAddParams.zAddParams().nx()); + + Set range = jedis.zpopmax("foo", 2); + + Set expected = new LinkedHashSet(); + expected.add(new Tuple("b", 10d)); + expected.add(new Tuple("a", 1d)); + + assertEquals(expected, range); + + + range = jedis.zpopmax("foo"); + + expected = new LinkedHashSet(); + expected.add(new Tuple("c", 0.1d)); + + assertEquals(expected, range); + + + + // Binary + + jedis.zadd(bfoo, 1d, ba); + jedis.zadd(bfoo, 10d, bb); + jedis.zadd(bfoo, 0.1d, bc); + jedis.zadd(bfoo, 2d, ba); + + Set brange = jedis.zpopmax(bfoo, 2); + + Set bexpected = new LinkedHashSet(); + bexpected.add(new Tuple(bb, 10d)); + bexpected.add(new Tuple(ba, 2d)); + + assertEquals(bexpected, brange); + + brange = jedis.zpopmax(bfoo); + + bexpected = new LinkedHashSet(); + bexpected.add(new Tuple(bc, 0.1d)); + + assertEquals(bexpected, brange); + } + @Test public void zcount() { jedis.zadd("foo", 1d, "a"); From c4c836b6017c66e5ae85b94f32b97fa0f7cbe30c Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Sun, 2 Jun 2019 19:47:34 +0300 Subject: [PATCH 04/11] added ZPOPMIN and ZPOPMAX on BinaryJedisClusterCommands and PipelineBase --- .../clients/jedis/BinaryJedisCluster.java | 40 +++++++++++++++++++ .../redis/clients/jedis/PipelineBase.java | 24 +++++++++++ .../commands/BinaryJedisClusterCommands.java | 8 ++++ .../clients/jedis/commands/RedisPipeline.java | 8 ++++ 4 files changed, 80 insertions(+) diff --git a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java index 960499e14a..435bcc11be 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java +++ b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java @@ -906,6 +906,46 @@ public Double execute(Jedis connection) { }.runBinary(key); } + @Override + public Set zpopmin(final byte[] key, final long count) { + return new JedisClusterCommand>(connectionHandler, maxAttempts) { + @Override + public Set execute(Jedis connection) { + return connection.zpopmin(key, count); + } + }.runBinary(key); + } + + @Override + public Set zpopmin(final byte[] key) { + return new JedisClusterCommand>(connectionHandler, maxAttempts) { + @Override + public Set execute(Jedis connection) { + return connection.zpopmin(key); + } + }.runBinary(key); + } + + @Override + public Set zpopmax(final byte[] key, final long count) { + return new JedisClusterCommand>(connectionHandler, maxAttempts) { + @Override + public Set execute(Jedis connection) { + return connection.zpopmax(key, count); + } + }.runBinary(key); + } + + @Override + public Set zpopmax(final byte[] key) { + return new JedisClusterCommand>(connectionHandler, maxAttempts) { + @Override + public Set execute(Jedis connection) { + return connection.zpopmax(key); + } + }.runBinary(key); + } + @Override public List sort(final byte[] key) { return new JedisClusterCommand>(connectionHandler, maxAttempts) { diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java index 8128346b54..5769812eb9 100644 --- a/src/main/java/redis/clients/jedis/PipelineBase.java +++ b/src/main/java/redis/clients/jedis/PipelineBase.java @@ -1299,6 +1299,30 @@ public Response zscore(final byte[] key, final byte[] member) { return getResponse(BuilderFactory.DOUBLE); } + @Override + public Response> zpopmin(final String key) { + getClient(key).zpopmin(key); + return getResponse(BuilderFactory.TUPLE_ZSET); + } + + @Override + public Response> zpopmin(final String key, final long count) { + getClient(key).zpopmin(key, count); + return getResponse(BuilderFactory.TUPLE_ZSET); + } + + @Override + public Response> zpopmax(final String key) { + getClient(key).zpopmin(key); + return getResponse(BuilderFactory.TUPLE_ZSET); + } + + @Override + public Response> zpopmax(final String key, final long count) { + getClient(key).zpopmin(key, count); + return getResponse(BuilderFactory.TUPLE_ZSET); + } + @Override public Response zlexcount(final byte[] key, final byte[] min, final byte[] max) { getClient(key).zlexcount(key, min, max); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java index bdf086b2ff..8c37dc9144 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java @@ -179,6 +179,14 @@ public interface BinaryJedisClusterCommands { Double zscore(byte[] key, byte[] member); + Set zpopmin(byte[] key); + + Set zpopmin(byte[] key, long count); + + Set zpopmax(byte[] key); + + Set zpopmax(byte[] key, long count); + List sort(byte[] key); List sort(byte[] key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java index 2155f4db09..b3ef754ae3 100644 --- a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java @@ -228,6 +228,14 @@ Response> zrevrangeByScoreWithScores(String key, String max, String m Response zscore(String key, String member); + Response> zpopmin(String key); + + Response> zpopmin(String key, long count); + + Response> zpopmax(String key); + + Response> zpopmax(String key, long count); + Response zlexcount(String key, String min, String max); Response> zrangeByLex(String key, String min, String max); From 5de3dcd516ae8fac3d1f7886692f8451a1c508e9 Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Thu, 6 Jun 2019 18:56:22 +0300 Subject: [PATCH 05/11] removed everything about zpopmax. only zpopmin left --- pom.xml | 22 +++++++++ .../redis/clients/jedis/BinaryClient.java | 8 --- .../java/redis/clients/jedis/BinaryJedis.java | 14 ------ .../clients/jedis/BinaryJedisCluster.java | 20 -------- .../clients/jedis/BinaryShardedJedis.java | 12 ----- src/main/java/redis/clients/jedis/Client.java | 10 ---- src/main/java/redis/clients/jedis/Jedis.java | 14 ------ .../redis/clients/jedis/PipelineBase.java | 12 ----- .../java/redis/clients/jedis/Protocol.java | 2 +- .../redis/clients/jedis/ShardedJedis.java | 12 ----- .../commands/BinaryJedisClusterCommands.java | 4 -- .../jedis/commands/BinaryJedisCommands.java | 4 -- .../clients/jedis/commands/Commands.java | 4 -- .../clients/jedis/commands/JedisCommands.java | 4 -- .../clients/jedis/commands/RedisPipeline.java | 4 -- .../tests/commands/SortedSetCommandsTest.java | 49 ------------------- 16 files changed, 23 insertions(+), 172 deletions(-) diff --git a/pom.xml b/pom.xml index f541db2b59..eca400e2ed 100644 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,28 @@ + + + org.apache.maven.plugins + maven-assembly-plugin + + + create-my-bundle + package + + single + + + + jar-with-dependencies + + + + + + + + diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 437ab8d859..84abee8e1e 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -511,14 +511,6 @@ public void zpopmin(final byte[] key, final long count) { sendCommand(ZPOPMIN, key, toByteArray(count)); } - public void zpopmax(final byte[] key) { - sendCommand(ZPOPMAX, key); - } - - public void zpopmax(final byte[] key, final long count) { - sendCommand(ZPOPMAX, key, toByteArray(count)); - } - public void multi() { sendCommand(MULTI); isInMulti = true; diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index ec4bb9d9ff..7448deadd9 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1857,20 +1857,6 @@ public Set zpopmin(final byte[] key, final long count) { return getTupledSet(); } - @Override - public Set zpopmax(final byte[] key) { - checkIsInMultiOrPipeline(); - client.zpopmax(key); - return getTupledSet(); - } - - @Override - public Set zpopmax(final byte[] key, final long count) { - checkIsInMultiOrPipeline(); - client.zpopmax(key, count); - return getTupledSet(); - } - public Transaction multi() { client.multi(); client.getOne(); // expected OK diff --git a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java index 435bcc11be..7fdf14ba1f 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java +++ b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java @@ -926,26 +926,6 @@ public Set execute(Jedis connection) { }.runBinary(key); } - @Override - public Set zpopmax(final byte[] key, final long count) { - return new JedisClusterCommand>(connectionHandler, maxAttempts) { - @Override - public Set execute(Jedis connection) { - return connection.zpopmax(key, count); - } - }.runBinary(key); - } - - @Override - public Set zpopmax(final byte[] key) { - return new JedisClusterCommand>(connectionHandler, maxAttempts) { - @Override - public Set execute(Jedis connection) { - return connection.zpopmax(key); - } - }.runBinary(key); - } - @Override public List sort(final byte[] key) { return new JedisClusterCommand>(connectionHandler, maxAttempts) { diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java index bc9067ec7d..a805483183 100644 --- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java @@ -546,18 +546,6 @@ public Set zpopmin(final byte[] key, final long count) { return j.zpopmin(key, count); } - @Override - public Set zpopmax(final byte[] key) { - Jedis j = getShard(key); - return j.zpopmax(key); - } - - @Override - public Set zpopmax(final byte[] key, final long count) { - Jedis j = getShard(key); - return j.zpopmax(key, count); - } - @Override public List sort(final byte[] key) { Jedis j = getShard(key); diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index 0de15ba6e9..6928d00ef2 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -475,16 +475,6 @@ public void zpopmin(final String key, final long count) { zpopmin(SafeEncoder.encode(key), count); } - @Override - public void zpopmax(final String key) { - zpopmax(SafeEncoder.encode(key)); - } - - @Override - public void zpopmax(final String key, final long count) { - zpopmax(SafeEncoder.encode(key), count); - } - @Override public void watch(final String... keys) { watch(SafeEncoder.encodeMany(keys)); diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index bd1d217766..443e4fd962 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1688,20 +1688,6 @@ public Set zpopmin(final String key, final long count) { return getTupledSet(); } - @Override - public Set zpopmax(final String key) { - checkIsInMultiOrPipeline(); - client.zpopmax(key); - return getTupledSet(); - } - - @Override - public Set zpopmax(final String key, final long count) { - checkIsInMultiOrPipeline(); - client.zpopmax(key, count); - return getTupledSet(); - } - @Override public String watch(final String... keys) { client.watch(keys); diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java index 5769812eb9..e59d877845 100644 --- a/src/main/java/redis/clients/jedis/PipelineBase.java +++ b/src/main/java/redis/clients/jedis/PipelineBase.java @@ -1311,18 +1311,6 @@ public Response> zpopmin(final String key, final long count) { return getResponse(BuilderFactory.TUPLE_ZSET); } - @Override - public Response> zpopmax(final String key) { - getClient(key).zpopmin(key); - return getResponse(BuilderFactory.TUPLE_ZSET); - } - - @Override - public Response> zpopmax(final String key, final long count) { - getClient(key).zpopmin(key, count); - return getResponse(BuilderFactory.TUPLE_ZSET); - } - @Override public Response zlexcount(final byte[] key, final byte[] min, final byte[] max) { getClient(key).zlexcount(key, min, max); diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java index bfa9148e34..41c38791c8 100644 --- a/src/main/java/redis/clients/jedis/Protocol.java +++ b/src/main/java/redis/clients/jedis/Protocol.java @@ -249,7 +249,7 @@ public static enum Command implements ProtocolCommand { HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, - ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN, ZPOPMAX, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, + ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBSUB, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, ZLEXCOUNT, ZRANGEBYLEX, ZREVRANGEBYLEX, ZREMRANGEBYLEX, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index 01380ecc8c..8f1319a9fc 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -584,18 +584,6 @@ public Set zpopmin(final String key, final long count) { return j.zpopmin(key, count); } - @Override - public Set zpopmax(final String key) { - Jedis j = getShard(key); - return j.zpopmax(key); - } - - @Override - public Set zpopmax(final String key, final long count) { - Jedis j = getShard(key); - return j.zpopmax(key, count); - } - @Override public List sort(final String key) { Jedis j = getShard(key); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java index 8c37dc9144..cadc4c2616 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java @@ -183,10 +183,6 @@ public interface BinaryJedisClusterCommands { Set zpopmin(byte[] key, long count); - Set zpopmax(byte[] key); - - Set zpopmax(byte[] key, long count); - List sort(byte[] key); List sort(byte[] key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java index 7d7a6bd2b0..a71f164819 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java @@ -188,10 +188,6 @@ public interface BinaryJedisCommands { Set zpopmin(byte[] key, long count); - Set zpopmax(byte[] key); - - Set zpopmax(byte[] key, long count); - List sort(byte[] key); List sort(byte[] key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/commands/Commands.java b/src/main/java/redis/clients/jedis/commands/Commands.java index e7a16a8dce..36af87239c 100644 --- a/src/main/java/redis/clients/jedis/commands/Commands.java +++ b/src/main/java/redis/clients/jedis/commands/Commands.java @@ -201,10 +201,6 @@ public interface Commands { void zpopmin(String key, long count); - void zpopmax(String key); - - void zpopmax(String key, long count); - void watch(String... keys); void sort(String key); diff --git a/src/main/java/redis/clients/jedis/commands/JedisCommands.java b/src/main/java/redis/clients/jedis/commands/JedisCommands.java index 226bd06614..c181049bda 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisCommands.java @@ -191,10 +191,6 @@ public interface JedisCommands { Set zpopmin(String key, long count); - Set zpopmax(String key); - - Set zpopmax(String key, long count); - List sort(String key); List sort(String key, SortingParams sortingParameters); diff --git a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java index b3ef754ae3..f190d833d2 100644 --- a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java @@ -232,10 +232,6 @@ Response> zrevrangeByScoreWithScores(String key, String max, String m Response> zpopmin(String key, long count); - Response> zpopmax(String key); - - Response> zpopmax(String key, long count); - Response zlexcount(String key, String min, String max); Response> zrangeByLex(String key, String min, String max); diff --git a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java index b2be1dcd08..0414dcc5eb 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java @@ -592,55 +592,6 @@ public void zpopmin() { assertEquals(bexpected, brange); } - @Test - public void zpopmax() { - - jedis.zadd("foo", 1d, "a",ZAddParams.zAddParams().nx()); - jedis.zadd("foo", 10d, "b",ZAddParams.zAddParams().nx()); - jedis.zadd("foo", 0.1d, "c",ZAddParams.zAddParams().nx()); - jedis.zadd("foo", 2d, "a",ZAddParams.zAddParams().nx()); - - Set range = jedis.zpopmax("foo", 2); - - Set expected = new LinkedHashSet(); - expected.add(new Tuple("b", 10d)); - expected.add(new Tuple("a", 1d)); - - assertEquals(expected, range); - - - range = jedis.zpopmax("foo"); - - expected = new LinkedHashSet(); - expected.add(new Tuple("c", 0.1d)); - - assertEquals(expected, range); - - - - // Binary - - jedis.zadd(bfoo, 1d, ba); - jedis.zadd(bfoo, 10d, bb); - jedis.zadd(bfoo, 0.1d, bc); - jedis.zadd(bfoo, 2d, ba); - - Set brange = jedis.zpopmax(bfoo, 2); - - Set bexpected = new LinkedHashSet(); - bexpected.add(new Tuple(bb, 10d)); - bexpected.add(new Tuple(ba, 2d)); - - assertEquals(bexpected, brange); - - brange = jedis.zpopmax(bfoo); - - bexpected = new LinkedHashSet(); - bexpected.add(new Tuple(bc, 0.1d)); - - assertEquals(bexpected, brange); - } - @Test public void zcount() { jedis.zadd("foo", 1d, "a"); From 30009fb08fce2fc6b2ffc2df3a2e545a6f33c676 Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Fri, 14 Jun 2019 00:20:28 +0300 Subject: [PATCH 06/11] removed the unnecessary assembly plugin --- pom.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pom.xml b/pom.xml index eca400e2ed..e2039f3718 100644 --- a/pom.xml +++ b/pom.xml @@ -192,27 +192,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - create-my-bundle - package - - single - - - - jar-with-dependencies - - - - - - - - From b36f73f3e2d0a365b08f41072140b341a69019df Mon Sep 17 00:00:00 2001 From: "yigit-w8-home\\yigit" Date: Wed, 19 Jun 2019 23:23:43 +0300 Subject: [PATCH 07/11] removed one single empty line from the pom xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2039f3718..f541db2b59 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,6 @@ - From 117788d5a072bf7707573ecb9b1ec1de1ff6d2c7 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque Date: Wed, 16 Oct 2019 12:29:10 +0600 Subject: [PATCH 08/11] remove extra empty lines --- .../clients/jedis/tests/commands/SortedSetCommandsTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java index 0414dcc5eb..624af6d87d 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java @@ -559,7 +559,6 @@ public void zpopmin() { assertEquals(expected, range); - range = jedis.zpopmin("foo"); expected = new LinkedHashSet(); @@ -567,8 +566,6 @@ public void zpopmin() { assertEquals(expected, range); - - // Binary jedis.zadd(bfoo, 1d, ba); From 63f290bd9caddead2fe31e6b29876f3c764c2fb0 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque Date: Wed, 16 Oct 2019 12:30:25 +0600 Subject: [PATCH 09/11] format --- src/main/java/redis/clients/jedis/Protocol.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java index 41c38791c8..ffea7a2a6d 100644 --- a/src/main/java/redis/clients/jedis/Protocol.java +++ b/src/main/java/redis/clients/jedis/Protocol.java @@ -249,8 +249,8 @@ public static enum Command implements ProtocolCommand { HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, - ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, - BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBSUB, ZCOUNT, + ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, ZPOPMIN, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, + BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBSUB, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, ZLEXCOUNT, ZRANGEBYLEX, ZREVRANGEBYLEX, ZREMRANGEBYLEX, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN, SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, From 551fd273b4f044623a8fd996aaa75226bea80eed Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque Date: Wed, 16 Oct 2019 12:32:39 +0600 Subject: [PATCH 10/11] remove extra empty lines --- src/main/java/redis/clients/jedis/BinaryJedis.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 7448deadd9..1bfe8bbe3e 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1841,8 +1841,6 @@ public Double zscore(final byte[] key, final byte[] member) { return (score != null ? new Double(score) : null); } - - @Override public Set zpopmin(final byte[] key) { checkIsInMultiOrPipeline(); From 4c07bd7e1b774f2c0cb090b115587800f9e7ad22 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque Date: Wed, 16 Oct 2019 12:33:25 +0600 Subject: [PATCH 11/11] remove extra empty lines --- src/main/java/redis/clients/jedis/Jedis.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index 443e4fd962..dc53a30583 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1673,7 +1673,6 @@ public Double zscore(final String key, final String member) { return BuilderFactory.DOUBLE.build(client.getOne()); } - @Override public Set zpopmin(final String key) { checkIsInMultiOrPipeline();