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

Commit

Permalink
Use the room type from stats in hierarchy response. (#14263)
Browse files Browse the repository at this point in the history
This avoids pulling additional state information (and events) from
the database for each item returned in the hierarchy response.

The room type might be out of date until a background update finishes
running, the worst impact of this would be spaces being treated as rooms
in the hierarchy response. This should self-heal once the background
update finishes.
  • Loading branch information
clokep authored Dec 13, 2022
1 parent 62ed877 commit 2920e54
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
1 change: 1 addition & 0 deletions changelog.d/14263.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve performance of the `/hierarchy` endpoint.
14 changes: 5 additions & 9 deletions synapse/handlers/room_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import attr

from synapse.api.constants import (
EventContentFields,
EventTypes,
HistoryVisibility,
JoinRules,
Expand Down Expand Up @@ -701,13 +700,6 @@ async def _build_room_entry(self, room_id: str, for_federation: bool) -> JsonDic
# there should always be an entry
assert stats is not None, "unable to retrieve stats for %s" % (room_id,)

current_state_ids = await self._storage_controllers.state.get_current_state_ids(
room_id
)
create_event = await self._store.get_event(
current_state_ids[(EventTypes.Create, "")]
)

entry = {
"room_id": stats["room_id"],
"name": stats["name"],
Expand All @@ -720,7 +712,7 @@ async def _build_room_entry(self, room_id: str, for_federation: bool) -> JsonDic
stats["history_visibility"] == HistoryVisibility.WORLD_READABLE
),
"guest_can_join": stats["guest_access"] == "can_join",
"room_type": create_event.content.get(EventContentFields.ROOM_TYPE),
"room_type": stats["room_type"],
}

if self._msc3266_enabled:
Expand All @@ -730,7 +722,11 @@ async def _build_room_entry(self, room_id: str, for_federation: bool) -> JsonDic
# Federation requests need to provide additional information so the
# requested server is able to filter the response appropriately.
if for_federation:
current_state_ids = (
await self._storage_controllers.state.get_current_state_ids(room_id)
)
room_version = await self._store.get_room_version(room_id)

if await self._event_auth_handler.has_restricted_join_rules(
current_state_ids, room_version
):
Expand Down

0 comments on commit 2920e54

Please sign in to comment.