mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove Generator in store_search_entries_txn (#17817)

Browse source 
Context: https://github.com/matrix-org/synapse/issues/15439
(https://github.com/element-hq/synapse/issues/15439)

Also see discussion in https://github.com/element-hq/synapse/pull/17813
This commit is contained in:
Jason Little 2024-10-30 20:15:57 -05:00 committed by GitHub
parent af59a99933
commit 2e5fe3f187
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/17817.bugfix Normal file
View file

@ -0,0 +1 @@
Avoid lost data on some database query retries.

4
synapse/storage/databases/main/search.py
View file

@ -94,7 +94,7 @@ class SearchWorkerStore(SQLBaseStore):
VALUES (?,?,?,to_tsvector('english', ?),?,?) VALUES (?,?,?,to_tsvector('english', ?),?,?)
""" """
args1 = ( args1 = [
( (
entry.event_id, entry.event_id,
entry.room_id, entry.room_id,
@ -104,7 +104,7 @@ class SearchWorkerStore(SQLBaseStore):
entry.origin_server_ts, entry.origin_server_ts,
) )
for entry in entries for entry in entries
) ]
txn.execute_batch(sql, args1) txn.execute_batch(sql, args1)