diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 16:41:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 16:41:36 +0100 |
| commit | 83d86106a8637dc1d9ffd44840c057b10aa87287 (patch) | |
| tree | bc62be567a509f6a273b4f3ded979065ca8e5cbb /synapse/storage/events_bg_updates.py | |
| parent | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes (diff) | |
| parent | Fix SQLite take 2 (diff) | |
| download | synapse-83d86106a8637dc1d9ffd44840c057b10aa87287.tar.xz | |
Merge pull request #6156 from matrix-org/erikj/postgres_any
Use Postgres ANY for selecting many values.
Diffstat (limited to 'synapse/storage/events_bg_updates.py')
| -rw-r--r-- | synapse/storage/events_bg_updates.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/storage/events_bg_updates.py b/synapse/storage/events_bg_updates.py index e77a7e28af..31ea6f917f 100644 --- a/synapse/storage/events_bg_updates.py +++ b/synapse/storage/events_bg_updates.py @@ -21,6 +21,7 @@ from canonicaljson import json from twisted.internet import defer +from synapse.storage._base import make_in_list_sql_clause from synapse.storage.background_updates import BackgroundUpdateStore logger = logging.getLogger(__name__) @@ -325,12 +326,13 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore): INNER JOIN event_json USING (event_id) LEFT JOIN rejections USING (event_id) WHERE - prev_event_id IN (%s) - AND NOT events.outlier - """ % ( - ",".join("?" for _ in to_check), + NOT events.outlier + AND + """ + clause, args = make_in_list_sql_clause( + self.database_engine, "prev_event_id", to_check ) - txn.execute(sql, to_check) + txn.execute(sql + clause, list(args)) for prev_event_id, event_id, metadata, rejected in txn: if event_id in graph: |