2 files changed, 7 insertions, 7 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 9e10235fa0..e5dd2e245f 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -280,7 +280,7 @@ class MessageHandler(BaseHandler):
"end": token[1],
}
except:
- pass
+ logger.exception("Failed to get snapshot")
logger.debug("snapshot_all_rooms returning: %s", ret)
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 6728a4b5ea..c03c983e14 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -74,13 +74,13 @@ class StreamStore(SQLBaseStore):
if from_key < to_key:
sql += (
"AND e.token_ordering > ? AND e.token_ordering < ? "
- "ORDER BY token_ordering, rowid ASC LIMIT %(limit)d "
+ "ORDER BY token_ordering ASC LIMIT %(limit)d "
) % {"limit": limit}
else:
sql += (
"AND e.token_ordering < ? "
"AND e.token_ordering > ? "
- "ORDER BY e.token_ordering, rowid DESC LIMIT %(limit)d "
+ "ORDER BY e.token_ordering DESC LIMIT %(limit)d "
) % {"limit": int(limit)}
rows = yield self._execute_and_decode(
@@ -107,9 +107,9 @@ class StreamStore(SQLBaseStore):
end_token = yield self.get_room_events_max_id()
sql = (
- "SELECT * FROM events WHERE "
+ "SELECT * FROM events "
"WHERE room_id = ? AND token_ordering <= ? "
- "ORDER BY topological_ordering, rowid DESC LIMIT ? "
+ "ORDER BY topological_ordering, token_ordering DESC LIMIT ? "
)
rows = yield self._execute_and_decode(
@@ -121,8 +121,8 @@ class StreamStore(SQLBaseStore):
if rows:
topo = rows[0]["topological_ordering"]
- row_id = rows[0]["rowid"]
- start_token = "p%s-%s" % (topo, row_id)
+ toke = rows[0]["token_ordering"]
+ start_token = "p%s-%s" % (topo, toke)
token = (start_token, end_token)
else:
|
