Fix background update for sliding sync (find previous membership) (#1…

…7632) This reverts commit ab414f2. Introduced in #17512
element-hq · Aug 29, 2024 · d844afd · d844afd
1 parent bb80894
commit d844afd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/changelog.d/17632.misc b/changelog.d/17632.misc
@@ -0,0 +1 @@
+Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting.
diff --git a/synapse/storage/databases/main/events_bg_updates.py b/synapse/storage/databases/main/events_bg_updates.py
@@ -1967,12 +1967,13 @@ def _find_previous_membership_txn(
             txn.execute(
                 """
                 SELECT event_id, membership
-                FROM room_memberships
+                FROM room_memberships AS m
+                INNER JOIN events AS e USING (room_id, event_id)
                 WHERE
                     room_id = ?
-                    AND user_id = ?
-                    AND event_stream_ordering < ?
-                ORDER BY event_stream_ordering DESC
+                    AND m.user_id = ?
+                    AND e.stream_ordering < ?
+                ORDER BY e.stream_ordering DESC
                 LIMIT 1
                 """,
                 (