From 76cc6629deb85ba93ef5c42732da48634f451820 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 10 Sep 2024 13:55:56 -0500 Subject: [PATCH] Use `events.stream_ordering` since `local_current_membership.event_stream_ordering` is nullable And seems to actually have `null` values in it --- synapse/storage/databases/main/events_bg_updates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/events_bg_updates.py b/synapse/storage/databases/main/events_bg_updates.py index ca73bea361..212241962c 100644 --- a/synapse/storage/databases/main/events_bg_updates.py +++ b/synapse/storage/databases/main/events_bg_updates.py @@ -1993,7 +1993,7 @@ class EventsBackgroundUpdatesStore(StreamWorkerStore, StateDeltasStore, SQLBaseS INNER JOIN events AS e USING (event_id) LEFT JOIN rooms AS r ON (c.room_id = r.room_id) WHERE (c.room_id, c.user_id) > (?, ?) - ORDER BY c.room_id ASC, c.event_stream_ordering ASC, c.user_id ASC + ORDER BY c.room_id ASC, c.stream_ordering ASC, c.user_id ASC LIMIT ? """, (last_room_id, last_user_id, batch_size),