Merge pull request #1068 from matrix-org/erikj/bulk_push

Make bulk_get_push_rules_for_room use get_joined_users_from_context cache

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

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
@@ -124,7 +123,7 @@ def bulk_get_push_rules(self, user_ids):
 
         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 +133,12 @@ def bulk_get_push_rules_for_room(self, room_id, context):
             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,18 +149,15 @@ def _bulk_get_push_rules_for_room(self, room_id, state_group, current_state_ids,
         # 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
+        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(