Merge pull request #2274 from matrix-org/erikj/cache_is_host_joined

Add cache for is_host_joined
This commit is contained in:
Erik Johnston 2017-06-13 10:58:53 +01:00 committed by GitHub
commit fdca6e36ee
3 changed files with 7 additions and 2 deletions

View file

@ -153,7 +153,7 @@ class SlavedEventStore(BaseSlavedStore):
get_room_events_stream_for_rooms = (
DataStore.get_room_events_stream_for_rooms.__func__
)
is_host_joined = DataStore.is_host_joined.__func__
is_host_joined = RoomMemberStore.__dict__["is_host_joined"]
get_stream_token_for_event = DataStore.get_stream_token_for_event.__func__
_set_before_and_after = staticmethod(DataStore._set_before_and_after)

View file

@ -776,6 +776,11 @@ class EventsStore(SQLBaseStore):
txn, self.get_rooms_for_user, (member,)
)
for host in set(get_domain_from_id(u) for u in members_changed):
self._invalidate_cache_and_stream(
txn, self.is_host_joined, (room_id, host)
)
self._invalidate_cache_and_stream(
txn, self.get_users_in_room, (room_id,)
)

View file

@ -501,7 +501,7 @@ class RoomMemberStore(SQLBaseStore):
defer.returnValue(users_in_room)
@defer.inlineCallbacks
@cachedInlineCallbacks(max_entries=10000)
def is_host_joined(self, room_id, host):
if '%' in host or '_' in host:
raise Exception("Invalid host name")