Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Speed up state res v2 across large state differences. #7725

Merged
merged 2 commits into from
Jun 19, 2020
Merged

Speed up state res v2 across large state differences. #7725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fac79ed
Speed up state res v2 across large state differences.
erikjohnston Jun 19, 2020
242c22a
Newsfile
erikjohnston Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7725.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Speed up state res v2 across large state differences.
3 changes: 2 additions & 1 deletion synapse/state/v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ def resolve_events_with_store(
# OK, so we've now resolved the power events. Now sort the remaining
# events using the mainline of the resolved power level.

set_power_events = set(sorted_power_events)
leftover_events = [
ev_id for ev_id in full_conflicted_set if ev_id not in sorted_power_events
ev_id for ev_id in full_conflicted_set if ev_id not in set_power_events
]

logger.debug("sorting %d remaining events", len(leftover_events))
Expand Down