From 3847fa38c41c50fe0833b3fe8a84ce68dadc6e48 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 5 Sep 2016 10:02:38 +0100 Subject: [PATCH 1/3] Make bulk_get_push_rules_for_room use get_joined_users_from_context cache --- synapse/push/bulk_push_rule_evaluator.py | 2 +- synapse/storage/push_rule.py | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 6ff9a06de1..f1bbe57dcb 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -38,7 +38,7 @@ def _get_rules(room_id, user_ids, store): @defer.inlineCallbacks def evaluator_for_event(event, hs, store, context): 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 diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index 7e6ec411cd..c312ee39a2 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -124,7 +124,7 @@ class PushRuleStore(SQLBaseStore): 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 if not state_group: # If state_group is None it means it has yet to be assigned a @@ -134,12 +134,12 @@ class PushRuleStore(SQLBaseStore): state_group = object() 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) 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 # 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. @@ -150,16 +150,11 @@ class PushRuleStore(SQLBaseStore): # 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 # 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 = set( - member_event.state_key for member_event in local_member_events - if member_event.membership == Membership.JOIN + local_users_in_room = yield self._get_joined_users_from_context( + room_id, state_group, current_state_ids, + on_invalidate=cache_context.invalidate, + event=event, ) # users in the room who have pushers need to get push rules run because From 80a6a445faba2ea39ff497517e4ef92c882a11b0 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 5 Sep 2016 10:43:32 +0100 Subject: [PATCH 2/3] Only fetch local pushers --- synapse/storage/push_rule.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index c312ee39a2..789766d5be 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -151,12 +151,14 @@ class PushRuleStore(SQLBaseStore): # generating them for bot / AS users etc, we only do so for people who've # sent a read receipt into the room. - local_users_in_room = yield self._get_joined_users_from_context( + users_in_room = yield self._get_joined_users_from_context( room_id, state_group, current_state_ids, on_invalidate=cache_context.invalidate, event=event, ) + local_users_in_room = set(u for u in users_in_room if self.hs.is_mine_id(u)) + # users in the room who have pushers need to get push rules run because # that's how their pushers work if_users_with_pushers = yield self.get_if_users_have_pushers( From caed1503632fc4a85f90c62e8e511e41881695b8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 5 Sep 2016 10:52:01 +0100 Subject: [PATCH 3/3] Remove unused imports --- synapse/storage/push_rule.py | 1 - 1 file changed, 1 deletion(-) diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index 789766d5be..49721656b6 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -16,7 +16,6 @@ from ._base import SQLBaseStore from synapse.util.caches.descriptors import cachedInlineCallbacks, cachedList from synapse.push.baserules import list_with_base_rules -from synapse.api.constants import EventTypes, Membership from twisted.internet import defer import logging