Skip to content
Snippets Groups Projects
Commit 9693625e authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files

actually exclude outliers

parent 2a4ea3ba
No related branches found
No related tags found
No related merge requests found
...@@ -560,7 +560,7 @@ class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore ...@@ -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 ...@@ -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),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment