diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-05 14:41:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-05 14:41:07 +0100 |
| commit | e779ee0ee21584b8907b866734376a737a8b6d2e (patch) | |
| tree | cc27f059a354379346f9a21ff6b8b661a9407b65 /synapse/storage/event_federation.py | |
| parent | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-e779ee0ee21584b8907b866734376a737a8b6d2e.tar.xz | |
Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1
Diffstat (limited to 'synapse/storage/event_federation.py')
| -rw-r--r-- | synapse/storage/event_federation.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 3d62451de9..53feaa1960 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -398,12 +398,11 @@ class EventFederationStore(SQLBaseStore): sql = (""" DELETE FROM stream_ordering_to_exterm WHERE - ( - SELECT max(stream_ordering) AS stream_ordering + room_id IN ( + SELECT room_id FROM stream_ordering_to_exterm - WHERE room_id = stream_ordering_to_exterm.room_id - ) > ? - AND stream_ordering < ? + WHERE stream_ordering > ? + ) AND stream_ordering < ? """) txn.execute( sql, |