diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-12 14:51:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-12 14:51:46 +0000 |
| commit | 6b186a57ba6fe22485d58e82ee0c28c9ecedbf24 (patch) | |
| tree | c57f25d34f957398ba8eea87ab0ae4c9f90367c9 | |
| parent | Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse (diff) | |
| parent | Get an auth query one at a time (diff) | |
| download | synapse-6b186a57ba6fe22485d58e82ee0c28c9ecedbf24.tar.xz | |
Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a
| -rw-r--r-- | synapse/storage/event_federation.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 0cbcdd1b55..3fbc090224 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -55,17 +55,16 @@ class EventFederationStore(SQLBaseStore): results = set() base_sql = ( - "SELECT auth_id FROM event_auth WHERE %s" + "SELECT auth_id FROM event_auth WHERE event_id = ?" ) front = set(event_ids) while front: - sql = base_sql % ( - " OR ".join(["event_id=?"] * len(front)), - ) - - txn.execute(sql, list(front)) - front = [r[0] for r in txn.fetchall()] + new_front = set() + for f in front: + txn.execute(base_sql, (f,)) + new_front.update([r[0] for r in txn.fetchall()]) + front = new_front results.update(front) return list(results) |