Merge pull request matrix-org#2060 from matrix-org/erikj/cache_hosts_…

…in_room Cache hosts in room
matthewjwolff · Mar 24, 2017 · 23e0ff8 · 23e0ff8
2 parents f136c89 + 7fc1f1e
commit 23e0ff8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
@@ -575,8 +575,7 @@ def _get_interested_parties(self, states, calculate_remote_hosts=True):
                 if not local_states:
                     continue
 
-                users = yield self.store.get_users_in_room(room_id)
-                hosts = set(get_domain_from_id(u) for u in users)
+                hosts = yield self.store.get_hosts_in_room(room_id)
 
                 for host in hosts:
                     hosts_to_states.setdefault(host, []).extend(local_states)

diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
@@ -129,6 +129,16 @@ def f(txn, stream_ordering):
         with self._stream_id_gen.get_next() as stream_ordering:
             yield self.runInteraction("locally_reject_invite", f, stream_ordering)
 
+    @cachedInlineCallbacks(max_entries=100000, iterable=True, cache_context=True)
+    def get_hosts_in_room(self, room_id, cache_context):
+        """Returns the set of all hosts currently in the room
+        """
+        user_ids = yield self.get_users_in_room(
+            room_id, on_invalidate=cache_context.invalidate,
+        )
+        hosts = frozenset(get_domain_from_id(user_id) for user_id in user_ids)
+        defer.returnValue(hosts)
+
     @cached(max_entries=500000, iterable=True)
     def get_users_in_room(self, room_id):
         def f(txn):