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

Filter user directory state query to a subset of state events #4462

Merged
hawkowl merged 2 commits into from
Feb 5, 2019
Merged

Filter user directory state query to a subset of state events #4462

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
51f14dc
Filter user directory state query to a subset of state events
anoadragon453 Jan 23, 2019
cc410f9
Add changelog
anoadragon453 Jan 24, 2019
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/4462.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change the user directory state query to use a filtered call to the db instead of a generic one.
Copy link
Copy Markdown
Member Author

@anoadragon453 anoadragon453 Jan 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, is a changelog even worth it for this change?

Copy link
Copy Markdown
Contributor

@hawkowl hawkowl Jan 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, every change needs a changelog.

16 changes: 12 additions & 4 deletions synapse/storage/user_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

from synapse.api.constants import EventTypes, JoinRules
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
from synapse.storage.state import StateFilter
from synapse.types import get_domain_from_id, get_localpart_from_id
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks

Expand All @@ -31,12 +32,19 @@


class UserDirectoryStore(SQLBaseStore):
@cachedInlineCallbacks(cache_context=True)
def is_room_world_readable_or_publicly_joinable(self, room_id, cache_context):
@defer.inlineCallbacks
def is_room_world_readable_or_publicly_joinable(self, room_id):
"""Check if the room is either world_readable or publically joinable
"""
current_state_ids = yield self.get_current_state_ids(
room_id, on_invalidate=cache_context.invalidate

# Create a state filter that only queries join and history state event
types_to_filter = (
(EventTypes.JoinRules, ""),
(EventTypes.RoomHistoryVisibility, ""),
)

current_state_ids = yield self.get_filtered_current_state_ids(
room_id, StateFilter.from_types(types_to_filter),
)

join_rules_id = current_state_ids.get((EventTypes.JoinRules, ""))
Expand Down