mirror of
https://mau.dev/maunium/synapse.git
synced 2024-10-01 01:36:05 -04:00
Speed up fetching large numbers of push rules (#13592)
This commit is contained in:
parent
5e7847dc92
commit
aec87a0f93
1
changelog.d/13592.misc
Normal file
1
changelog.d/13592.misc
Normal file
@ -0,0 +1 @@
|
||||
Minor speed up of fetching large numbers of push rules.
|
@ -31,6 +31,5 @@ class SlavedPushRuleStore(SlavedEventStore, PushRulesWorkerStore):
|
||||
self._push_rules_stream_id_gen.advance(instance_name, token)
|
||||
for row in rows:
|
||||
self.get_push_rules_for_user.invalidate((row.user_id,))
|
||||
self.get_push_rules_enabled_for_user.invalidate((row.user_id,))
|
||||
self.push_rules_stream_cache.entity_has_changed(row.user_id, token)
|
||||
return super().process_replication_rows(stream_name, instance_name, token, rows)
|
||||
|
@ -650,9 +650,6 @@ class AccountDataWorkerStore(PushRulesWorkerStore, CacheInvalidationWorkerStore)
|
||||
txn, self.get_account_data_for_room, (user_id,)
|
||||
)
|
||||
self._invalidate_cache_and_stream(txn, self.get_push_rules_for_user, (user_id,))
|
||||
self._invalidate_cache_and_stream(
|
||||
txn, self.get_push_rules_enabled_for_user, (user_id,)
|
||||
)
|
||||
# This user might be contained in the ignored_by cache for other users,
|
||||
# so we have to invalidate it all.
|
||||
self._invalidate_all_cache_and_stream(txn, self.ignored_by)
|
||||
|
@ -165,7 +165,6 @@ class PushRulesWorkerStore(
|
||||
|
||||
return _load_rules(rows, enabled_map, self.hs.config.experimental)
|
||||
|
||||
@cached(max_entries=5000)
|
||||
async def get_push_rules_enabled_for_user(self, user_id: str) -> Dict[str, bool]:
|
||||
results = await self.db_pool.simple_select_list(
|
||||
table="push_rules_enable",
|
||||
@ -229,9 +228,6 @@ class PushRulesWorkerStore(
|
||||
|
||||
return results
|
||||
|
||||
@cachedList(
|
||||
cached_method_name="get_push_rules_enabled_for_user", list_name="user_ids"
|
||||
)
|
||||
async def bulk_get_push_rules_enabled(
|
||||
self, user_ids: Collection[str]
|
||||
) -> Dict[str, Dict[str, bool]]:
|
||||
@ -246,6 +242,7 @@ class PushRulesWorkerStore(
|
||||
iterable=user_ids,
|
||||
retcols=("user_name", "rule_id", "enabled"),
|
||||
desc="bulk_get_push_rules_enabled",
|
||||
batch_size=1000,
|
||||
)
|
||||
for row in rows:
|
||||
enabled = bool(row["enabled"])
|
||||
@ -792,7 +789,6 @@ class PushRuleStore(PushRulesWorkerStore):
|
||||
self.db_pool.simple_insert_txn(txn, "push_rules_stream", values=values)
|
||||
|
||||
txn.call_after(self.get_push_rules_for_user.invalidate, (user_id,))
|
||||
txn.call_after(self.get_push_rules_enabled_for_user.invalidate, (user_id,))
|
||||
txn.call_after(
|
||||
self.push_rules_stream_cache.entity_has_changed, user_id, stream_id
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user