From b2d40b61c6c75dc54c0679822903df092600ee92 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Mon, 11 Dec 2023 10:00:42 +0300 Subject: [PATCH] refactoring --- redisson/src/main/java/org/redisson/RedissonBaseLock.java | 4 ++-- redisson/src/main/java/org/redisson/RedissonFairLock.java | 4 ++-- redisson/src/main/java/org/redisson/RedissonLock.java | 4 ++-- redisson/src/main/java/org/redisson/RedissonReadLock.java | 4 ++-- redisson/src/main/java/org/redisson/RedissonSpinLock.java | 2 +- redisson/src/main/java/org/redisson/RedissonWriteLock.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonBaseLock.java b/redisson/src/main/java/org/redisson/RedissonBaseLock.java index 5170756db..687378a05 100644 --- a/redisson/src/main/java/org/redisson/RedissonBaseLock.java +++ b/redisson/src/main/java/org/redisson/RedissonBaseLock.java @@ -172,7 +172,7 @@ public abstract class RedissonBaseLock extends RedissonExpirable implements RLoc } protected CompletionStage renewExpirationAsync(long threadId) { - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "if (redis.call('hexists', KEYS[1], ARGV[2]) == 1) then " + "redis.call('pexpire', KEYS[1], ARGV[1]); " + "return 1; " + @@ -201,7 +201,7 @@ public abstract class RedissonBaseLock extends RedissonExpirable implements RLoc } } - protected final RFuture evalWriteAsync(String key, Codec codec, RedisCommand evalCommandType, String script, List keys, Object... params) { + protected final RFuture evalWriteSyncedAsync(String key, Codec codec, RedisCommand evalCommandType, String script, List keys, Object... params) { return commandExecutor.syncedEval(key, codec, evalCommandType, script, keys, params); } diff --git a/redisson/src/main/java/org/redisson/RedissonFairLock.java b/redisson/src/main/java/org/redisson/RedissonFairLock.java index 442a8f1e0..179eba4f7 100644 --- a/redisson/src/main/java/org/redisson/RedissonFairLock.java +++ b/redisson/src/main/java/org/redisson/RedissonFairLock.java @@ -77,7 +77,7 @@ public class RedissonFairLock extends RedissonLock implements RLock { wait = unit.toMillis(waitTime); } - RFuture f = evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_VOID, + RFuture f = evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_VOID, // get the existing timeout for the thread to remove "local queue = redis.call('lrange', KEYS[1], 0, -1);" + // find the location in the queue where the thread is @@ -235,7 +235,7 @@ public class RedissonFairLock extends RedissonLock implements RLock { @Override protected RFuture unlockInnerAsync(long threadId, String requestId, int timeout) { - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local val = redis.call('get', KEYS[5]); " + "if val ~= false then " + "return tonumber(val);" + diff --git a/redisson/src/main/java/org/redisson/RedissonLock.java b/redisson/src/main/java/org/redisson/RedissonLock.java index 3feeeb874..f7df52350 100644 --- a/redisson/src/main/java/org/redisson/RedissonLock.java +++ b/redisson/src/main/java/org/redisson/RedissonLock.java @@ -212,7 +212,7 @@ public class RedissonLock extends RedissonBaseLock { } RFuture tryLockInnerAsync(long waitTime, long leaseTime, TimeUnit unit, long threadId, RedisStrictCommand command) { - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, command, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, command, "if ((redis.call('exists', KEYS[1]) == 0) " + "or (redis.call('hexists', KEYS[1], ARGV[2]) == 1)) then " + "redis.call('hincrby', KEYS[1], ARGV[2], 1); " + @@ -335,7 +335,7 @@ public class RedissonLock extends RedissonBaseLock { } protected RFuture unlockInnerAsync(long threadId, String requestId, int timeout) { - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local val = redis.call('get', KEYS[3]); " + "if val ~= false then " + "return tonumber(val);" + diff --git a/redisson/src/main/java/org/redisson/RedissonReadLock.java b/redisson/src/main/java/org/redisson/RedissonReadLock.java index a0793d9de..01a739d44 100644 --- a/redisson/src/main/java/org/redisson/RedissonReadLock.java +++ b/redisson/src/main/java/org/redisson/RedissonReadLock.java @@ -84,7 +84,7 @@ public class RedissonReadLock extends RedissonLock implements RLock { String timeoutPrefix = getReadWriteTimeoutNamePrefix(threadId); String keyPrefix = getKeyPrefix(threadId, timeoutPrefix); - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local val = redis.call('get', KEYS[5]); " + "if val ~= false then " + "return tonumber(val);" + @@ -149,7 +149,7 @@ public class RedissonReadLock extends RedissonLock implements RLock { String timeoutPrefix = getReadWriteTimeoutNamePrefix(threadId); String keyPrefix = getKeyPrefix(threadId, timeoutPrefix); - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local counter = redis.call('hget', KEYS[1], ARGV[2]); " + "if (counter ~= false) then " + "redis.call('pexpire', KEYS[1], ARGV[1]); " + diff --git a/redisson/src/main/java/org/redisson/RedissonSpinLock.java b/redisson/src/main/java/org/redisson/RedissonSpinLock.java index 4f1e4b1a5..0c041e7b4 100644 --- a/redisson/src/main/java/org/redisson/RedissonSpinLock.java +++ b/redisson/src/main/java/org/redisson/RedissonSpinLock.java @@ -198,7 +198,7 @@ public class RedissonSpinLock extends RedissonBaseLock { protected RFuture unlockInnerAsync(long threadId, String requestId, int timeout) { - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local val = redis.call('get', KEYS[2]); " + "if val ~= false then " + "return tonumber(val);" + diff --git a/redisson/src/main/java/org/redisson/RedissonWriteLock.java b/redisson/src/main/java/org/redisson/RedissonWriteLock.java index 77434c2de..6a92654b0 100644 --- a/redisson/src/main/java/org/redisson/RedissonWriteLock.java +++ b/redisson/src/main/java/org/redisson/RedissonWriteLock.java @@ -77,7 +77,7 @@ public class RedissonWriteLock extends RedissonLock implements RLock { @Override protected RFuture unlockInnerAsync(long threadId, String requestId, int timeout) { - return evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, + return evalWriteSyncedAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local val = redis.call('get', KEYS[3]); " + "if val ~= false then " + "return tonumber(val);" +