OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Time _get_rules

erikj/timings
Erik Johnston 2016-05-31 13:09:09 +01:00
parent 05f2c86891
commit 15f41e6084
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
synapse/push/bulk_push_rule_evaluator.py
View File

@ -37,35 +37,39 @@ def decode_rule_json(rule):
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_rules(room_id, user_ids, store): def _get_rules(room_id, user_ids, store):
rules_by_user = yield store.bulk_get_push_rules(user_ids) with log_duration("bulk_get_push_rules"):
rules_enabled_by_user = yield store.bulk_get_push_rules_enabled(user_ids) rules_by_user = yield store.bulk_get_push_rules(user_ids)
with log_duration("bulk_get_push_rules_enabled"):
rules_enabled_by_user = yield store.bulk_get_push_rules_enabled(user_ids)
rules_by_user = { with log_duration("list_with_base_rules"):
uid: list_with_base_rules([ rules_by_user = {
decode_rule_json(rule_list) uid: list_with_base_rules([
for rule_list in rules_by_user.get(uid, []) decode_rule_json(rule_list)
]) for rule_list in rules_by_user.get(uid, [])
for uid in user_ids ])
} for uid in user_ids
}
# We apply the rules-enabled map here: bulk_get_push_rules doesn't # We apply the rules-enabled map here: bulk_get_push_rules doesn't
# fetch disabled rules, but this won't account for any server default # fetch disabled rules, but this won't account for any server default
# rules the user has disabled, so we need to do this too. # rules the user has disabled, so we need to do this too.
for uid in user_ids: with log_duration("apply_the_rules_enabled"):
if uid not in rules_enabled_by_user: for uid in user_ids:
continue if uid not in rules_enabled_by_user:
continue
user_enabled_map = rules_enabled_by_user[uid] user_enabled_map = rules_enabled_by_user[uid]
for i, rule in enumerate(rules_by_user[uid]): for i, rule in enumerate(rules_by_user[uid]):
rule_id = rule['rule_id'] rule_id = rule['rule_id']
if rule_id in user_enabled_map: if rule_id in user_enabled_map:
if rule.get('enabled', True) != bool(user_enabled_map[rule_id]): if rule.get('enabled', True) != bool(user_enabled_map[rule_id]):
# Rules are cached across users. # Rules are cached across users.
rule = dict(rule) rule = dict(rule)
rule['enabled'] = bool(user_enabled_map[rule_id]) rule['enabled'] = bool(user_enabled_map[rule_id])
rules_by_user[uid][i] = rule rules_by_user[uid][i] = rule
defer.returnValue(rules_by_user) defer.returnValue(rules_by_user)