Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
91e886d6
Unverified
Commit
91e886d6
authored
4 years ago
by
Erik Johnston
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Speed up state res v2 across large state differences. (#7725)
parent
1b1489ff
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/7725.misc
+1
-0
1 addition, 0 deletions
changelog.d/7725.misc
synapse/state/v2.py
+2
-1
2 additions, 1 deletion
synapse/state/v2.py
with
3 additions
and
1 deletion
changelog.d/7725.misc
0 → 100644
+
1
−
0
View file @
91e886d6
Speed up state res v2 across large state differences.
This diff is collapsed.
Click to expand it.
synapse/state/v2.py
+
2
−
1
View file @
91e886d6
...
...
@@ -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
s
orted
_power_events
ev_id
for
ev_id
in
full_conflicted_set
if
ev_id
not
in
s
et
_power_events
]
logger
.
debug
(
"
sorting %d remaining events
"
,
len
(
leftover_events
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment