Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 22:18:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use named variables instead of referring to KEYS/ARGV array indices in message cache scripts.

Browse Source
This commit is contained in:
Jon Chambers
2020-10-01 16:09:03 -04:00
committed by Jon Chambers
parent f3f4bd33e5
commit 551a85c1e6
7 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
service/src/main/resources/lua/insert_item.lua
View File

@@ -1,24 +1,26 @@
-- keys: queue_key [1], queue_metadata_key [2], queue_total_index [3]
-- argv: message [1], current_time [2], sender (possibly null) [3], guid [4], messageId (possibly null) [5]
local queueKey = KEYS[1]
local queueMetadataKey = KEYS[2]
local queueTotalIndexKey = KEYS[3]
local message = ARGV[1]
local currentTime = ARGV[2]
local sender = ARGV[3]
local guid = ARGV[4]
local messageId = redis.call("HINCRBY", KEYS[2], "counter", 1)
local messageId = redis.call("HINCRBY", queueMetadataKey, "counter", 1)
redis.call("ZADD", KEYS[1], "NX", messageId, ARGV[1])
redis.call("ZADD", queueKey, "NX", messageId, message)
if ARGV[3] ~= "nil" then
redis.call("HSET", KEYS[2], ARGV[3], messageId)
if sender ~= "nil" then
redis.call("HSET", queueMetadataKey, sender, messageId)
redis.call("HSET", queueMetadataKey, messageId, sender)
end
redis.call("HSET", KEYS[2], ARGV[4], messageId)
redis.call("HSET", queueMetadataKey, guid, messageId)
if ARGV[3] ~= "nil" then
redis.call("HSET", KEYS[2], messageId, ARGV[3])
end
redis.call("HSET", queueMetadataKey, messageId .. "guid", guid)
redis.call("HSET", KEYS[2], messageId .. "guid", ARGV[4])
redis.call("EXPIRE", queueKey, 7776000) -- 90 days
redis.call("EXPIRE", queueMetadataKey, 7776000) -- 90 days
redis.call("EXPIRE", KEYS[1], 7776000)
redis.call("EXPIRE", KEYS[2], 7776000)
redis.call("ZADD", KEYS[3], "NX", ARGV[2], KEYS[1])
return messageId
redis.call("ZADD", queueTotalIndexKey, "NX", currentTime, queueKey)
return messageId