Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add two different columns for ordering the events table, one which can be used for pagination and one which can be as tokens for notifying clients. Also add a 'processed' field which is currently always set to True

Browse source
This commit is contained in:
Erik Johnston 2014-08-18 15:50:41 +01:00
parent 1c2caacd67
commit fc26275bb3
4 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
synapse/storage/stream.py
View file

@ -73,13 +73,14 @@ class StreamStore(SQLBaseStore):
# Constraints and ordering depend on direction.
if from_key < to_key:
sql += (
"AND e.ordering > ? AND e.ordering < ? "
"ORDER BY ordering ASC LIMIT %(limit)d "
"AND e.token_ordering > ? AND e.token_ordering < ? "
"ORDER BY token_ordering, rowid ASC LIMIT %(limit)d "
) % {"limit": limit}
else:
sql += (
"AND e.ordering < ? AND e.ordering > ? "
"ORDER BY ordering DESC LIMIT %(limit)d "
"AND e.token_ordering < ? "
"AND e.token_ordering > ? "
"ORDER BY e.token_ordering, rowid DESC LIMIT %(limit)d "
) % {"limit": int(limit)}
rows = yield self._execute_and_decode(
@ -91,9 +92,9 @@ class StreamStore(SQLBaseStore):
if rows:
if from_key < to_key:
key = max([r["ordering"] for r in rows])
key = max([r["token_ordering"] for r in rows])
else:
key = min([r["ordering"] for r in rows])
key = min([r["token_ordering"] for r in rows])
else:
key = to_key
@ -105,7 +106,7 @@ class StreamStore(SQLBaseStore):
sql = (
"SELECT * FROM events WHERE room_id = ? "
"ORDER BY ordering DESC LIMIT ? "
"ORDER BY token_ordering, rowid DESC LIMIT ? "
)
rows = yield self._execute_and_decode(
@ -120,7 +121,7 @@ class StreamStore(SQLBaseStore):
@defer.inlineCallbacks
def get_room_events_max_id(self):
res = yield self._execute_and_decode(
"SELECT MAX(ordering) as m FROM events"
"SELECT MAX(token_ordering) as m FROM events"
)
if not res: