Software / code / prosody
Changeset
11971:0b350909da24
mod_storage_sql: Return cached total where it makes sense
This should skip the summary SQL query when not needed, ie when the
cached value can be used directly.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 30 Nov 2021 16:26:01 +0100 |
| parents | 11970:f0e78fa8f24c |
| children | 11972:520ce76440ad |
| files | plugins/mod_storage_sql.lua |
| diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_sql.lua Tue Nov 30 15:58:23 2021 +0100 +++ b/plugins/mod_storage_sql.lua Tue Nov 30 16:26:01 2021 +0100 @@ -428,9 +428,13 @@ 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 and query.ids == nil then - return noop, total; + if query.start == nil and query.with == nil and query["end"] == nil and query.key == nil and query.ids == nil then + -- the query is for the whole archive, so a cached 'total' should be a + -- relatively accurate response if that's all that is requested + if total ~= nil and query.limit == 0 then return noop, total; end + else + -- not usable, so refresh it later if needed + total = nil; end local ok, result, err = engine:transaction(function() local sql_query = [[ @@ -445,7 +449,8 @@ archive_where(query, args, where); -- Total matching - if query.total then + if query.total and not total then + local stats = engine:select("SELECT COUNT(*) FROM \"prosodyarchive\" WHERE " .. t_concat(where, " AND "), unpack(args)); if stats then
