Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-17 17:44:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Give the correct next event when the message timestamps are the same - MSC3030 (#13658)

Browse Source 
Discovered while working on https://github.com/matrix-org/synapse/pull/13589 and I had all the messages at the same timestamp in the tests.

Part of https://github.com/matrix-org/matrix-spec-proposals/pull/3030

Complement tests: https://github.com/matrix-org/complement/pull/457
This commit is contained in:
Eric Eastwood 2022-08-30 14:50:06 -05:00 committed by GitHub
parent 20c76cecb9
commit 92c5817e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13658.bugfix Normal file
View File

@ -0,0 +1 @@
Fix MSC3030 `/timestamp_to_event` endpoint to return the correct next event when the events have the same timestamp.

12
synapse/storage/databases/main/events_worker.py
View File

@ -2111,7 +2111,14 @@ class EventsWorkerStore(SQLBaseStore):
AND room_id = ? AND room_id = ?
/* Make sure event is not rejected */ /* Make sure event is not rejected */
AND rejections.event_id IS NULL AND rejections.event_id IS NULL
ORDER BY origin_server_ts %s /**
* First sort by the message timestamp. If the message timestamps are the
* same, we want the message that logically comes "next" (before/after
* the given timestamp) based on the DAG and its topological order (`depth`).
* Finally, we can tie-break based on when it was received on the server
* (`stream_ordering`).
*/
ORDER BY origin_server_ts %s, depth %s, stream_ordering %s
LIMIT 1; LIMIT 1;
""" """
@ -2130,7 +2137,8 @@ class EventsWorkerStore(SQLBaseStore):
order = "ASC" order = "ASC"
txn.execute( txn.execute(
sql_template % (comparison_operator, order), (timestamp, room_id) sql_template % (comparison_operator, order, order, order),
(timestamp, room_id),
) )
row = txn.fetchone() row = txn.fetchone()
if row: if row: