Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-22 04:34:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1892 from matrix-org/erikj/rejection_fwd_extrem

Browse Source 
Ignore new rejected events when working out forward extremities.
This commit is contained in:
Erik Johnston 2017-02-08 16:59:06 +01:00 committed by GitHub
commit f20cd34858
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/storage/events.py
View File

@ -302,7 +302,7 @@ class EventsStore(SQLBaseStore):
room_id room_id
) )
new_latest_event_ids = yield self._calculate_new_extremeties( new_latest_event_ids = yield self._calculate_new_extremeties(
room_id, [ev for ev, _ in ev_ctx_rm] room_id, ev_ctx_rm, latest_event_ids
) )
if new_latest_event_ids == set(latest_event_ids): if new_latest_event_ids == set(latest_event_ids):
@ -329,27 +329,24 @@ class EventsStore(SQLBaseStore):
persist_event_counter.inc_by(len(chunk)) persist_event_counter.inc_by(len(chunk))
@defer.inlineCallbacks @defer.inlineCallbacks
def _calculate_new_extremeties(self, room_id, events): def _calculate_new_extremeties(self, room_id, event_contexts, latest_event_ids):
"""Calculates the new forward extremeties for a room given events to """Calculates the new forward extremeties for a room given events to
persist. persist.
Assumes that we are only persisting events for one room at a time. Assumes that we are only persisting events for one room at a time.
""" """
latest_event_ids = yield self.get_latest_event_ids_in_room(
room_id
)
new_latest_event_ids = set(latest_event_ids) new_latest_event_ids = set(latest_event_ids)
# First, add all the new events to the list # First, add all the new events to the list
new_latest_event_ids.update( new_latest_event_ids.update(
event.event_id for event in events event.event_id for event, ctx in event_contexts
if not event.internal_metadata.is_outlier() if not event.internal_metadata.is_outlier() and not ctx.rejected
) )
# Now remove all events that are referenced by the to-be-added events # Now remove all events that are referenced by the to-be-added events
new_latest_event_ids.difference_update( new_latest_event_ids.difference_update(
e_id e_id
for event in events for event, ctx in event_contexts
for e_id, _ in event.prev_events for e_id, _ in event.prev_events
if not event.internal_metadata.is_outlier() if not event.internal_metadata.is_outlier() and not ctx.rejected
) )
# And finally remove any events that are referenced by previously added # And finally remove any events that are referenced by previously added