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

Optimise backfill calculation #12522

Merged
merged 16 commits into from
Apr 26, 2022
Merged

Optimise backfill calculation #12522

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cd4d26f
skip a dict construction
richvdh Apr 22, 2022
9a68a56
Move some filtering and sorting logic earlier
richvdh Apr 22, 2022
8843069
update some comments and logs
richvdh Apr 22, 2022
8feaece
Use lists of tuples instead of Dicts
richvdh Apr 22, 2022
b945de6
Use an `attrs` to track backfill points
richvdh Apr 25, 2022
a1bd48f
Bail out when we find a visible extremity
richvdh Apr 25, 2022
cb88081
Use `get_events_as_list`
richvdh Apr 25, 2022
1f0a63e
Include insertion events in the `filtered_extremities` checks
richvdh Apr 25, 2022
d285af2
Only request extremities which we think will be visible
richvdh Apr 25, 2022
4ac692f
add a TODO comment
richvdh Apr 22, 2022
bdfa5a7
Make `get_successor_events` take a single event
richvdh Apr 25, 2022
a23e5a1
changelog
richvdh Apr 22, 2022
881d794
Update synapse/handlers/federation.py
richvdh Apr 25, 2022
8487963
More comment updates, per review
richvdh Apr 25, 2022
b75b3f5
Use a list rather than a set
richvdh Apr 25, 2022
1dfe084
Update and rename 12522.misc to 12522.bugfix
richvdh Apr 25, 2022
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
6 changes: 3 additions & 3 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ async def _maybe_backfill_inner(

forward_event_ids = await self.store.get_successor_events([bp.event_id])

extremities_events = await self.store.get_events(
forward_event_ids,
extremities_events = await self.store.get_events_as_list(
successor_event_ids,
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
redact_behaviour=EventRedactBehaviour.AS_IS,
get_prev_content=False,
)
Expand All @@ -322,7 +322,7 @@ async def _maybe_backfill_inner(
filtered_extremities = await filter_events_for_server(
self.storage,
self.server_name,
list(extremities_events.values()),
extremities_events,
redact=False,
check_history_visibility_only=True,
)
Expand Down