diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-02-07 17:27:08 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-02-09 13:07:41 +0000 |
commit | 671540dccf3996620ffe65705904fb911e21fb68 (patch) | |
tree | 14ce8ff67f8418c93914b52af739bfda3ba1f7ad | |
parent | Better logging when pushes fail (diff) | |
download | synapse-671540dccf3996620ffe65705904fb911e21fb68.tar.xz |
rename delete_old_state -> purge_history
(beacause it deletes more than state)
-rw-r--r-- | synapse/handlers/message.py | 2 | ||||
-rw-r--r-- | synapse/storage/events.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 21f1717dd2..1c7860bb05 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -72,7 +72,7 @@ class MessageHandler(BaseHandler): depth = event.depth with (yield self.pagination_lock.write(room_id)): - yield self.store.delete_old_state(room_id, depth) + yield self.store.purge_history(room_id, depth) @defer.inlineCallbacks def get_messages(self, requester, room_id=None, pagin_config=None, diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 7a9cd3ec90..21533970d1 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -2031,16 +2031,16 @@ class EventsStore(SQLBaseStore): ) return self.runInteraction("get_all_new_events", get_all_new_events_txn) - def delete_old_state(self, room_id, topological_ordering): + def purge_history(self, room_id, topological_ordering): + """Deletes room history before a certain point + """ + return self.runInteraction( - "delete_old_state", - self._delete_old_state_txn, room_id, topological_ordering + "purge_history", + self._purge_history_txn, room_id, topological_ordering ) - def _delete_old_state_txn(self, txn, room_id, topological_ordering): - """Deletes old room state - """ - + def _purge_history_txn(self, txn, room_id, topological_ordering): # Tables that should be pruned: # event_auth # event_backward_extremities |