summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2021-11-19 17:47:45 +0000
committerDavid Robertson <davidr@element.io>2021-11-22 22:06:06 +0000
commita6bb41019aafc9feeedc325676a71dc24a594fa8 (patch)
tree7f0a46a3bd0e26fb537c00cfde29e13d1e2a351b
parentPrune AdminCmdSlavedStore and GenericWorkerSlavedStore (diff)
downloadsynapse-a6bb41019aafc9feeedc325676a71dc24a594fa8.tar.xz
Remove redundant inheritances from DataStore
DataStore continues to inherit from SearchStore via
['DataStore', 'RoomStore', 'SearchStore']
DataStore continues to inherit inherits from MonthlyActiveUsersStore via
['DataStore', 'ClientIpStore', 'MonthlyActiveUsersStore']
DataStore inherits from StatsStore via redundantly
['DataStore', 'RegistrationStore', 'StatsStore']
DataStore inherits from CacheInvalidationWorkerStore via e.g
['DataStore', 'EventForwardExtremitiesStore', 'CacheInvalidationWorkerStore']

lint
-rw-r--r--synapse/storage/databases/main/__init__.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/storage/databases/main/__init__.py b/synapse/storage/databases/main/__init__.py
index 9ff2d8d8c3..1b54fb7b52 100644
--- a/synapse/storage/databases/main/__init__.py
+++ b/synapse/storage/databases/main/__init__.py
@@ -31,7 +31,6 @@ from synapse.util.caches.stream_change_cache import StreamChangeCache
 
 from .account_data import AccountDataStore
 from .appservice import ApplicationServiceStore, ApplicationServiceTransactionStore
-from .cache import CacheInvalidationWorkerStore
 from .censor_events import CensorEventsStore
 from .client_ips import ClientIpStore
 from .deviceinbox import DeviceInboxStore
@@ -49,7 +48,6 @@ from .keys import KeyStore
 from .lock import LockStore
 from .media_repository import MediaRepositoryStore
 from .metrics import ServerMetricsStore
-from .monthly_active_users import MonthlyActiveUsersStore
 from .openid import OpenIdStore
 from .presence import PresenceStore
 from .profile import ProfileStore
@@ -63,11 +61,9 @@ from .relations import RelationsStore
 from .room import RoomStore
 from .room_batch import RoomBatchStore
 from .roommember import RoomMemberStore
-from .search import SearchStore
 from .session import SessionStore
 from .signatures import SignatureStore
 from .state import StateStore
-from .stats import StatsStore
 from .stream import StreamStore
 from .tags import TagsStore
 from .transactions import TransactionWorkerStore
@@ -107,7 +103,6 @@ class DataStore(
     ReceiptsStore,
     EndToEndKeyStore,
     EndToEndRoomKeyStore,
-    SearchStore,
     TagsStore,
     AccountDataStore,
     EventPushActionsStore,
@@ -118,13 +113,10 @@ class DataStore(
     UserDirectoryStore,
     GroupServerStore,
     UserErasureStore,
-    MonthlyActiveUsersStore,
-    StatsStore,
     RelationsStore,
     CensorEventsStore,
     UIAuthStore,
     EventForwardExtremitiesStore,
-    CacheInvalidationWorkerStore,
     ServerMetricsStore,
     LockStore,
     SessionStore,