summary refs log tree commit diff
path: root/synapse/storage/stream.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-07-07 13:34:28 +0100
committerGitHub <noreply@github.com>2016-07-07 13:34:28 +0100
commit70d650be2b9c7a46ade43ef6ff3f6d07a7f36cc9 (patch)
tree9c46c887f687a01f44ccae03be3fea75c079ea85 /synapse/storage/stream.py
parentMerge pull request #909 from matrix-org/erikj/shared_secret (diff)
parentComment (diff)
downloadsynapse-70d650be2b9c7a46ade43ef6ff3f6d07a7f36cc9.tar.xz
Merge pull request #911 from matrix-org/erikj/purge_history
Feature: Purge local room history.
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r--synapse/storage/stream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index c08c5b9979..c33ac5a8d7 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -510,13 +510,13 @@ class StreamStore(SQLBaseStore):
             row["topological_ordering"], row["stream_ordering"],)
         )
 
-    def get_max_topological_token_for_stream_and_room(self, room_id, stream_key):
+    def get_max_topological_token(self, room_id, stream_key):
         sql = (
             "SELECT max(topological_ordering) FROM events"
             " WHERE room_id = ? AND stream_ordering < ?"
         )
         return self._execute(
-            "get_max_topological_token_for_stream_and_room", None,
+            "get_max_topological_token", None,
             sql, room_id, stream_key,
         ).addCallback(
             lambda r: r[0][0] if r else 0