From 6293a28db1518719ac7ae8d79f2b7f03df72b147 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 9 Mar 2022 07:54:12 -0500 Subject: [PATCH 1/5] Remove an unused parameter. --- synapse/storage/databases/main/roommember.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/synapse/storage/databases/main/roommember.py b/synapse/storage/databases/main/roommember.py index e48ec5f495af..99202ec8c96e 100644 --- a/synapse/storage/databases/main/roommember.py +++ b/synapse/storage/databases/main/roommember.py @@ -839,16 +839,12 @@ async def get_joined_hosts(self, room_id: str, state_entry): with Measure(self._clock, "get_joined_hosts"): return await self._get_joined_hosts( - room_id, state_group, state_entry.state, state_entry=state_entry + room_id, state_group, state_entry=state_entry ) @cached(num_args=2, max_entries=10000, iterable=True) async def _get_joined_hosts( - self, - room_id: str, - state_group: int, - current_state_ids: StateMap[str], - state_entry: "_StateCacheEntry", + self, room_id: str, state_group: int, state_entry: "_StateCacheEntry" ) -> FrozenSet[str]: # We don't use `state_group`, its there so that we can cache based on # it. However, its important that its never None, since two From b72cf44b905c4f87dae4cdcecc85fa86892bd1fd Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 9 Mar 2022 07:54:18 -0500 Subject: [PATCH 2/5] Remove an unused variable. --- synapse/storage/databases/main/roommember.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/roommember.py b/synapse/storage/databases/main/roommember.py index 99202ec8c96e..e87851ce45d3 100644 --- a/synapse/storage/databases/main/roommember.py +++ b/synapse/storage/databases/main/roommember.py @@ -273,7 +273,7 @@ def _get_room_summary_txn(txn): txn.execute(sql, (room_id,)) res = {} for count, membership in txn: - summary = res.setdefault(membership, MemberSummary([], count)) + res.setdefault(membership, MemberSummary([], count)) # we order by membership and then fairly arbitrarily by event_id so # heroes are consistent From 14bc06d2c8ca37535669fadbf6825418cdb5a686 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 9 Mar 2022 07:56:00 -0500 Subject: [PATCH 3/5] Newsfragment --- changelog.d/12187.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/12187.misc diff --git a/changelog.d/12187.misc b/changelog.d/12187.misc new file mode 100644 index 000000000000..c53e68faa508 --- /dev/null +++ b/changelog.d/12187.misc @@ -0,0 +1 @@ +Remove unused variables. From 2d2921872ad4c94481beaff8aa1a2d6bc11036ce Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 9 Mar 2022 08:39:58 -0500 Subject: [PATCH 4/5] Remove unused import. --- synapse/storage/databases/main/roommember.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/roommember.py b/synapse/storage/databases/main/roommember.py index e87851ce45d3..d0616facfb56 100644 --- a/synapse/storage/databases/main/roommember.py +++ b/synapse/storage/databases/main/roommember.py @@ -46,7 +46,7 @@ ProfileInfo, RoomsForUser, ) -from synapse.types import PersistedEventPosition, StateMap, get_domain_from_id +from synapse.types import PersistedEventPosition, get_domain_from_id from synapse.util.async_helpers import Linearizer from synapse.util.caches import intern_string from synapse.util.caches.descriptors import _CacheContext, cached, cachedList From 03b8686d3e3a78a7f35b502b6d35d973b8046786 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 9 Mar 2022 10:01:26 -0500 Subject: [PATCH 5/5] Fix typo. --- synapse/storage/databases/main/roommember.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/roommember.py b/synapse/storage/databases/main/roommember.py index d0616facfb56..bef675b8453c 100644 --- a/synapse/storage/databases/main/roommember.py +++ b/synapse/storage/databases/main/roommember.py @@ -846,7 +846,7 @@ async def get_joined_hosts(self, room_id: str, state_entry): async def _get_joined_hosts( self, room_id: str, state_group: int, state_entry: "_StateCacheEntry" ) -> FrozenSet[str]: - # We don't use `state_group`, its there so that we can cache based on + # We don't use `state_group`, it's there so that we can cache based on # it. However, its important that its never None, since two # current_state's with a state_group of None are likely to be different. #