OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix typos in SQL and where we still had rowid's (which no longer exist)

paul/schema_breaking_changes
Erik Johnston 2014-08-18 16:25:18 +01:00
parent 4eb8f84aa8
commit 1422a22970
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/room.py
View File

@ -280,7 +280,7 @@ class MessageHandler(BaseHandler):
"end": token[1], "end": token[1],
} }
except: except:
pass logger.exception("Failed to get snapshot")
logger.debug("snapshot_all_rooms returning: %s", ret) logger.debug("snapshot_all_rooms returning: %s", ret)

12
synapse/storage/stream.py
View File

@ -74,13 +74,13 @@ class StreamStore(SQLBaseStore):
if from_key < to_key: if from_key < to_key:
sql += ( sql += (
"AND e.token_ordering > ? AND e.token_ordering < ? " "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} ) % {"limit": limit}
else: else:
sql += ( sql += (
"AND e.token_ordering < ? " "AND e.token_ordering < ? "
"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)} ) % {"limit": int(limit)}
rows = yield self._execute_and_decode( rows = yield self._execute_and_decode(
@ -107,9 +107,9 @@ class StreamStore(SQLBaseStore):
end_token = yield self.get_room_events_max_id() end_token = yield self.get_room_events_max_id()
sql = ( sql = (
"SELECT * FROM events WHERE " "SELECT * FROM events "
"WHERE room_id = ? AND token_ordering <= ? " "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( rows = yield self._execute_and_decode(
@ -121,8 +121,8 @@ class StreamStore(SQLBaseStore):
if rows: if rows:
topo = rows[0]["topological_ordering"] topo = rows[0]["topological_ordering"]
row_id = rows[0]["rowid"] toke = rows[0]["token_ordering"]
start_token = "p%s-%s" % (topo, row_id) start_token = "p%s-%s" % (topo, toke)
token = (start_token, end_token) token = (start_token, end_token)
else: else: