diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-30 15:20:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 15:20:09 +0100 |
| commit | 62a2d60d7206cd99c38a26f113dc2a2030a5c6b2 (patch) | |
| tree | 6b4841c77f50603375cc63538fc76e6ca30469a8 | |
| parent | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keys (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-62a2d60d7206cd99c38a26f113dc2a2030a5c6b2.tar.xz | |
Merge pull request #5792 from matrix-org/erikj/fix_bg_update
Fix current_state_events membership background update.
| -rw-r--r-- | changelog.d/5792.misc | 1 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 2 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql (renamed from synapse/storage/schema/delta/56/current_state_events_membership.sql) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/5792.misc b/changelog.d/5792.misc new file mode 100644 index 0000000000..5e15dfd5fa --- /dev/null +++ b/changelog.d/5792.misc @@ -0,0 +1 @@ +Reduce database IO usage by optimising queries for current membership. diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index e60409ed73..eecb276465 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -935,7 +935,7 @@ class RoomMemberStore(RoomMemberWorkerStore): while processed < batch_size: txn.execute( """ - SELECT MIN(room_id) FROM rooms WHERE room_id > ? + SELECT MIN(room_id) FROM current_state_events WHERE room_id > ? """, (last_processed_room,), ) diff --git a/synapse/storage/schema/delta/56/current_state_events_membership.sql b/synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql index b2e08cd85d..b2e08cd85d 100644 --- a/synapse/storage/schema/delta/56/current_state_events_membership.sql +++ b/synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql |