From adf3974e49ccbb6664886a3db56579e91b9ad108 Mon Sep 17 00:00:00 2001 From: chenxiabin Date: Fri, 15 Mar 2024 10:21:40 +0800 Subject: [PATCH] fix ZPOPMIN\ZPOPMAX to count members error for all Spring Data Redis modules Signed-off-by: chenxiabin --- .../spring/data/connection/RedissonConnection.java | 8 ++++++-- .../spring/data/connection/RedissonConnection.java | 8 ++++++-- .../spring/data/connection/RedissonConnection.java | 8 ++++++-- .../spring/data/connection/RedissonConnection.java | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 8afe21192..be47c32ba 100644 --- a/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -2484,11 +2484,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, (Object) key); } + private static final RedisCommand> ZPOPMIN_FOR_SET = new RedisCommand<>("ZPOPMIN", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMin(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN_FOR_SET, key, count); } private static final RedisCommand BZPOPMIN = new RedisCommand<>("BZPOPMIN", new ScoredSortedSingleBlockingReplayDecoder()); @@ -2510,11 +2512,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, (Object) key); } + private static final RedisCommand> ZPOPMAX_FOR_SET = new RedisCommand<>("ZPOPMAX", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMax(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX_FOR_SET, key, count); } private static final RedisCommand BZPOPMAX = new RedisCommand<>("BZPOPMAX", new ScoredSortedSingleBlockingReplayDecoder()); diff --git a/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 2fdd840e5..851382e0b 100644 --- a/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -2411,11 +2411,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, (Object) key); } + private static final RedisCommand> ZPOPMIN_FOR_SET = new RedisCommand<>("ZPOPMIN", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMin(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN_FOR_SET, key, count); } private static final RedisCommand BZPOPMIN = new RedisCommand<>("BZPOPMIN", new ScoredSortedSingleBlockingReplayDecoder()); @@ -2437,11 +2439,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, (Object) key); } + private static final RedisCommand> ZPOPMAX_FOR_SET = new RedisCommand<>("ZPOPMAX", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMax(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX_FOR_SET, key, count); } private static final RedisCommand BZPOPMAX = new RedisCommand<>("BZPOPMAX", new ScoredSortedSingleBlockingReplayDecoder()); diff --git a/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 5d7bbebbd..5567f1347 100644 --- a/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -2411,11 +2411,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, (Object) key); } + private static final RedisCommand> ZPOPMIN_FOR_SET = new RedisCommand<>("ZPOPMIN", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMin(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN_FOR_SET, key, count); } private static final RedisCommand BZPOPMIN = new RedisCommand<>("BZPOPMIN", new ScoredSortedSingleBlockingReplayDecoder()); @@ -2437,11 +2439,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, (Object) key); } + private static final RedisCommand> ZPOPMAX_FOR_SET = new RedisCommand<>("ZPOPMAX", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMax(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX_FOR_SET, key, count); } private static final RedisCommand BZPOPMAX = new RedisCommand<>("BZPOPMAX", new ScoredSortedSingleBlockingReplayDecoder()); diff --git a/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index bbf00517b..4e1a5cd9d 100644 --- a/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -2411,11 +2411,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, (Object) key); } + private static final RedisCommand> ZPOPMIN_FOR_SET = new RedisCommand<>("ZPOPMIN", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMin(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMIN_FOR_SET, key, count); } private static final RedisCommand BZPOPMIN = new RedisCommand<>("BZPOPMIN", new ScoredSortedSingleBlockingReplayDecoder()); @@ -2437,11 +2439,13 @@ public class RedissonConnection extends AbstractRedisConnection { return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, (Object) key); } + private static final RedisCommand> ZPOPMAX_FOR_SET = new RedisCommand<>("ZPOPMAX", new ScoredSortedSetReplayDecoder()); + @Override public Set zPopMax(byte[] key, long count) { Assert.notNull(key, "Key must not be null!"); - return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX, key, count); + return write(key, ByteArrayCodec.INSTANCE, ZPOPMAX_FOR_SET, key, count); } private static final RedisCommand BZPOPMAX = new RedisCommand<>("BZPOPMAX", new ScoredSortedSingleBlockingReplayDecoder());