MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 10:33:49 +01:00
Code Issues Projects Releases Wiki Activity

Don't always lock "user_ips" table when performing non-native upsert (#15788)

Browse source
This commit is contained in:
Andrew Morgan 2023-06-16 15:25:44 +01:00 committed by GitHub
parent 0618bf94cd
commit 2ac6c3bbb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix a bug introduced in 1.57.0 where the wrong table would be locked on updating database rows when using SQLite as the database backend.

2
synapse/storage/database.py
View file

@ -1529,7 +1529,7 @@ class DatabasePool:
# Lock the table just once, to prevent it being done once per row. # Lock the table just once, to prevent it being done once per row.
# Note that, according to Postgres' documentation, once obtained, # Note that, according to Postgres' documentation, once obtained,
# the lock is held for the remainder of the current transaction. # the lock is held for the remainder of the current transaction.
self.engine.lock_table(txn, "user_ips") self.engine.lock_table(txn, table)
for keyv, valv in zip(key_values, value_values): for keyv, valv in zip(key_values, value_values):
_keys = dict(zip(key_names, keyv)) _keys = dict(zip(key_names, keyv))