diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-09 15:31:33 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-09 15:31:33 +0100 |
commit | 9896dab8f6cbdf1cdac4549e20e4ed0ba17d5655 (patch) | |
tree | e288da53414d96fc48ea02e38aa33a4b449c31da /synapse/storage/stream.py | |
parent | Refactor get_recent_events_for_room return type (diff) | |
parent | Merge pull request #3196 from matrix-org/erikj/pagination_return (diff) | |
download | synapse-9896dab8f6cbdf1cdac4549e20e4ed0ba17d5655.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_return_pagination
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r-- | synapse/storage/stream.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index b5baacd32c..f529642101 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -399,7 +399,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): Returns: Deferred[tuple[list[_EventDictReturn], str]]: Returns a list of - _EventDictReturn and a token pointint to the start of the returned + _EventDictReturn and a token pointing to the start of the returned events. The events returned are in ascending order. """ @@ -528,7 +528,8 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): events (list[FrozenEvent]) rows (list[_EventDictReturn]) topo_order (bool): Whether the events were ordered topologically - or by stream ordering + or by stream ordering. If true then all rows should have a non + null topological_ordering. """ for event, row in zip(events, rows): stream = row.stream_ordering @@ -706,9 +707,9 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): those that match the filter. Returns: - tuple[list[_EventDictReturn], str]: Returns the results as a list - of _EventDictReturn and a token that points to the end of the - result set. + Deferred[tuple[list[_EventDictReturn], str]]: Returns the results + as a list of _EventDictReturn and a token that points to the end + of the result set. """ # Tokens really represent positions between elements, but we use # the convention of pointing to the event before the gap. Hence |