mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 09:40:22 +00:00
s/stream_ordering/event_stream_ordering/ in push
This commit is contained in:
parent
7e9fc9b6af
commit
ebcbb23226
3 changed files with 31 additions and 27 deletions
|
@ -293,7 +293,7 @@ class ReplicationResource(Resource):
|
||||||
push_rules, current_position, limit
|
push_rules, current_position, limit
|
||||||
)
|
)
|
||||||
writer.write_header_and_rows("push_rules", rows, (
|
writer.write_header_and_rows("push_rules", rows, (
|
||||||
"position", "stream_ordering", "user_id", "rule_id", "op",
|
"position", "event_stream_ordering", "user_id", "rule_id", "op",
|
||||||
"priority_class", "priority", "conditions", "actions"
|
"priority_class", "priority", "conditions", "actions"
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
|
@ -106,24 +106,25 @@ class PushRuleStore(SQLBaseStore):
|
||||||
):
|
):
|
||||||
conditions_json = json.dumps(conditions)
|
conditions_json = json.dumps(conditions)
|
||||||
actions_json = json.dumps(actions)
|
actions_json = json.dumps(actions)
|
||||||
with self._push_rules_stream_id_gen.get_next() as (stream_id, stream_ordering):
|
with self._push_rules_stream_id_gen.get_next() as ids:
|
||||||
|
stream_id, event_stream_ordering = ids
|
||||||
if before or after:
|
if before or after:
|
||||||
yield self.runInteraction(
|
yield self.runInteraction(
|
||||||
"_add_push_rule_relative_txn",
|
"_add_push_rule_relative_txn",
|
||||||
self._add_push_rule_relative_txn,
|
self._add_push_rule_relative_txn,
|
||||||
stream_id, stream_ordering, user_id, rule_id, priority_class,
|
stream_id, event_stream_ordering, user_id, rule_id, priority_class,
|
||||||
conditions_json, actions_json, before, after,
|
conditions_json, actions_json, before, after,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
yield self.runInteraction(
|
yield self.runInteraction(
|
||||||
"_add_push_rule_highest_priority_txn",
|
"_add_push_rule_highest_priority_txn",
|
||||||
self._add_push_rule_highest_priority_txn,
|
self._add_push_rule_highest_priority_txn,
|
||||||
stream_id, stream_ordering, user_id, rule_id, priority_class,
|
stream_id, event_stream_ordering, user_id, rule_id, priority_class,
|
||||||
conditions_json, actions_json,
|
conditions_json, actions_json,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _add_push_rule_relative_txn(
|
def _add_push_rule_relative_txn(
|
||||||
self, txn, stream_id, stream_ordering, user_id, rule_id, priority_class,
|
self, txn, stream_id, event_stream_ordering, user_id, rule_id, priority_class,
|
||||||
conditions_json, actions_json, before, after
|
conditions_json, actions_json, before, after
|
||||||
):
|
):
|
||||||
# Lock the table since otherwise we'll have annoying races between the
|
# Lock the table since otherwise we'll have annoying races between the
|
||||||
|
@ -175,12 +176,12 @@ class PushRuleStore(SQLBaseStore):
|
||||||
txn.execute(sql, (user_id, priority_class, new_rule_priority))
|
txn.execute(sql, (user_id, priority_class, new_rule_priority))
|
||||||
|
|
||||||
self._upsert_push_rule_txn(
|
self._upsert_push_rule_txn(
|
||||||
txn, stream_id, stream_ordering, user_id, rule_id, priority_class,
|
txn, stream_id, event_stream_ordering, user_id, rule_id, priority_class,
|
||||||
new_rule_priority, conditions_json, actions_json,
|
new_rule_priority, conditions_json, actions_json,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _add_push_rule_highest_priority_txn(
|
def _add_push_rule_highest_priority_txn(
|
||||||
self, txn, stream_id, stream_ordering, user_id, rule_id, priority_class,
|
self, txn, stream_id, event_stream_ordering, user_id, rule_id, priority_class,
|
||||||
conditions_json, actions_json
|
conditions_json, actions_json
|
||||||
):
|
):
|
||||||
# Lock the table since otherwise we'll have annoying races between the
|
# Lock the table since otherwise we'll have annoying races between the
|
||||||
|
@ -202,12 +203,12 @@ class PushRuleStore(SQLBaseStore):
|
||||||
|
|
||||||
self._upsert_push_rule_txn(
|
self._upsert_push_rule_txn(
|
||||||
txn,
|
txn,
|
||||||
stream_id, stream_ordering, user_id, rule_id, priority_class, new_prio,
|
stream_id, event_stream_ordering, user_id, rule_id, priority_class, new_prio,
|
||||||
conditions_json, actions_json,
|
conditions_json, actions_json,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _upsert_push_rule_txn(
|
def _upsert_push_rule_txn(
|
||||||
self, txn, stream_id, stream_ordering, user_id, rule_id, priority_class,
|
self, txn, stream_id, event_stream_ordering, user_id, rule_id, priority_class,
|
||||||
priority, conditions_json, actions_json, update_stream=True
|
priority, conditions_json, actions_json, update_stream=True
|
||||||
):
|
):
|
||||||
"""Specialised version of _simple_upsert_txn that picks a push_rule_id
|
"""Specialised version of _simple_upsert_txn that picks a push_rule_id
|
||||||
|
@ -245,7 +246,7 @@ class PushRuleStore(SQLBaseStore):
|
||||||
|
|
||||||
if update_stream:
|
if update_stream:
|
||||||
self._insert_push_rules_update_txn(
|
self._insert_push_rules_update_txn(
|
||||||
txn, stream_id, stream_ordering, user_id, rule_id,
|
txn, stream_id, event_stream_ordering, user_id, rule_id,
|
||||||
op="ADD",
|
op="ADD",
|
||||||
data={
|
data={
|
||||||
"priority_class": priority_class,
|
"priority_class": priority_class,
|
||||||
|
@ -266,7 +267,7 @@ class PushRuleStore(SQLBaseStore):
|
||||||
user_id (str): The matrix ID of the push rule owner
|
user_id (str): The matrix ID of the push rule owner
|
||||||
rule_id (str): The rule_id of the rule to be deleted
|
rule_id (str): The rule_id of the rule to be deleted
|
||||||
"""
|
"""
|
||||||
def delete_push_rule_txn(txn, stream_id, stream_ordering):
|
def delete_push_rule_txn(txn, stream_id, event_stream_ordering):
|
||||||
self._simple_delete_one_txn(
|
self._simple_delete_one_txn(
|
||||||
txn,
|
txn,
|
||||||
"push_rules",
|
"push_rules",
|
||||||
|
@ -274,26 +275,28 @@ class PushRuleStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
|
|
||||||
self._insert_push_rules_update_txn(
|
self._insert_push_rules_update_txn(
|
||||||
txn, stream_id, stream_ordering, user_id, rule_id,
|
txn, stream_id, event_stream_ordering, user_id, rule_id,
|
||||||
op="DELETE"
|
op="DELETE"
|
||||||
)
|
)
|
||||||
|
|
||||||
with self._push_rules_stream_id_gen.get_next() as (stream_id, stream_ordering):
|
with self._push_rules_stream_id_gen.get_next() as ids:
|
||||||
|
stream_id, event_stream_ordering = ids
|
||||||
yield self.runInteraction(
|
yield self.runInteraction(
|
||||||
"delete_push_rule", delete_push_rule_txn, stream_id, stream_ordering
|
"delete_push_rule", delete_push_rule_txn, stream_id, event_stream_ordering
|
||||||
)
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def set_push_rule_enabled(self, user_id, rule_id, enabled):
|
def set_push_rule_enabled(self, user_id, rule_id, enabled):
|
||||||
with self._push_rules_stream_id_gen.get_next() as (stream_id, stream_ordering):
|
with self._push_rules_stream_id_gen.get_next() as ids:
|
||||||
|
stream_id, event_stream_ordering = ids
|
||||||
yield self.runInteraction(
|
yield self.runInteraction(
|
||||||
"_set_push_rule_enabled_txn",
|
"_set_push_rule_enabled_txn",
|
||||||
self._set_push_rule_enabled_txn,
|
self._set_push_rule_enabled_txn,
|
||||||
stream_id, stream_ordering, user_id, rule_id, enabled
|
stream_id, event_stream_ordering, user_id, rule_id, enabled
|
||||||
)
|
)
|
||||||
|
|
||||||
def _set_push_rule_enabled_txn(
|
def _set_push_rule_enabled_txn(
|
||||||
self, txn, stream_id, stream_ordering, user_id, rule_id, enabled
|
self, txn, stream_id, event_stream_ordering, user_id, rule_id, enabled
|
||||||
):
|
):
|
||||||
new_id = self._push_rules_enable_id_gen.get_next()
|
new_id = self._push_rules_enable_id_gen.get_next()
|
||||||
self._simple_upsert_txn(
|
self._simple_upsert_txn(
|
||||||
|
@ -305,7 +308,7 @@ class PushRuleStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
|
|
||||||
self._insert_push_rules_update_txn(
|
self._insert_push_rules_update_txn(
|
||||||
txn, stream_id, stream_ordering, user_id, rule_id,
|
txn, stream_id, event_stream_ordering, user_id, rule_id,
|
||||||
op="ENABLE" if enabled else "DISABLE"
|
op="ENABLE" if enabled else "DISABLE"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -313,14 +316,14 @@ class PushRuleStore(SQLBaseStore):
|
||||||
def set_push_rule_actions(self, user_id, rule_id, actions, is_default_rule):
|
def set_push_rule_actions(self, user_id, rule_id, actions, is_default_rule):
|
||||||
actions_json = json.dumps(actions)
|
actions_json = json.dumps(actions)
|
||||||
|
|
||||||
def set_push_rule_actions_txn(txn, stream_id, stream_ordering):
|
def set_push_rule_actions_txn(txn, stream_id, event_stream_ordering):
|
||||||
if is_default_rule:
|
if is_default_rule:
|
||||||
# Add a dummy rule to the rules table with the user specified
|
# Add a dummy rule to the rules table with the user specified
|
||||||
# actions.
|
# actions.
|
||||||
priority_class = -1
|
priority_class = -1
|
||||||
priority = 1
|
priority = 1
|
||||||
self._upsert_push_rule_txn(
|
self._upsert_push_rule_txn(
|
||||||
txn, stream_id, stream_ordering, user_id, rule_id,
|
txn, stream_id, event_stream_ordering, user_id, rule_id,
|
||||||
priority_class, priority, "[]", actions_json,
|
priority_class, priority, "[]", actions_json,
|
||||||
update_stream=False
|
update_stream=False
|
||||||
)
|
)
|
||||||
|
@ -333,22 +336,23 @@ class PushRuleStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
|
|
||||||
self._insert_push_rules_update_txn(
|
self._insert_push_rules_update_txn(
|
||||||
txn, stream_id, stream_ordering, user_id, rule_id,
|
txn, stream_id, event_stream_ordering, user_id, rule_id,
|
||||||
op="ACTIONS", data={"actions": actions_json}
|
op="ACTIONS", data={"actions": actions_json}
|
||||||
)
|
)
|
||||||
|
|
||||||
with self._push_rules_stream_id_gen.get_next() as (stream_id, stream_ordering):
|
with self._push_rules_stream_id_gen.get_next() as ids:
|
||||||
|
stream_id, event_stream_ordering = ids
|
||||||
yield self.runInteraction(
|
yield self.runInteraction(
|
||||||
"set_push_rule_actions", set_push_rule_actions_txn,
|
"set_push_rule_actions", set_push_rule_actions_txn,
|
||||||
stream_id, stream_ordering
|
stream_id, event_stream_ordering
|
||||||
)
|
)
|
||||||
|
|
||||||
def _insert_push_rules_update_txn(
|
def _insert_push_rules_update_txn(
|
||||||
self, txn, stream_id, stream_ordering, user_id, rule_id, op, data=None
|
self, txn, stream_id, event_stream_ordering, user_id, rule_id, op, data=None
|
||||||
):
|
):
|
||||||
values = {
|
values = {
|
||||||
"stream_id": stream_id,
|
"stream_id": stream_id,
|
||||||
"stream_ordering": stream_ordering,
|
"event_stream_ordering": event_stream_ordering,
|
||||||
"user_id": user_id,
|
"user_id": user_id,
|
||||||
"rule_id": rule_id,
|
"rule_id": rule_id,
|
||||||
"op": op,
|
"op": op,
|
||||||
|
@ -372,7 +376,7 @@ class PushRuleStore(SQLBaseStore):
|
||||||
"""Get all the push rules changes that have happend on the server"""
|
"""Get all the push rules changes that have happend on the server"""
|
||||||
def get_all_push_rule_updates_txn(txn):
|
def get_all_push_rule_updates_txn(txn):
|
||||||
sql = (
|
sql = (
|
||||||
"SELECT stream_id, stream_ordering, user_id, rule_id,"
|
"SELECT stream_id, event_stream_ordering, user_id, rule_id,"
|
||||||
" op, priority_class, priority, conditions, actions"
|
" op, priority_class, priority, conditions, actions"
|
||||||
" FROM push_rules_stream"
|
" FROM push_rules_stream"
|
||||||
" WHERE ? < stream_id AND stream_id <= ?"
|
" WHERE ? < stream_id AND stream_id <= ?"
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
CREATE TABLE push_rules_stream(
|
CREATE TABLE push_rules_stream(
|
||||||
stream_id BIGINT NOT NULL,
|
stream_id BIGINT NOT NULL,
|
||||||
stream_ordering BIGINT NOT NULL,
|
event_stream_ordering BIGINT NOT NULL,
|
||||||
user_id TEXT NOT NULL,
|
user_id TEXT NOT NULL,
|
||||||
rule_id TEXT NOT NULL,
|
rule_id TEXT NOT NULL,
|
||||||
op TEXT NOT NULL, -- One of "ENABLE", "DISABLE", "ACTIONS", "ADD", "DELETE"
|
op TEXT NOT NULL, -- One of "ENABLE", "DISABLE", "ACTIONS", "ADD", "DELETE"
|
||||||
|
|
Loading…
Reference in a new issue