mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-23 18:15:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

actually exclude outliers

Browse source
This commit is contained in:
Richard van der Hoff 2018-10-03 10:19:41 +01:00
parent 2a4ea3baa8
commit 9693625e55
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/events.py
View file

@ -560,7 +560,7 @@ class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_events_which_are_prevs(self, event_ids): def _get_events_which_are_prevs(self, event_ids):
"""Filter the supplied list of event_ids to get those which are prev_events of """Filter the supplied list of event_ids to get those which are prev_events of
existing (non-outlier) events. existing (non-outlier/rejected) events.
Args: Args:
event_ids (Iterable[str]): event ids to filter event_ids (Iterable[str]): event ids to filter
@ -578,6 +578,7 @@ class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore
LEFT JOIN rejections USING (event_id) LEFT JOIN rejections USING (event_id)
WHERE WHERE
prev_event_id IN (%s) prev_event_id IN (%s)
AND NOT events.outlier
AND rejections.event_id IS NULL AND rejections.event_id IS NULL
""" % ( """ % (
",".join("?" for _ in batch), ",".join("?" for _ in batch),