diff --git a/redisson/src/main/java/org/redisson/RedissonBuckets.java b/redisson/src/main/java/org/redisson/RedissonBuckets.java index a3f4d6701..d73b19e8d 100644 --- a/redisson/src/main/java/org/redisson/RedissonBuckets.java +++ b/redisson/src/main/java/org/redisson/RedissonBuckets.java @@ -150,7 +150,7 @@ public class RedissonBuckets implements RBuckets { } return params.toArray(); } - }, buckets.keySet().toArray(new String[]{}), buckets); + }, buckets.keySet().toArray(new String[]{})); } } diff --git a/redisson/src/main/java/org/redisson/command/CommandAsyncExecutor.java b/redisson/src/main/java/org/redisson/command/CommandAsyncExecutor.java index 6b09765ab..0580944b8 100644 --- a/redisson/src/main/java/org/redisson/command/CommandAsyncExecutor.java +++ b/redisson/src/main/java/org/redisson/command/CommandAsyncExecutor.java @@ -120,7 +120,5 @@ public interface CommandAsyncExecutor { RFuture readBatchedAsync(Codec codec, RedisCommand command, SlotCallback callback, String... keys); RFuture writeBatchedAsync(Codec codec, RedisCommand command, SlotCallback callback, String... keys); - - RFuture writeBatchedAsync(Codec codec, RedisCommand command, SlotCallback callback, String[] keys, Map valueMap); - + } diff --git a/redisson/src/main/java/org/redisson/command/CommandAsyncService.java b/redisson/src/main/java/org/redisson/command/CommandAsyncService.java index 634de7992..143fbef87 100644 --- a/redisson/src/main/java/org/redisson/command/CommandAsyncService.java +++ b/redisson/src/main/java/org/redisson/command/CommandAsyncService.java @@ -597,35 +597,21 @@ public class CommandAsyncService implements CommandAsyncExecutor { @Override public RFuture readBatchedAsync(Codec codec, RedisCommand command, SlotCallback callback, String... keys) { - return executeBatchedAsync(true, codec, command, callback, keys, null); + return executeBatchedAsync(true, codec, command, callback, keys); } @Override public RFuture writeBatchedAsync(Codec codec, RedisCommand command, SlotCallback callback, String... keys) { - return executeBatchedAsync(false, codec, command, callback, keys, null); + return executeBatchedAsync(false, codec, command, callback, keys); } - @Override - public RFuture writeBatchedAsync(Codec codec, RedisCommand command, SlotCallback callback, String[] keys, Map valueMap) { - return executeBatchedAsync(false, codec, command, callback, keys, valueMap); - } - - private RFuture executeBatchedAsync(boolean readOnly, Codec codec, RedisCommand command, SlotCallback callback, String[] keys, Map valueMap) { + private RFuture executeBatchedAsync(boolean readOnly, Codec codec, RedisCommand command, SlotCallback callback, String[] keys) { if (!connectionManager.isClusterMode()) { - List params = null; - if (valueMap != null) { - params = new ArrayList<>(keys.length * 2); - for (String key : keys) { - params.add(key); - params.add(valueMap.get(key)); - } - } else { - params = Arrays.asList(keys); - } + Object[] params = callback.createParams(Arrays.asList(keys)); if (readOnly) { - return readAsync((String) null, codec, command, params.toArray()); + return readAsync((String) null, codec, command, params); } - return writeAsync((String) null, codec, command, params.toArray()); + return writeAsync((String) null, codec, command, params); } Map>> entry2keys = Arrays.stream(keys).collect(