diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
| commit | 89c044c2a0727c73cce4e6bff9a25a87da6f52bd (patch) | |
| tree | 22d342f5beae7218c4f3664db8a888ddbafc4dab /synapse/storage/stream.py | |
| parent | api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe... (diff) | |
| parent | Turn off presence again. (diff) | |
| download | synapse-89c044c2a0727c73cce4e6bff9a25a87da6f52bd.tar.xz | |
Merge branch 'stream_refactor' into develop
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index cae80563b4..6a22d5aead 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -174,7 +174,7 @@ class StreamStore(SQLBaseStore): "SELECT * FROM events as e WHERE " "((room_id IN (%(current)s)) OR " "(event_id IN (%(invites)s))) " - "AND e.stream_ordering > ? AND e.stream_ordering < ? " + "AND e.stream_ordering > ? AND e.stream_ordering <= ? " "AND e.outlier = 0 " "ORDER BY stream_ordering ASC LIMIT %(limit)d " ) % { @@ -293,5 +293,5 @@ class StreamStore(SQLBaseStore): defer.returnValue("s1") return - key = res[0]["m"] + 1 + key = res[0]["m"] defer.returnValue("s%d" % (key,)) |