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

Make bulk_get_push_rules_for_room use get_joined_users_from_context cache

Browse source
This commit is contained in:
Erik Johnston 2016-09-05 10:02:38 +01:00
parent 81b94c5750
commit 3847fa38c4
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/push/bulk_push_rule_evaluator.py
View file

@ -38,7 +38,7 @@ def _get_rules(room_id, user_ids, store):
@defer.inlineCallbacks @defer.inlineCallbacks
def evaluator_for_event(event, hs, store, context): def evaluator_for_event(event, hs, store, context):
rules_by_user = yield store.bulk_get_push_rules_for_room( rules_by_user = yield store.bulk_get_push_rules_for_room(
event.room_id, context event, context
) )
# if this event is an invite event, we may need to run rules for the user # if this event is an invite event, we may need to run rules for the user

19
synapse/storage/push_rule.py
View file

@ -124,7 +124,7 @@ class PushRuleStore(SQLBaseStore):
defer.returnValue(results) defer.returnValue(results)
def bulk_get_push_rules_for_room(self, room_id, context): def bulk_get_push_rules_for_room(self, event, context):
state_group = context.state_group state_group = context.state_group
if not state_group: if not state_group:
# If state_group is None it means it has yet to be assigned a # If state_group is None it means it has yet to be assigned a
@ -134,12 +134,12 @@ class PushRuleStore(SQLBaseStore):
state_group = object() state_group = object()
return self._bulk_get_push_rules_for_room( return self._bulk_get_push_rules_for_room(
room_id, state_group, context.current_state_ids event.room_id, state_group, context.current_state_ids, event=event
) )
@cachedInlineCallbacks(num_args=2, cache_context=True) @cachedInlineCallbacks(num_args=2, cache_context=True)
def _bulk_get_push_rules_for_room(self, room_id, state_group, current_state_ids, def _bulk_get_push_rules_for_room(self, room_id, state_group, current_state_ids,
cache_context): cache_context, event=None):
# We don't use `state_group`, its there so that we can cache based # We don't use `state_group`, its there so that we can cache based
# on it. However, its important that its never None, since two current_state's # on it. However, its important that its never None, since two current_state's
# with a state_group of None are likely to be different. # with a state_group of None are likely to be different.
@ -150,16 +150,11 @@ class PushRuleStore(SQLBaseStore):
# their unread countss are correct in the event stream, but to avoid # their unread countss are correct in the event stream, but to avoid
# generating them for bot / AS users etc, we only do so for people who've # generating them for bot / AS users etc, we only do so for people who've
# sent a read receipt into the room. # sent a read receipt into the room.
local_user_member_ids = [
e_id for (etype, state_key), e_id in current_state_ids.iteritems()
if etype == EventTypes.Member and self.hs.is_mine_id(state_key)
]
local_member_events = yield self._get_events(local_user_member_ids) local_users_in_room = yield self._get_joined_users_from_context(
room_id, state_group, current_state_ids,
local_users_in_room = set( on_invalidate=cache_context.invalidate,
member_event.state_key for member_event in local_member_events event=event,
if member_event.membership == Membership.JOIN
) )
# users in the room who have pushers need to get push rules run because # users in the room who have pushers need to get push rules run because