summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-05 15:30:25 +0100
committerErik Johnston <erik@matrix.org>2016-07-05 15:30:25 +0100
commit8f8798bc0d572af103274fc07d3adac67ce7f51a (patch)
tree8ae5294743633e37794b669350c0b46103d42059 /synapse/storage
parentAdd ReadWriteLock (diff)
downloadsynapse-8f8798bc0d572af103274fc07d3adac67ce7f51a.tar.xz
Add ReadWriteLock for pagination and history prune
Diffstat (limited to 'synapse/storage')
-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 b9ad965fd6..3dda2dab55 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -487,13 +487,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