Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Make bulk_get_push_rules_for_room use get_joined_users_from_context cache #1068

Merged
merged 4 commits into from
Sep 5, 2016
Merged

Make bulk_get_push_rules_for_room use get_joined_users_from_context cache #1068

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3847fa3
Make bulk_get_push_rules_for_room use get_joined_users_from_context c…
erikjohnston Sep 5, 2016
80a6a44
Only fetch local pushers
erikjohnston Sep 5, 2016
caed150
Remove unused imports
erikjohnston Sep 5, 2016
d87b87a
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bu…
erikjohnston Sep 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion synapse/push/bulk_push_rule_evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 7 additions & 12 deletions synapse/storage/push_rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,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
Expand All @@ -134,12 +134,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.
Expand All @@ -150,16 +150,11 @@ 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
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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does _get_joined_users_from_context only return the local users?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, point. Although it'd get filtered out by the get_if_users_have_pushers below

)

# users in the room who have pushers need to get push rules run because
Expand Down