diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:09:54 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:09:54 +0100 |
| commit | 36317f3dad7bec8a601f0eeac5f499b0f13f0523 (patch) | |
| tree | d161e029d6d5da40c3cf7fd1d6dbd8f3163af6a1 /synapse/storage | |
| parent | Merge pull request #159 from matrix-org/erikj/metrics_interface_config (diff) | |
| parent | Add doc strings (diff) | |
| download | synapse-36317f3dad7bec8a601f0eeac5f499b0f13f0523.tar.xz | |
Merge pull request #156 from matrix-org/erikj/join_perf
Make joining #matrix:matrix.org over federation quicker
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/event_federation.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 23573e8b2b..114ccece65 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -330,12 +330,13 @@ class EventFederationStore(SQLBaseStore): " WHERE event_id = ? AND room_id = ?" " )" " AND NOT EXISTS (" - " SELECT 1 FROM events WHERE event_id = ? AND room_id = ?" + " SELECT 1 FROM events WHERE event_id = ? AND room_id = ? " + " AND outlier = ?" " )" ) txn.executemany(query, [ - (e_id, room_id, e_id, room_id, e_id, room_id, ) + (e_id, room_id, e_id, room_id, e_id, room_id, False) for e_id, _ in prev_events ]) |