Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Speed up get_joined_hosts
This commit is contained in:
Erik Johnston 2017-05-16 17:40:55 +01:00 committed by GitHub
parent 7c69849a0d 13f540ef1b
commit 6fa8148ccb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/handlers/room_member.py
View File

@ -739,10 +739,11 @@ class RoomMemberHandler(BaseHandler):
if len(current_state_ids) == 1 and create_event_id: if len(current_state_ids) == 1 and create_event_id:
defer.returnValue(self.hs.is_mine_id(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): if etype != EventTypes.Member or not self.hs.is_mine_id(state_key):
continue continue
event_id = current_state_ids[(etype, state_key)]
event = yield self.store.get_event(event_id, allow_none=True) event = yield self.store.get_event(event_id, allow_none=True)
if not event: if not event:
continue continue

3
synapse/storage/roommember.py
View File

@ -534,7 +534,7 @@ class RoomMemberStore(SQLBaseStore):
assert state_group is not None assert state_group is not None
joined_hosts = set() 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: if etype == EventTypes.Member:
try: try:
host = get_domain_from_id(state_key) host = get_domain_from_id(state_key)
@ -545,6 +545,7 @@ class RoomMemberStore(SQLBaseStore):
if host in joined_hosts: if host in joined_hosts:
continue continue
event_id = current_state_ids[(etype, state_key)]
event = yield self.get_event(event_id, allow_none=True) event = yield self.get_event(event_id, allow_none=True)
if event and event.content["membership"] == Membership.JOIN: if event and event.content["membership"] == Membership.JOIN:
joined_hosts.add(intern_string(host)) joined_hosts.add(intern_string(host))