Fix 'GenericWorkerSlavedStore' object has no attribute 'get_all_push_rule_updates'
parent
3a86ea5000
commit
7280f95eca
|
@ -334,6 +334,26 @@ class PushRulesWorkerStore(
|
||||||
results.setdefault(row["user_name"], {})[row["rule_id"]] = enabled
|
results.setdefault(row["user_name"], {})[row["rule_id"]] = enabled
|
||||||
return results
|
return results
|
||||||
|
|
||||||
|
def get_all_push_rule_updates(self, last_id, current_id, limit):
|
||||||
|
"""Get all the push rules changes that have happend on the server"""
|
||||||
|
if last_id == current_id:
|
||||||
|
return defer.succeed([])
|
||||||
|
|
||||||
|
def get_all_push_rule_updates_txn(txn):
|
||||||
|
sql = (
|
||||||
|
"SELECT stream_id, event_stream_ordering, user_id, rule_id,"
|
||||||
|
" op, priority_class, priority, conditions, actions"
|
||||||
|
" FROM push_rules_stream"
|
||||||
|
" WHERE ? < stream_id AND stream_id <= ?"
|
||||||
|
" ORDER BY stream_id ASC LIMIT ?"
|
||||||
|
)
|
||||||
|
txn.execute(sql, (last_id, current_id, limit))
|
||||||
|
return txn.fetchall()
|
||||||
|
|
||||||
|
return self.db.runInteraction(
|
||||||
|
"get_all_push_rule_updates", get_all_push_rule_updates_txn
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class PushRuleStore(PushRulesWorkerStore):
|
class PushRuleStore(PushRulesWorkerStore):
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
@ -685,26 +705,6 @@ class PushRuleStore(PushRulesWorkerStore):
|
||||||
self.push_rules_stream_cache.entity_has_changed, user_id, stream_id
|
self.push_rules_stream_cache.entity_has_changed, user_id, stream_id
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_all_push_rule_updates(self, last_id, current_id, limit):
|
|
||||||
"""Get all the push rules changes that have happend on the server"""
|
|
||||||
if last_id == current_id:
|
|
||||||
return defer.succeed([])
|
|
||||||
|
|
||||||
def get_all_push_rule_updates_txn(txn):
|
|
||||||
sql = (
|
|
||||||
"SELECT stream_id, event_stream_ordering, user_id, rule_id,"
|
|
||||||
" op, priority_class, priority, conditions, actions"
|
|
||||||
" FROM push_rules_stream"
|
|
||||||
" WHERE ? < stream_id AND stream_id <= ?"
|
|
||||||
" ORDER BY stream_id ASC LIMIT ?"
|
|
||||||
)
|
|
||||||
txn.execute(sql, (last_id, current_id, limit))
|
|
||||||
return txn.fetchall()
|
|
||||||
|
|
||||||
return self.db.runInteraction(
|
|
||||||
"get_all_push_rule_updates", get_all_push_rule_updates_txn
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_push_rules_stream_token(self):
|
def get_push_rules_stream_token(self):
|
||||||
"""Get the position of the push rules stream.
|
"""Get the position of the push rules stream.
|
||||||
Returns a pair of a stream id for the push_rules stream and the
|
Returns a pair of a stream id for the push_rules stream and the
|
||||||
|
|
Loading…
Reference in New Issue