mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-03 16:12:34 +00:00
Cache room membership lookups in _get_joined_users_from_context
This commit is contained in:
parent
6018bec919
commit
c8145af8a9
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
from typing import Iterable
|
||||||
|
|
||||||
from six import iteritems, itervalues
|
from six import iteritems, itervalues
|
||||||
|
|
||||||
@ -32,7 +33,7 @@ from synapse.storage.events_worker import EventsWorkerStore
|
|||||||
from synapse.types import get_domain_from_id
|
from synapse.types import get_domain_from_id
|
||||||
from synapse.util.async_helpers import Linearizer
|
from synapse.util.async_helpers import Linearizer
|
||||||
from synapse.util.caches import intern_string
|
from synapse.util.caches import intern_string
|
||||||
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks
|
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList
|
||||||
from synapse.util.stringutils import to_ascii
|
from synapse.util.stringutils import to_ascii
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -567,25 +568,10 @@ class RoomMemberWorkerStore(EventsWorkerStore):
|
|||||||
missing_member_event_ids.append(event_id)
|
missing_member_event_ids.append(event_id)
|
||||||
|
|
||||||
if missing_member_event_ids:
|
if missing_member_event_ids:
|
||||||
rows = yield self._simple_select_many_batch(
|
event_to_memberships = yield self._get_membership_from_event_ids(
|
||||||
table="room_memberships",
|
missing_member_event_ids
|
||||||
column="event_id",
|
|
||||||
iterable=missing_member_event_ids,
|
|
||||||
retcols=("user_id", "display_name", "avatar_url"),
|
|
||||||
keyvalues={"membership": Membership.JOIN},
|
|
||||||
batch_size=500,
|
|
||||||
desc="_get_joined_users_from_context",
|
|
||||||
)
|
|
||||||
|
|
||||||
users_in_room.update(
|
|
||||||
{
|
|
||||||
to_ascii(row["user_id"]): ProfileInfo(
|
|
||||||
avatar_url=to_ascii(row["avatar_url"]),
|
|
||||||
display_name=to_ascii(row["display_name"]),
|
|
||||||
)
|
|
||||||
for row in rows
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
|
users_in_room.update((row for row in event_to_memberships.values() if row))
|
||||||
|
|
||||||
if event is not None and event.type == EventTypes.Member:
|
if event is not None and event.type == EventTypes.Member:
|
||||||
if event.membership == Membership.JOIN:
|
if event.membership == Membership.JOIN:
|
||||||
@ -597,6 +583,46 @@ class RoomMemberWorkerStore(EventsWorkerStore):
|
|||||||
|
|
||||||
return users_in_room
|
return users_in_room
|
||||||
|
|
||||||
|
@cached(max_entries=10000)
|
||||||
|
def _get_membership_from_event_id(self, event_id):
|
||||||
|
raise NotADirectoryError()
|
||||||
|
|
||||||
|
@cachedList(
|
||||||
|
cached_method_name="_get_membership_from_event_id",
|
||||||
|
list_name="event_ids",
|
||||||
|
inlineCallbacks=True,
|
||||||
|
)
|
||||||
|
def _get_membership_from_event_ids(self, event_ids: Iterable[str]):
|
||||||
|
"""Lookup profile info for set of member event IDs.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
event_ids: The member event IDs to lookup
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Deferred[dict[str, Tuple[str, ProfileInfo]|None]]: Map from event ID
|
||||||
|
to `user_id` and ProfileInfo (or None if couldn't find event).
|
||||||
|
"""
|
||||||
|
|
||||||
|
rows = yield self._simple_select_many_batch(
|
||||||
|
table="room_memberships",
|
||||||
|
column="event_id",
|
||||||
|
iterable=event_ids,
|
||||||
|
retcols=("user_id", "display_name", "avatar_url"),
|
||||||
|
keyvalues={"membership": Membership.JOIN},
|
||||||
|
batch_size=500,
|
||||||
|
desc="_get_membership_from_event_ids",
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
row["event_id"]: (
|
||||||
|
row["user_id"],
|
||||||
|
ProfileInfo(
|
||||||
|
avatar_url=row["avatar_url"], display_name=row["display_name"]
|
||||||
|
),
|
||||||
|
)
|
||||||
|
for row in rows
|
||||||
|
}
|
||||||
|
|
||||||
@cachedInlineCallbacks(max_entries=10000)
|
@cachedInlineCallbacks(max_entries=10000)
|
||||||
def is_host_joined(self, room_id, host):
|
def is_host_joined(self, room_id, host):
|
||||||
if "%" in host or "_" in host:
|
if "%" in host or "_" in host:
|
||||||
|
Loading…
Reference in New Issue
Block a user