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

Don't pull out state in compute_event_context for unconflicted state #13267

Merged
merged 8 commits into from
Jul 14, 2022
Merged

Don't pull out state in compute_event_context for unconflicted state #13267

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f4726a
Remove unused function
erikjohnston Jul 13, 2022
4ded6c3
Remove unused param
erikjohnston Jul 13, 2022
aa34aed
Remove unused 'state_id'
erikjohnston Jul 13, 2022
dc8947e
Make StateCacheEntry.state optional
erikjohnston Jul 13, 2022
e603c1b
Don't pull out the state for unconficted case
erikjohnston Jul 13, 2022
b3a56f5
Newsfile
erikjohnston Jul 13, 2022
0ced864
Fix lint
erikjohnston Jul 13, 2022
4e72f6d
Add comment
erikjohnston Jul 14, 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
5 changes: 1 addition & 4 deletions synapse/state/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,17 +391,14 @@ async def resolve_state_groups_for_events(
state_group_ids_set = set(state_group_ids)
if len(state_group_ids_set) == 1:
(state_group_id,) = state_group_ids_set
state = await self._state_storage_controller.get_state_for_groups(
state_group_ids_set
)
(
prev_group,
delta_ids,
) = await self._state_storage_controller.get_state_group_delta(
state_group_id
)
return _StateCacheEntry(
state=state[state_group_id],
state=None,
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
state_group=state_group_id,
prev_group=prev_group,
delta_ids=delta_ids,
Expand Down