maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

Browse source
This commit is contained in:
Richard van der Hoff 2018-10-09 09:49:08 +01:00
parent 1a0c407e6b 2418e7811a
commit eeb29d99fd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4017.misc Normal file
View file

@ -0,0 +1 @@
Optimisation for serving federation requests

13
synapse/visibility.py
View file

@ -324,14 +324,13 @@ def filter_events_for_server(store, server_name, events):
# server's domain.
#
# event_to_state_ids contains lots of duplicates, so it turns out to be
# cheaper to build a complete set of unique
# ((type, state_key), event_id) tuples, and then filter out the ones we
# don't want.
# cheaper to build a complete event_id => (type, state_key) dict, and then
# filter out the ones we don't want
#
state_key_to_event_id_set = {
e
event_id_to_state_key = {
event_id: key
for key_to_eid in itervalues(event_to_state_ids)
for e in key_to_eid.items()
for key, event_id in iteritems(key_to_eid)
}
def include(typ, state_key):
@ -346,7 +345,7 @@ def filter_events_for_server(store, server_name, events):
event_map = yield store.get_events([
e_id
for key, e_id in state_key_to_event_id_set
for e_id, key in iteritems(event_id_to_state_key)
if include(key[0], key[1])
])