Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disambiguate get_ex_outlier_stream_rows query

Browse Source 
A backwards-compatible piece of #14979 that's safe to land now.
This commit is contained in:
David Robertson 2023-02-07 15:33:33 +00:00
parent 9cd7610f86
commit f10caa73ee
No known key found for this signature in database
GPG Key ID: 903ECE108A39DEDD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1779,7 +1779,7 @@ class EventsWorkerStore(SQLBaseStore):
txn: LoggingTransaction, txn: LoggingTransaction,
) -> List[Tuple[int, str, str, str, str, str, str, str, bool, bool]]: ) -> List[Tuple[int, str, str, str, str, str, str, str, bool, bool]]:
sql = ( sql = (
"SELECT event_stream_ordering, e.event_id, e.room_id, e.type," "SELECT out.event_stream_ordering, e.event_id, e.room_id, e.type,"
" se.state_key, redacts, relates_to_id, membership, rejections.reason IS NOT NULL," " se.state_key, redacts, relates_to_id, membership, rejections.reason IS NOT NULL,"
" e.outlier" " e.outlier"
" FROM events AS e" " FROM events AS e"
@ -1791,10 +1791,10 @@ class EventsWorkerStore(SQLBaseStore):
" LEFT JOIN event_relations USING (event_id)" " LEFT JOIN event_relations USING (event_id)"
" LEFT JOIN room_memberships USING (event_id)" " LEFT JOIN room_memberships USING (event_id)"
" LEFT JOIN rejections USING (event_id)" " LEFT JOIN rejections USING (event_id)"
" WHERE ? < event_stream_ordering" " WHERE ? < out.event_stream_ordering"
" AND event_stream_ordering <= ?" " AND out.event_stream_ordering <= ?"
" AND out.instance_name = ?" " AND out.instance_name = ?"
" ORDER BY event_stream_ordering ASC" " ORDER BY out.event_stream_ordering ASC"
) )
txn.execute(sql, (last_id, current_id, instance_name)) txn.execute(sql, (last_id, current_id, instance_name))