mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_storage_sql: Adjust handling of 'total' for multi-id queries

Browse source 
Otherwise a query for a set of ids may cause that value to be cached,
despite only covering a subset.
This commit is contained in:
Kim Alvefur 2021-11-30 15:58:23 +01:00
parent 0d9065ae80
commit 36bbf6b077
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/mod_storage_sql.lua
View file

@ -428,7 +428,8 @@ function archive_store:find(username, query)
local cache_key = jid_join(username, host, self.store);
local total = archive_item_count_cache:get(cache_key);
(total and item_count_cache_hit or item_count_cache_miss)();
if total ~= nil and query.limit == 0 and query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
if total ~= nil and query.limit == 0 and query.start == nil and query.with == nil and query["end"] == nil
and query.key == nil and query.ids == nil then
return noop, total;
end
local ok, result, err = engine:transaction(function()
@ -452,7 +453,7 @@ function archive_store:find(username, query)
total = row[1];
end
end
if query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
if query.start == nil and query.with == nil and query["end"] == nil and query.key == nil and query.ids == nil then
archive_item_count_cache:set(cache_key, total);
end
if query.limit == 0 then -- Skip the real query