Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 08:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add timestamp to msgs_index7 and speed up "normal chatlist" (#7848)

Browse Source
This commit is contained in:
iequidoo
2026-03-13 10:41:19 -03:00
parent 8528184fa3
commit 18d0b0aafc
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/chatlist.rs
View File

@@ -15,7 +15,7 @@ use crate::message::{Message, MessageState, MsgId};
use crate::param::{Param, Params}; use crate::param::{Param, Params};
use crate::stock_str; use crate::stock_str;
use crate::summary::Summary; use crate::summary::Summary;
use crate::tools::IsNoneOrEmpty; use crate::tools::{IsNoneOrEmpty, Time, time_elapsed};
/// Regex to find out if a query should filter by unread messages. /// Regex to find out if a query should filter by unread messages.
pub static IS_UNREAD_FILTER: LazyLock<regex::Regex> = pub static IS_UNREAD_FILTER: LazyLock<regex::Regex> =
@@ -264,7 +264,8 @@ impl Chatlist {
).await? ).await?
} else { } else {
// show normal chatlist // show normal chatlist
context.sql.query_map_vec( let start = Time::now();
let items = context.sql.query_map_vec(
"SELECT c.id, m.id "SELECT c.id, m.id
FROM chats c FROM chats c
LEFT JOIN msgs m LEFT JOIN msgs m
@@ -272,17 +273,25 @@ impl Chatlist {
AND m.id=( AND m.id=(
SELECT id SELECT id
FROM msgs FROM msgs
WHERE chat_id=c.id WHERE state=19 AND hidden IN (0,1) AND chat_id=c.id
AND (hidden=0 OR state=?) OR state IN (10,13,16,18,20,24,26)
AND hidden=0
AND chat_id=c.id
ORDER BY timestamp DESC, id DESC LIMIT 1) ORDER BY timestamp DESC, id DESC LIMIT 1)
WHERE c.id>9 AND c.id!=? WHERE c.id>9 AND c.id!=?
AND (c.blocked=0 OR c.blocked=2) AND (c.blocked=0 OR c.blocked=2)
AND NOT c.archived=? AND NOT c.archived=?
GROUP BY c.id GROUP BY c.id
ORDER BY c.id=0 DESC, c.archived=? DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;", ORDER BY c.id=0 DESC, c.archived=? DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
(MessageState::OutDraft, skip_id, ChatVisibility::Archived, ChatVisibility::Pinned), (skip_id, ChatVisibility::Archived, ChatVisibility::Pinned),
process_row, process_row,
).await? ).await?;
info!(
context,
"chatlist built in {:?}.",
time_elapsed(&start),
);
items
}; };
if !flag_no_specials && get_archived_cnt(context).await? > 0 { if !flag_no_specials && get_archived_cnt(context).await? > 0 {
if ids.is_empty() && flag_add_alldone_hint { if ids.is_empty() && flag_add_alldone_hint {

11
src/sql/migrations.rs
View File

@@ -2363,6 +2363,17 @@ ALTER TABLE contacts ADD COLUMN name_normalized TEXT;
.await?; .await?;
} }
inc_and_check(&mut migration_version, 150)?;
if dbversion < migration_version {
sql.execute_migration(
"UPDATE msgs SET state=26 WHERE state=28;
DROP INDEX IF EXISTS msgs_index7;
CREATE INDEX msgs_index7 ON msgs (state, hidden, chat_id, timestamp);",
migration_version,
)
.await?;
}
let new_version = sql let new_version = sql
.get_raw_config_int(VERSION_CFG) .get_raw_config_int(VERSION_CFG)
.await? .await?