Remove other bit of deduplication
This commit is contained in:
parent
a8a32d2714
commit
80ad710217
|
@ -450,8 +450,6 @@ class EventsStore(SQLBaseStore):
|
||||||
for event_id, outlier in txn.fetchall()
|
for event_id, outlier in txn.fetchall()
|
||||||
}
|
}
|
||||||
|
|
||||||
# Remove the events that we've seen before.
|
|
||||||
event_map = {}
|
|
||||||
to_remove = set()
|
to_remove = set()
|
||||||
for event, context in events_and_contexts:
|
for event, context in events_and_contexts:
|
||||||
if context.rejected:
|
if context.rejected:
|
||||||
|
@ -462,23 +460,6 @@ class EventsStore(SQLBaseStore):
|
||||||
to_remove.add(event)
|
to_remove.add(event)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Handle the case of the list including the same event multiple
|
|
||||||
# times. The tricky thing here is when they differ by whether
|
|
||||||
# they are an outlier.
|
|
||||||
if event.event_id in event_map:
|
|
||||||
other = event_map[event.event_id]
|
|
||||||
|
|
||||||
if not other.internal_metadata.is_outlier():
|
|
||||||
to_remove.add(event)
|
|
||||||
continue
|
|
||||||
elif not event.internal_metadata.is_outlier():
|
|
||||||
to_remove.add(event)
|
|
||||||
continue
|
|
||||||
else:
|
|
||||||
to_remove.add(other)
|
|
||||||
|
|
||||||
event_map[event.event_id] = event
|
|
||||||
|
|
||||||
if event.event_id not in have_persisted:
|
if event.event_id not in have_persisted:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue