From 66c29dab271dc5b9371e980aa6550cf66b80b575 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 11 Nov 2021 16:08:41 +0000 Subject: [PATCH 1/3] Correct type hint for room_batch.py --- mypy.ini | 4 +++- synapse/storage/databases/main/room_batch.py | 18 ++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mypy.ini b/mypy.ini index a06c7fc66b68..48dfdfa0e0f3 100644 --- a/mypy.ini +++ b/mypy.ini @@ -46,7 +46,6 @@ exclude = (?x) |synapse/storage/databases/main/push_rule.py |synapse/storage/databases/main/receipts.py |synapse/storage/databases/main/room.py - |synapse/storage/databases/main/room_batch.py |synapse/storage/databases/main/roommember.py |synapse/storage/databases/main/search.py |synapse/storage/databases/main/signatures.py @@ -183,6 +182,9 @@ disallow_untyped_defs = True [mypy-synapse.storage.databases.main.client_ips] disallow_untyped_defs = True +[mypy-synapse.storage.databases.main.room_batch] +disallow_untyped_defs = True + [mypy-synapse.storage.util.*] disallow_untyped_defs = True diff --git a/synapse/storage/databases/main/room_batch.py b/synapse/storage/databases/main/room_batch.py index 97b261843782..39e80f6f5b11 100644 --- a/synapse/storage/databases/main/room_batch.py +++ b/synapse/storage/databases/main/room_batch.py @@ -39,13 +39,11 @@ async def get_insertion_event_id_by_batch_id( async def store_state_group_id_for_event_id( self, event_id: str, state_group_id: int - ) -> Optional[str]: - { - await self.db_pool.simple_upsert( - table="event_to_state_groups", - keyvalues={"event_id": event_id}, - values={"state_group": state_group_id, "event_id": event_id}, - # Unique constraint on event_id so we don't have to lock - lock=False, - ) - } + ) -> None: + await self.db_pool.simple_upsert( + table="event_to_state_groups", + keyvalues={"event_id": event_id}, + values={"state_group": state_group_id, "event_id": event_id}, + # Unique constraint on event_id so we don't have to lock + lock=False, + ) From 5ae5f3681d672a1e582595ef2713011396f7b915 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 11 Nov 2021 16:11:24 +0000 Subject: [PATCH 2/3] Changelog --- changelog.d/11310.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11310.misc diff --git a/changelog.d/11310.misc b/changelog.d/11310.misc new file mode 100644 index 000000000000..34176aaec42f --- /dev/null +++ b/changelog.d/11310.misc @@ -0,0 +1 @@ +Correct a type annotation in `room_batches.py`. \ No newline at end of file From 8f8497221191142bda56ed330ce2818db3f70895 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 11 Nov 2021 16:18:39 +0000 Subject: [PATCH 3/3] Update changelog.d/11310.misc Co-authored-by: Patrick Cloke --- changelog.d/11310.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/11310.misc b/changelog.d/11310.misc index 34176aaec42f..e5c12445d5a2 100644 --- a/changelog.d/11310.misc +++ b/changelog.d/11310.misc @@ -1 +1 @@ -Correct a type annotation in `room_batches.py`. \ No newline at end of file +Add type hints to storage classes. \ No newline at end of file