diff options
author | Erik Johnston <erikj@jki.re> | 2018-05-22 18:29:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-22 18:29:36 +0100 |
commit | 35ca3e7b65a1522499c92ff554a357b4a97b6eb2 (patch) | |
tree | 97845a06866abe2012feb2fe3f0b7a3d10573a4b /synapse/storage/stream.py | |
parent | fix synchrotron (diff) | |
parent | Remove unused string formatting param (diff) | |
download | synapse-35ca3e7b65a1522499c92ff554a357b4a97b6eb2.tar.xz |
Merge pull request #3265 from matrix-org/erikj/limit_pagination
Don't support limitless pagination
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r-- | synapse/storage/stream.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index ea24710ad8..fb463c525a 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -684,8 +684,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): results to only those before direction(char): Either 'b' or 'f' to indicate whether we are paginating forwards or backwards from `from_key`. - limit (int): The maximum number of events to return. Zero or less - means no limit. + limit (int): The maximum number of events to return. event_filter (Filter|None): If provided filters the events to those that match the filter. @@ -694,6 +693,9 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): as a list of _EventDictReturn and a token that points to the end of the result set. """ + + assert int(limit) >= 0 + # Tokens really represent positions between elements, but we use # the convention of pointing to the event before the gap. Hence # we have a bit of asymmetry when it comes to equalities. @@ -723,22 +725,17 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): bounds += " AND " + filter_clause args.extend(filter_args) - if int(limit) > 0: - args.append(int(limit)) - limit_str = " LIMIT ?" - else: - limit_str = "" + args.append(int(limit)) sql = ( "SELECT event_id, topological_ordering, stream_ordering" " FROM events" " WHERE outlier = ? AND room_id = ? AND %(bounds)s" " ORDER BY topological_ordering %(order)s," - " stream_ordering %(order)s %(limit)s" + " stream_ordering %(order)s LIMIT ?" ) % { "bounds": bounds, "order": order, - "limit": limit_str } txn.execute(sql, args) |