Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove context.push_actions

Browse Source
This commit is contained in:
Erik Johnston 2018-02-15 15:18:37 +00:00
parent c714c61853
commit 4810f7effd
5 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/events/snapshot.py
View File

@ -52,7 +52,6 @@ class EventContext(object):
"prev_state_ids", "prev_state_ids",
"state_group", "state_group",
"rejected", "rejected",
"push_actions",
"prev_group", "prev_group",
"delta_ids", "delta_ids",
"prev_state_events", "prev_state_events",
@ -67,7 +66,6 @@ class EventContext(object):
self.state_group = None self.state_group = None
self.rejected = False self.rejected = False
self.push_actions = []
# A previously persisted state group and a delta between that # A previously persisted state group and a delta between that
# and this state. # and this state.
@ -104,7 +102,6 @@ class EventContext(object):
"event_state_key": event.state_key if event.is_state() else None, "event_state_key": event.state_key if event.is_state() else None,
"state_group": self.state_group, "state_group": self.state_group,
"rejected": self.rejected, "rejected": self.rejected,
"push_actions": self.push_actions,
"prev_group": self.prev_group, "prev_group": self.prev_group,
"delta_ids": _encode_state_dict(self.delta_ids), "delta_ids": _encode_state_dict(self.delta_ids),
"prev_state_events": self.prev_state_events, "prev_state_events": self.prev_state_events,
@ -127,7 +124,6 @@ class EventContext(object):
context = EventContext() context = EventContext()
context.state_group = input["state_group"] context.state_group = input["state_group"]
context.rejected = input["rejected"] context.rejected = input["rejected"]
context.push_actions = input["push_actions"]
context.prev_group = input["prev_group"] context.prev_group = input["prev_group"]
context.delta_ids = _decode_state_dict(input["delta_ids"]) context.delta_ids = _decode_state_dict(input["delta_ids"])
context.prev_state_events = input["prev_state_events"] context.prev_state_events = input["prev_state_events"]

6
synapse/push/action_generator.py
View File

@ -40,10 +40,6 @@ class ActionGenerator(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def handle_push_actions_for_event(self, event, context): def handle_push_actions_for_event(self, event, context):
with Measure(self.clock, "action_for_event_by_user"): with Measure(self.clock, "action_for_event_by_user"):
actions_by_user = yield self.bulk_evaluator.action_for_event_by_user( yield self.bulk_evaluator.action_for_event_by_user(
event, context event, context
) )
context.push_actions = [
(uid, actions) for uid, actions in actions_by_user.iteritems()
]

9
synapse/push/bulk_push_rule_evaluator.py
View File

@ -137,14 +137,13 @@ class BulkPushRuleEvaluator(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def action_for_event_by_user(self, event, context): def action_for_event_by_user(self, event, context):
"""Given an event and context, evaluate the push rules and return """Given an event and context, evaluate the push rules and insert the
the results results into the event_push_actions_staging table.
Returns: Returns:
dict of user_id -> action Deferred
""" """
rules_by_user = yield self._get_rules_for_event(event, context) rules_by_user = yield self._get_rules_for_event(event, context)
actions_by_user = {}
room_members = yield self.store.get_joined_users_from_context( room_members = yield self.store.get_joined_users_from_context(
event, context event, context
@ -190,12 +189,10 @@ class BulkPushRuleEvaluator(object):
if matches: if matches:
actions = [x for x in rule['actions'] if x != 'dont_notify'] actions = [x for x in rule['actions'] if x != 'dont_notify']
if actions and 'notify' in actions: if actions and 'notify' in actions:
actions_by_user[uid] = actions
yield self.store.add_push_actions_to_staging( yield self.store.add_push_actions_to_staging(
event.event_id, uid, actions, event.event_id, uid, actions,
) )
break break
defer.returnValue(actions_by_user)
def _condition_checker(evaluator, conditions, uid, display_name, cache): def _condition_checker(evaluator, conditions, uid, display_name, cache):

1
synapse/storage/events.py
View File

@ -1168,7 +1168,6 @@ class EventsStore(SQLBaseStore):
for event, context in events_and_contexts: for event, context in events_and_contexts:
# Insert all the push actions into the event_push_actions table. # Insert all the push actions into the event_push_actions table.
if context.push_actions:
self._set_push_actions_for_event_and_users_txn( self._set_push_actions_for_event_and_users_txn(
txn, event, txn, event,
) )

5
tests/replication/slave/storage/test_events.py
View File

@ -230,7 +230,10 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase):
state_handler = self.hs.get_state_handler() state_handler = self.hs.get_state_handler()
context = yield state_handler.compute_event_context(event) context = yield state_handler.compute_event_context(event)
context.push_actions = push_actions for user_id, actions in push_actions:
yield self.master_store.add_push_actions_to_staging(
event.event_id, user_id, actions,
)
ordering = None ordering = None
if backfill: if backfill: