devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 07:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(flatfile): drop cursor optim + guard n_entries==0

Browse Source 
Cursor was set to oldest of read window, not oldest of returned
batch — each page-up jumped past entire ranges (F16: 600/2000 msgs).
Always bisect now; correct + simpler. Cost: +5-10 ms per page-up at
1M msgs, well below UI threshold.

Also guard state->entries NULL when total_lines>0 && n_entries==0
(every line failed _ff_maybe_index_line). Backup would segfault.

F16 tightened to received == total_msgs. Catches both stuck-on-
entries[0] and cursor-jumping regressions.
This commit is contained in:
jabber.developer2
2026-05-04 15:09:51 +03:00
parent a7da9e2add
commit 875f8f4100
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/database_flatfile.c
View File

@@ -719,6 +719,12 @@ _flatfile_get_previous_chat(const gchar* const contact_barejid, const gchar* sta
return DB_RESPONSE_EMPTY;
if (state->total_lines == 0)
return DB_RESPONSE_EMPTY;
// n_entries can be 0 even when total_lines > 0 if every line in the
// file failed _ff_maybe_index_line (e.g. unparseable timestamps).
// Subsequent backup logic dereferences entries[0] unconditionally,
// which would segfault on a NULL entries array.
if (state->n_entries == 0)
return DB_RESPONSE_EMPTY;
// Reset cursor for filtered (non-Page-Up) queries
if (start_time)
@@ -728,16 +734,17 @@ _flatfile_get_previous_chat(const gchar* const contact_barejid, const gchar* sta
off_t read_from = state->bom_len;
off_t read_to = state->stamp.size;
// Use stored cursor for sequential Page Up (skip bisect).
// Guard: when cursor lands on entries[0].byte_offset, the !from_start
// backup below produces an empty [X, X) range; falling back to the
// end_time bisect avoids permanently sticking page-up at the top.
if (!start_time && end_time && state->cursor_offset >= 0
&& state->n_entries > 0
&& state->cursor_offset != state->entries[0].byte_offset) {
read_to = state->cursor_offset;
} else if (end_time) {
// Upper-bound: find first index entry AFTER end_time
// Upper-bound via bisect on end_time. The previous cursor-based
// shortcut (use last batch's oldest file_offset as read_to) was
// both buggy and unnecessary: cursor was set to the oldest line in
// the read window, but pagination dropped the older portion of that
// window before returning to the caller. The next page-up therefore
// started reading from a point much earlier than what the user had
// actually seen, "jumping" past entire ranges of messages. Bisect
// on the index is O(log n_entries) — for typical 200-entry indexes
// it's a handful of comparisons, well below the per-line parse
// cost — so we now run it unconditionally.
if (end_time) {
GDateTime* edt = g_date_time_new_from_iso8601(end_time, NULL);
if (edt) {
gint64 end_epoch = g_date_time_to_unix(edt);
@@ -750,8 +757,8 @@ _flatfile_get_previous_chat(const gchar* const contact_barejid, const gchar* sta
else
hi = mid;
}
// lo = first entry with timestamp > end_epoch
// Use next entry's offset as read_to (+ 1 entry margin)
// lo = first entry with timestamp > end_epoch.
// Use next entry's offset as read_to (+ 1 entry margin).
if (lo + 1 < state->n_entries)
read_to = state->entries[lo + 1].byte_offset;
// else read_to stays at EOF