Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts

Speed up get_joined_hosts
matrix-org · May 16, 2017 · 6fa8148 · 6fa8148
2 parents 7c69849 + 13f540e
commit 6fa8148
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
@@ -739,10 +739,11 @@ def _is_host_in_room(self, current_state_ids):
         if len(current_state_ids) == 1 and create_event_id:
             defer.returnValue(self.hs.is_mine_id(create_event_id))
 
-        for (etype, state_key), event_id in current_state_ids.items():
+        for etype, state_key in current_state_ids:
             if etype != EventTypes.Member or not self.hs.is_mine_id(state_key):
                 continue
 
+            event_id = current_state_ids[(etype, state_key)]
             event = yield self.store.get_event(event_id, allow_none=True)
             if not event:
                 continue

diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
@@ -534,7 +534,7 @@ def _get_joined_hosts(self, room_id, state_group, current_state_ids):
         assert state_group is not None
 
         joined_hosts = set()
-        for (etype, state_key), event_id in current_state_ids.items():
+        for etype, state_key in current_state_ids:
             if etype == EventTypes.Member:
                 try:
                     host = get_domain_from_id(state_key)
@@ -545,6 +545,7 @@ def _get_joined_hosts(self, room_id, state_group, current_state_ids):
                 if host in joined_hosts:
                     continue
 
+                event_id = current_state_ids[(etype, state_key)]
                 event = yield self.get_event(event_id, allow_none=True)
                 if event and event.content["membership"] == Membership.JOIN:
                     joined_hosts.add(intern_string(host))