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

Fix pagination to work with new db schema

Browse source
This commit is contained in:
Erik Johnston 2014-08-15 15:53:06 +01:00
parent 01f089d9fb
commit 8d1f763209
2 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
synapse/storage/stream.py
View file

@ -53,18 +53,35 @@ class StreamStore(SQLBaseStore):
else:
limit = 1000
# From and to keys should be integers from ordering.
from_key = int(from_key)
to_key = int(to_key)
if from_key == to_key:
defer.returnValue(([], to_key))
return
sql = (
"SELECT * FROM events as e WHERE "
"((room_id IN (%(current)s)) OR "
"(event_id IN (%(invites)s))) "
" AND e.ordering > ? AND e.ordering < ? "
"ORDER BY ordering ASC LIMIT %(limit)d"
) % {
"current": current_room_membership_sql,
"invites": invites_sql,
"limit": limit,
}
if from_key < to_key:
sql += (
"AND e.ordering > ? AND e.ordering < ? "
"ORDER BY ordering ASC LIMIT %(limit)d "
) % {"limit": limit}
else:
sql += (
"AND e.ordering < ? AND e.ordering > ? "
"ORDER BY ordering DESC LIMIT %(limit)d "
) % {"limit": int(limit)}
rows = yield self._execute_and_decode(
sql,
user_id, user_id, Membership.INVITE, from_key, to_key
@ -72,12 +89,12 @@ class StreamStore(SQLBaseStore):
ret = [self._parse_event_from_row(r) for r in rows]
if ret:
max_id = max([r["ordering"] for r in rows])
if from_key < to_key:
key = max([r["ordering"] for r in rows])
else:
max_id = to_key
key = min([r["ordering"] for r in rows])
defer.returnValue((ret, max_id))
defer.returnValue((ret, key))
@defer.inlineCallbacks
def get_recent_events_for_room(self, room_id, limit, with_feedback=False):