summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2021-11-19 18:52:36 +0000
committerDavid Robertson <davidr@element.io>2021-11-22 22:08:44 +0000
commitad30e4f4d7b8d2340b1d4ce66c4b07287b8f3257 (patch)
treea9c90dbce132356c2fd7f58f57d60fb12465412e
parentRemove redundant inheritances from DataStore (diff)
downloadsynapse-ad30e4f4d7b8d2340b1d4ce66c4b07287b8f3257.tar.xz
Import CacheInvalidationWorkers from cache.py
Missed one!
-rw-r--r--synapse/storage/databases/main/directory.py2
-rw-r--r--synapse/storage/databases/main/events_forward_extremities.py2
-rw-r--r--synapse/storage/databases/main/purge_events.py2
-rw-r--r--synapse/storage/databases/main/user_erasure_store.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/directory.py b/synapse/storage/databases/main/directory.py

index a3442814d7..5628d42e71 100644 --- a/synapse/storage/databases/main/directory.py +++ b/synapse/storage/databases/main/directory.py
@@ -17,7 +17,7 @@ from typing import Iterable, List, Optional, Tuple from synapse.api.errors import SynapseError from synapse.storage.database import LoggingTransaction -from synapse.storage.databases.main import CacheInvalidationWorkerStore +from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore from synapse.types import RoomAlias from synapse.util.caches.descriptors import cached diff --git a/synapse/storage/databases/main/events_forward_extremities.py b/synapse/storage/databases/main/events_forward_extremities.py
index 68901b4335..aa47a2aee4 100644 --- a/synapse/storage/databases/main/events_forward_extremities.py +++ b/synapse/storage/databases/main/events_forward_extremities.py
@@ -17,7 +17,7 @@ from typing import Any, Dict, List from synapse.api.errors import SynapseError from synapse.storage.database import LoggingTransaction -from synapse.storage.databases.main import CacheInvalidationWorkerStore +from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore from synapse.storage.databases.main.event_federation import EventFederationWorkerStore logger = logging.getLogger(__name__) diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index 3eb30944bf..2f9fdb18e2 100644 --- a/synapse/storage/databases/main/purge_events.py +++ b/synapse/storage/databases/main/purge_events.py
@@ -16,7 +16,7 @@ import logging from typing import Any, List, Set, Tuple from synapse.api.errors import SynapseError -from synapse.storage.databases.main import CacheInvalidationWorkerStore +from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore from synapse.storage.databases.main.state import StateGroupWorkerStore from synapse.types import RoomStreamToken diff --git a/synapse/storage/databases/main/user_erasure_store.py b/synapse/storage/databases/main/user_erasure_store.py
index f79006533f..eb277b9df3 100644 --- a/synapse/storage/databases/main/user_erasure_store.py +++ b/synapse/storage/databases/main/user_erasure_store.py
@@ -15,7 +15,7 @@ from typing import Dict, Iterable from synapse.storage.database import LoggingTransaction -from synapse.storage.databases.main import CacheInvalidationWorkerStore +from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore from synapse.util.caches.descriptors import cached, cachedList