From 1758e961c402bf9e14558a3ca8d76615def2a0ce Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 24 May 2022 10:01:21 -0400 Subject: [PATCH 1/4] Remove unnecessary num_args params. --- synapse/storage/databases/main/push_rule.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py index 4adabc88cce4..2f7a82b8733a 100644 --- a/synapse/storage/databases/main/push_rule.py +++ b/synapse/storage/databases/main/push_rule.py @@ -213,11 +213,7 @@ def have_push_rules_changed_txn(txn: LoggingTransaction) -> bool: "have_push_rules_changed", have_push_rules_changed_txn ) - @cachedList( - cached_method_name="get_push_rules_for_user", - list_name="user_ids", - num_args=1, - ) + @cachedList(cached_method_name="get_push_rules_for_user", list_name="user_ids") async def bulk_get_push_rules( self, user_ids: Collection[str] ) -> Dict[str, List[JsonDict]]: @@ -249,9 +245,7 @@ async def bulk_get_push_rules( return results @cachedList( - cached_method_name="get_push_rules_enabled_for_user", - list_name="user_ids", - num_args=1, + 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] From 37ec799b6ca9110363fe1a13fe4e6912b9161613 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 24 May 2022 10:01:36 -0400 Subject: [PATCH 2/4] Use unique descriptions. --- synapse/storage/databases/main/push_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py index 2f7a82b8733a..27ad958e0188 100644 --- a/synapse/storage/databases/main/push_rule.py +++ b/synapse/storage/databases/main/push_rule.py @@ -174,7 +174,7 @@ async def get_push_rules_for_user(self, user_id: str) -> List[JsonDict]: "conditions", "actions", ), - desc="get_push_rules_enabled_for_user", + desc="get_push_rules_for_user", ) rows.sort(key=lambda row: (-int(row["priority_class"]), -int(row["priority"]))) From a9cfe6ebc05f50eeff703cc9e343df7b4b404c9a Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 24 May 2022 10:03:40 -0400 Subject: [PATCH 3/4] Consistently cast enabled column. --- synapse/storage/databases/main/push_rule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py index 27ad958e0188..d5aefe02b6dc 100644 --- a/synapse/storage/databases/main/push_rule.py +++ b/synapse/storage/databases/main/push_rule.py @@ -188,10 +188,10 @@ 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", keyvalues={"user_name": user_id}, - retcols=("user_name", "rule_id", "enabled"), + retcols=("rule_id", "enabled"), desc="get_push_rules_enabled_for_user", ) - return {r["rule_id"]: False if r["enabled"] == 0 else True for r in results} + return {r["rule_id"]: bool(r["enabled"]) for r in results} async def have_push_rules_changed_for_user( self, user_id: str, last_id: int From e20a9d8f66c37b63b84af7b22750b0bebaa25822 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 24 May 2022 10:27:26 -0400 Subject: [PATCH 4/4] Newsfragment --- changelog.d/12856.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/12856.misc diff --git a/changelog.d/12856.misc b/changelog.d/12856.misc new file mode 100644 index 000000000000..19ecefd9af8d --- /dev/null +++ b/changelog.d/12856.misc @@ -0,0 +1 @@ +Clean-up the push rules datastore.