diff options
author | David Robertson <davidr@element.io> | 2022-12-12 16:19:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-12 16:19:30 +0000 |
commit | b5b5f6608462a988b05502a3b70b6a57ca3846d2 (patch) | |
tree | a0f095dda26f6ebeff9fc8867a7d6f3ca608a377 /synapse/storage/controllers | |
parent | Revert the deletion of stale devices due to performance issues. (#14662) (diff) | |
download | synapse-b5b5f6608462a988b05502a3b70b6a57ca3846d2.tar.xz |
Move `StateFilter` to `synapse.types` (#14668)
* Move `StateFilter` to `synapse.types` * Changelog
Diffstat (limited to 'synapse/storage/controllers')
-rw-r--r-- | synapse/storage/controllers/persist_events.py | 2 | ||||
-rw-r--r-- | synapse/storage/controllers/state.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/controllers/persist_events.py b/synapse/storage/controllers/persist_events.py index 33ffef521b..f1d2c71c91 100644 --- a/synapse/storage/controllers/persist_events.py +++ b/synapse/storage/controllers/persist_events.py @@ -58,13 +58,13 @@ from synapse.storage.controllers.state import StateStorageController from synapse.storage.databases import Databases from synapse.storage.databases.main.events import DeltaState from synapse.storage.databases.main.events_worker import EventRedactBehaviour -from synapse.storage.state import StateFilter from synapse.types import ( PersistedEventPosition, RoomStreamToken, StateMap, get_domain_from_id, ) +from synapse.types.state import StateFilter from synapse.util.async_helpers import ObservableDeferred, yieldable_gather_results from synapse.util.metrics import Measure diff --git a/synapse/storage/controllers/state.py b/synapse/storage/controllers/state.py index 2b31ce54bb..26d79c6e62 100644 --- a/synapse/storage/controllers/state.py +++ b/synapse/storage/controllers/state.py @@ -31,12 +31,12 @@ from synapse.api.constants import EventTypes from synapse.events import EventBase from synapse.logging.opentracing import tag_args, trace from synapse.storage.roommember import ProfileInfo -from synapse.storage.state import StateFilter from synapse.storage.util.partial_state_events_tracker import ( PartialCurrentStateTracker, PartialStateEventsTracker, ) from synapse.types import MutableStateMap, StateMap +from synapse.types.state import StateFilter from synapse.util.cancellation import cancellable if TYPE_CHECKING: |