diff --git a/synapse/storage/databases/main/state_deltas.py b/synapse/storage/databases/main/state_deltas.py index 188afec332dd..445213e12aaf 100644 --- a/synapse/storage/databases/main/state_deltas.py +++ b/synapse/storage/databases/main/state_deltas.py @@ -27,7 +27,7 @@ class StateDeltasStore(SQLBaseStore): # attribute. TODO: can we get static analysis to enforce this? _curr_state_delta_stream_cache: StreamChangeCache - async def get_current_state_deltas( + async def get_partial_current_state_deltas( self, prev_stream_id: int, max_stream_id: int ) -> Tuple[int, List[Dict[str, Any]]]: """Fetch a list of room state changes since the given stream id @@ -42,6 +42,8 @@ async def get_current_state_deltas( - prev_event_id (str|None): previous event_id for this state key. None if it's new state. + This may be the partial state if we're lazy joining the room. + Args: prev_stream_id: point to get changes since (exclusive) max_stream_id: the point that we know has been correctly persisted diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 4b6ee9b39f30..516de7231c4d 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -985,6 +985,6 @@ async def get_current_state_deltas( - list of current_state_delta_stream rows. If it is empty, we are up to date. """ - return await self.stores.main.get_current_state_deltas( + return await self.stores.main.get_partial_current_state_deltas( prev_stream_id, max_stream_id ) diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index 5f2e26a5fce7..c7d9cf7930d0 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -145,7 +145,7 @@ async def get_users_in_room(room_id: str): ) ) - self.datastore.get_current_state_deltas = Mock(return_value=(0, None)) + self.datastore.get_partial_current_state_deltas = Mock(return_value=(0, None)) self.datastore.get_to_device_stream_token = lambda: 0 self.datastore.get_new_device_msgs_for_remote = (