summary refs log tree commit diff
path: root/synapse/storage/purge_events.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-04 13:36:57 +0000
committerErik Johnston <erik@matrix.org>2019-11-04 13:36:57 +0000
commit7134ca7daa7ead8104e3c51ba4bc730d99d098e3 (patch)
tree6123a8d0f6887229689813d9e5441def7391fa6c /synapse/storage/purge_events.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg... (diff)
downloadsynapse-7134ca7daa7ead8104e3c51ba4bc730d99d098e3.tar.xz
Change to not require a state_groups.room_id index.
This does mean that we won't clean up orphaned state groups (i.e. state
groups that were persisted but the associated event wasn't).
Diffstat (limited to 'synapse/storage/purge_events.py')
-rw-r--r--synapse/storage/purge_events.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/purge_events.py b/synapse/storage/purge_events.py
index dd45df0c88..a368182034 100644
--- a/synapse/storage/purge_events.py
+++ b/synapse/storage/purge_events.py
@@ -33,8 +33,8 @@ class PurgeEventsStorage(object):
         """Deletes all record of a room
         """
 
-        yield self.stores.main.purge_room(room_id)
-        yield self.stores.main.purge_room_state(room_id)
+        state_groups_to_delete = yield self.stores.main.purge_room(room_id)
+        yield self.stores.main.purge_room_state(room_id, state_groups_to_delete)
 
     @defer.inlineCallbacks
     def purge_history(self, room_id, token, delete_local_events):