diff options
| author | Erik Johnston <erik@matrix.org> | 2024-07-11 15:41:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2024-07-11 15:41:46 +0100 |
| commit | 0785fa77c6450550aa9ca71f3d5b69c96b963dc4 (patch) | |
| tree | fae4b43e4a6ce482fee732a62179f2aed46411b7 | |
| parent | Merge branch 'erikj/ss_sort' into erikj/ss_hacks (diff) | |
| parent | Faster sliding sync sorting (diff) | |
| download | synapse-0785fa77c6450550aa9ca71f3d5b69c96b963dc4.tar.xz | |
Merge branch 'erikj/ss_sort' into erikj/ss_hacks
| -rw-r--r-- | synapse/handlers/sliding_sync.py | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/stream.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py index 9ecef16dad..7ca88b86ee 100644 --- a/synapse/handlers/sliding_sync.py +++ b/synapse/handlers/sliding_sync.py @@ -27,7 +27,6 @@ from immutabledict import immutabledict from synapse.api.constants import ( AccountDataTypes, Direction, - EventContentFields, EventTypes, Membership, ) diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py index e552b7d85f..d3e4340d4c 100644 --- a/synapse/storage/databases/main/stream.py +++ b/synapse/storage/databases/main/stream.py @@ -88,7 +88,6 @@ from synapse.types import ( from synapse.util.caches.descriptors import cached, cachedList from synapse.util.caches.stream_change_cache import StreamChangeCache from synapse.util.cancellation import cancellable -from synapse.util.iterutils import batch_iter if TYPE_CHECKING: from synapse.server import HomeServer @@ -2095,7 +2094,10 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): table="sliding_sync_room_metadata", key_names=("room_id",), key_values=[(room_id,) for room_id, _, _ in rows], - value_names=("last_stream_ordering",), + value_names=( + "instance_name", + "last_stream_ordering", + ), value_values=[ ( instance_name or "master", |