From 8cafd1df7bd7b0de6df9641b5a2f2e2d66334830 Mon Sep 17 00:00:00 2001 From: WqyJh <781345688@qq.com> Date: Fri, 26 Jan 2024 14:21:01 +0800 Subject: [PATCH] refactor: add new line before every script --- script.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/script.go b/script.go index fffb440..a7a98de 100644 --- a/script.go +++ b/script.go @@ -3,11 +3,13 @@ package rockscache import "github.com/redis/go-redis/v9" var ( - deleteScript = redis.NewScript(`redis.call('HSET', KEYS[1], 'lockUntil', 0) + deleteScript = redis.NewScript(` +redis.call('HSET', KEYS[1], 'lockUntil', 0) redis.call('HDEL', KEYS[1], 'lockOwner') redis.call('EXPIRE', KEYS[1], ARGV[1])`) - getScript = redis.NewScript(`local v = redis.call('HGET', KEYS[1], 'value') + getScript = redis.NewScript(` +local v = redis.call('HGET', KEYS[1], 'value') local lu = redis.call('HGET', KEYS[1], 'lockUntil') if lu ~= false and tonumber(lu) < tonumber(ARGV[1]) or lu == false and v == false then redis.call('HSET', KEYS[1], 'lockUntil', ARGV[2]) @@ -16,7 +18,8 @@ if lu ~= false and tonumber(lu) < tonumber(ARGV[1]) or lu == false and v == fals end return {v, lu}`) - setScript = redis.NewScript(`local o = redis.call('HGET', KEYS[1], 'lockOwner') + setScript = redis.NewScript(` +local o = redis.call('HGET', KEYS[1], 'lockOwner') if o ~= ARGV[2] then return end @@ -25,7 +28,8 @@ redis.call('HDEL', KEYS[1], 'lockUntil') redis.call('HDEL', KEYS[1], 'lockOwner') redis.call('EXPIRE', KEYS[1], ARGV[3])`) - lockScript = redis.NewScript(`local lu = redis.call('HGET', KEYS[1], 'lockUntil') + lockScript = redis.NewScript(` +local lu = redis.call('HGET', KEYS[1], 'lockUntil') local lo = redis.call('HGET', KEYS[1], 'lockOwner') if lu == false or tonumber(lu) < tonumber(ARGV[2]) or lo == ARGV[1] then redis.call('HSET', KEYS[1], 'lockUntil', ARGV[2]) @@ -34,14 +38,16 @@ if lu == false or tonumber(lu) < tonumber(ARGV[2]) or lo == ARGV[1] then end return lo`) - unlockScript = redis.NewScript(`local lo = redis.call('HGET', KEYS[1], 'lockOwner') + unlockScript = redis.NewScript(` +local lo = redis.call('HGET', KEYS[1], 'lockOwner') if lo == ARGV[1] then redis.call('HSET', KEYS[1], 'lockUntil', 0) redis.call('HDEL', KEYS[1], 'lockOwner') redis.call('EXPIRE', KEYS[1], ARGV[2]) end`) - getBatchScript = redis.NewScript(`local rets = {} + getBatchScript = redis.NewScript(` +local rets = {} for i, key in ipairs(KEYS) do local v = redis.call('HGET', key, 'value') @@ -56,7 +62,8 @@ do end return rets`) - setBatchScript = redis.NewScript(`local n = #KEYS + setBatchScript = redis.NewScript(` +local n = #KEYS for i, key in ipairs(KEYS) do local o = redis.call('HGET', key, 'lockOwner') @@ -69,7 +76,8 @@ do redis.call('EXPIRE', key, ARGV[i+1+n]) end`) - deleteBatchScript = redis.NewScript(`for i, key in ipairs(KEYS) do + deleteBatchScript = redis.NewScript(` +for i, key in ipairs(KEYS) do redis.call('HSET', key, 'lockUntil', 0) redis.call('HDEL', key, 'lockOwner') redis.call('EXPIRE', key, ARGV[1])