From b999adcaa21f1d51b87e2198d9f5f4c98d027f90 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 18 May 2016 11:28:26 +0100 Subject: Filter before ordering --- synapse/storage/stream.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'synapse/storage/stream.py') diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 60a8384fae..51f8b9e017 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -533,7 +533,7 @@ class StreamStore(SQLBaseStore): stream_ordering = RoomStreamToken.parse_stream_token(token).stream sql = ( - "SELECT origin_server_ts FROM events" + "SELECT event_id, origin_server_ts FROM events" " WHERE room_id = ? AND stream_ordering <= ?" " ORDER BY topological_ordering DESC, stream_ordering DESC" " LIMIT 1" @@ -541,9 +541,9 @@ class StreamStore(SQLBaseStore): def f(txn): txn.execute(sql, (room_id, stream_ordering)) - rows = txn.fetchall() + rows = self.cursor_to_dict(txn) if rows: - return rows[0][0] + return rows[0] else: return None -- cgit 1.5.1