diff --git a/redisson/src/main/java/org/redisson/RedissonIdGenerator.java b/redisson/src/main/java/org/redisson/RedissonIdGenerator.java index 7c01d72e1..9d063908c 100644 --- a/redisson/src/main/java/org/redisson/RedissonIdGenerator.java +++ b/redisson/src/main/java/org/redisson/RedissonIdGenerator.java @@ -63,7 +63,7 @@ public class RedissonIdGenerator extends RedissonExpirable implements RIdGenerat @Override public RFuture tryInitAsync(long value, long allocationSize) { - return commandExecutor.evalWriteAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return commandExecutor.evalWriteNoRetryAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "redis.call('setnx', KEYS[1], ARGV[1]); " + "return redis.call('setnx', KEYS[2], ARGV[2]); ", Arrays.asList(getRawName(), getAllocationSizeName()), value, allocationSize); diff --git a/redisson/src/main/java/org/redisson/RedissonMap.java b/redisson/src/main/java/org/redisson/RedissonMap.java index 581a53333..87a93c632 100644 --- a/redisson/src/main/java/org/redisson/RedissonMap.java +++ b/redisson/src/main/java/org/redisson/RedissonMap.java @@ -961,7 +961,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { protected RFuture putIfAbsentOperationAsync(K key, V value) { String name = getRawName(key); - return commandExecutor.evalWriteAsync(name, codec, RedisCommands.EVAL_MAP_VALUE, + return commandExecutor.evalWriteNoRetryAsync(name, codec, RedisCommands.EVAL_MAP_VALUE, "if redis.call('hsetnx', KEYS[1], ARGV[1], ARGV[2]) == 1 then " + "return nil " + "else " diff --git a/redisson/src/main/java/org/redisson/RedissonMapCache.java b/redisson/src/main/java/org/redisson/RedissonMapCache.java index d0e789fa3..1bcab801e 100644 --- a/redisson/src/main/java/org/redisson/RedissonMapCache.java +++ b/redisson/src/main/java/org/redisson/RedissonMapCache.java @@ -106,7 +106,7 @@ public class RedissonMapCache extends RedissonMap implements RMapCac throw new IllegalArgumentException("maxSize should be greater than zero"); } - return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return commandExecutor.evalWriteNoRetryAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "redis.call('hsetnx', KEYS[1], 'max-size', ARGV[1]);" + "return redis.call('hsetnx', KEYS[1], 'mode', ARGV[2]);", Collections.singletonList(getOptionsName()), maxSize, mode); diff --git a/redisson/src/main/java/org/redisson/RedissonRateLimiter.java b/redisson/src/main/java/org/redisson/RedissonRateLimiter.java index ec0a8d4b9..d69b40526 100644 --- a/redisson/src/main/java/org/redisson/RedissonRateLimiter.java +++ b/redisson/src/main/java/org/redisson/RedissonRateLimiter.java @@ -242,7 +242,7 @@ public class RedissonRateLimiter extends RedissonExpirable implements RRateLimit @Override public RFuture trySetRateAsync(RateType type, long rate, long rateInterval, RateIntervalUnit unit) { - return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return commandExecutor.evalWriteNoRetryAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "redis.call('hsetnx', KEYS[1], 'rate', ARGV[1]);" + "redis.call('hsetnx', KEYS[1], 'interval', ARGV[2]);" + "return redis.call('hsetnx', KEYS[1], 'type', ARGV[3]);", diff --git a/redisson/src/main/java/org/redisson/RedissonRemoteService.java b/redisson/src/main/java/org/redisson/RedissonRemoteService.java index 3a4675656..45dfd0bcb 100644 --- a/redisson/src/main/java/org/redisson/RedissonRemoteService.java +++ b/redisson/src/main/java/org/redisson/RedissonRemoteService.java @@ -335,7 +335,7 @@ public class RedissonRemoteService extends BaseRemoteService implements RRemoteS if (request.getOptions().isAckExpected()) { String responseName = getResponseQueueName(request.getExecutorId()); String ackName = getAckName(request.getId()); - RFuture ackClientsFuture = commandExecutor.evalWriteAsync(responseName, + RFuture ackClientsFuture = commandExecutor.evalWriteNoRetryAsync(responseName, LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "if redis.call('setnx', KEYS[1], 1) == 1 then " + "redis.call('pexpire', KEYS[1], ARGV[1]);" diff --git a/redisson/src/main/java/org/redisson/eviction/MapCacheEvictionTask.java b/redisson/src/main/java/org/redisson/eviction/MapCacheEvictionTask.java index 30e0ac2a1..cbc4eb001 100644 --- a/redisson/src/main/java/org/redisson/eviction/MapCacheEvictionTask.java +++ b/redisson/src/main/java/org/redisson/eviction/MapCacheEvictionTask.java @@ -56,7 +56,7 @@ public class MapCacheEvictionTask extends EvictionTask { @Override RFuture execute() { int latchExpireTime = Math.min(delay, 30); - return executor.evalWriteAsync(name, LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER, + return executor.evalWriteNoRetryAsync(name, LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER, "if redis.call('setnx', KEYS[6], ARGV[4]) == 0 then " + "return -1;" + "end;" diff --git a/redisson/src/main/java/org/redisson/remote/AsyncRemoteProxy.java b/redisson/src/main/java/org/redisson/remote/AsyncRemoteProxy.java index 3f8104b17..2ba36a2be 100644 --- a/redisson/src/main/java/org/redisson/remote/AsyncRemoteProxy.java +++ b/redisson/src/main/java/org/redisson/remote/AsyncRemoteProxy.java @@ -345,7 +345,7 @@ public class AsyncRemoteProxy extends BaseRemoteProxy { RPromise result = new RedissonPromise<>(); if (optionsCopy.isAckExpected()) { String ackName = remoteService.getAckName(requestId); - RFuture future = commandExecutor.evalWriteAsync(responseQueueName, LongCodec.INSTANCE, + RFuture future = commandExecutor.evalWriteNoRetryAsync(responseQueueName, LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "if redis.call('setnx', KEYS[1], 1) == 1 then " + "redis.call('pexpire', KEYS[1], ARGV[1]);" diff --git a/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java b/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java index 9e22309ae..9df4f5e5a 100644 --- a/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java +++ b/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java @@ -72,8 +72,8 @@ public abstract class BaseRemoteProxy { protected RFuture tryPollAckAgainAsync(RemoteInvocationOptions optionsCopy, String ackName, RequestId requestId) { - RPromise promise = new RedissonPromise(); - RFuture ackClientsFuture = commandExecutor.evalWriteAsync(ackName, LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + RPromise promise = new RedissonPromise<>(); + RFuture ackClientsFuture = commandExecutor.evalWriteNoRetryAsync(ackName, LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "if redis.call('setnx', KEYS[1], 1) == 1 then " + "redis.call('pexpire', KEYS[1], ARGV[1]);" + "return 0;"