tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Return correct type of token

Browse source
This commit is contained in:
Erik Johnston 2016-01-28 11:34:17 +00:00
parent 61eaa6ec64
commit ba8931829b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/storage/stream.py
View file

@ -236,7 +236,7 @@ class StreamStore(SQLBaseStore):
ret.reverse() ret.reverse()
self._set_before_and_after(ret, rows) self._set_before_and_after(ret, rows, topo_order=False)
if rows: if rows:
key = "s%d" % min(r["stream_ordering"] for r in rows) key = "s%d" % min(r["stream_ordering"] for r in rows)
@ -581,10 +581,13 @@ class StreamStore(SQLBaseStore):
return rows[0][0] if rows else 0 return rows[0][0] if rows else 0
@staticmethod @staticmethod
def _set_before_and_after(events, rows): def _set_before_and_after(events, rows, topo_order=True):
for event, row in zip(events, rows): for event, row in zip(events, rows):
stream = row["stream_ordering"] stream = row["stream_ordering"]
topo = event.depth if topo_order:
topo = event.depth
else:
topo = None
internal = event.internal_metadata internal = event.internal_metadata
internal.before = str(RoomStreamToken(topo, stream - 1)) internal.before = str(RoomStreamToken(topo, stream - 1))
internal.after = str(RoomStreamToken(topo, stream)) internal.after = str(RoomStreamToken(topo, stream))