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

Clean redis message cache structure

Browse Source
This commit is contained in:
Ehren Kret
2021-08-11 17:58:51 -05:00
committed by Chris Eager
parent 739c5bf22c
commit ba522b1691
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,7 @@ 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 guid = ARGV[3]
if redis.call("HEXISTS", queueMetadataKey, guid) == 1 then
return tonumber(redis.call("HGET", queueMetadataKey, guid))
@@ -14,13 +13,7 @@ local messageId = redis.call("HINCRBY", queueMetadataKey, "counter", 1)
redis.call("ZADD", queueKey, "NX", messageId, message)
if sender ~= "nil" then
redis.call("HSET", queueMetadataKey, sender, messageId)
redis.call("HSET", queueMetadataKey, messageId, sender)
end
redis.call("HSET", queueMetadataKey, guid, messageId)
redis.call("HSET", queueMetadataKey, messageId .. "guid", guid)
redis.call("EXPIRE", queueKey, 7776000) -- 90 days
redis.call("EXPIRE", queueMetadataKey, 7776000) -- 90 days

17
service/src/main/resources/lua/remove_item_by_guid.lua
View File

@@ -9,20 +9,9 @@ for _, guid in ipairs(ARGV) do
if messageId then
local envelope = redis.call("ZRANGEBYSCORE", queueKey, messageId, messageId, "LIMIT", 0, 1)
local sender = redis.call("HGET", queueMetadataKey, messageId)
redis.call("ZREMRANGEBYSCORE", queueKey, messageId, messageId)
redis.call("HDEL", queueMetadataKey, guid)
redis.call("HDEL", queueMetadataKey, messageId .. "guid")
if sender then
redis.call("HDEL", queueMetadataKey, sender)
redis.call("HDEL", queueMetadataKey, messageId)
end
if (redis.call("ZCARD", queueKey) == 0) then
redis.call("ZREM", queueTotalIndexKey, queueKey)
end
if envelope and next(envelope) then
removedMessages[#removedMessages + 1] = envelope[1]
@@ -30,4 +19,10 @@ for _, guid in ipairs(ARGV) do
end
end
if (redis.call("ZCARD", queueKey) == 0) then
redis.call("DEL", queueKey)
redis.call("DEL", queueMetadataKey)
redis.call("ZREM", queueTotalIndexKey, queueKey)
end
return removedMessages