Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore topological for receipts

This commit is contained in:
Erik Johnston 2018-05-25 13:54:25 +01:00
parent 3e927f85df
commit 66450785d8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/storage/receipts.py
View File

@ -369,7 +369,7 @@ class ReceiptsStore(ReceiptsWorkerStore):
# We don't want to clobber receipts for more recent events, so we # We don't want to clobber receipts for more recent events, so we
# have to compare orderings of existing receipts # have to compare orderings of existing receipts
sql = ( sql = (
"SELECT topological_ordering, stream_ordering, event_id FROM events" "SELECT stream_ordering FROM events"
" INNER JOIN receipts_linearized as r USING (event_id, room_id)" " INNER JOIN receipts_linearized as r USING (event_id, room_id)"
" WHERE r.room_id = ? AND r.receipt_type = ? AND r.user_id = ?" " WHERE r.room_id = ? AND r.receipt_type = ? AND r.user_id = ?"
) )
@ -377,10 +377,8 @@ class ReceiptsStore(ReceiptsWorkerStore):
txn.execute(sql, (room_id, receipt_type, user_id)) txn.execute(sql, (room_id, receipt_type, user_id))
if topological_ordering: if topological_ordering:
for to, so, _ in txn: for so, in txn:
if int(to) > topological_ordering: if int(so) >= stream_ordering:
return False
elif int(to) == topological_ordering and int(so) >= stream_ordering:
return False return False
self._simple_delete_txn( self._simple_delete_txn(