From 02711552cf001615da612ea8a65987a2f2fdea13 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Wed, 21 Aug 2024 19:11:08 -0500 Subject: [PATCH] Better handle none case --- synapse/storage/databases/main/stream.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py index 395735cd43..879f6febe4 100644 --- a/synapse/storage/databases/main/stream.py +++ b/synapse/storage/databases/main/stream.py @@ -1310,14 +1310,17 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): [room_id] + event_type_args, ) - row = cast(Tuple[str, int, str], txn.fetchone()) - event_id, stream_ordering, instance_name = row + row = cast(Optional[Tuple[str, int, str]], txn.fetchone()) + if row is not None: + event_id, stream_ordering, instance_name = row - return event_id, PersistedEventPosition( - # If instance_name is null we default to "master" - instance_name or "master", - stream_ordering, - ) + return event_id, PersistedEventPosition( + # If instance_name is null we default to "master" + instance_name or "master", + stream_ordering, + ) + + return None return await self.db_pool.runInteraction( "get_last_event_pos_in_room",