diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-10-23 16:44:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 16:44:43 +0100 |
| commit | e9a8c05bef24483c3d726e01a98441258b8af7a7 (patch) | |
| tree | e5c620e99e25646c3a03eaa783dff222d1f0b3c1 | |
| parent | Make synapse_port_db correctly create indexes (#6102) (diff) | |
| parent | Changelog (diff) | |
| download | synapse-e9a8c05bef24483c3d726e01a98441258b8af7a7.tar.xz | |
Merge pull request #6243 from matrix-org/babolivier/port_db_fix_imports
Fix import paths in synapse_port_db
| -rw-r--r-- | changelog.d/6243.bugfix | 1 | ||||
| -rwxr-xr-x | scripts/synapse_port_db | 30 |
2 files changed, 20 insertions, 11 deletions
diff --git a/changelog.d/6243.bugfix b/changelog.d/6243.bugfix new file mode 100644 index 0000000000..cd288c2a44 --- /dev/null +++ b/changelog.d/6243.bugfix @@ -0,0 +1 @@ +Make the `synapse_port_db` script create the right indexes on a new PostgreSQL database. diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db index 5a34d6f2f5..33f0bef0f2 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db @@ -33,19 +33,27 @@ from twisted.internet import defer, reactor from synapse.config.homeserver import HomeServerConfig from synapse.logging.context import PreserveLoggingContext from synapse.storage._base import LoggingTransaction -from synapse.storage.client_ips import ClientIpBackgroundUpdateStore -from synapse.storage.deviceinbox import DeviceInboxBackgroundUpdateStore -from synapse.storage.devices import DeviceBackgroundUpdateStore +from synapse.storage.data_stores.main.client_ips import ClientIpBackgroundUpdateStore +from synapse.storage.data_stores.main.deviceinbox import DeviceInboxBackgroundUpdateStore +from synapse.storage.data_stores.main.devices import DeviceBackgroundUpdateStore from synapse.storage.engines import create_engine -from synapse.storage.events_bg_updates import EventsBackgroundUpdatesStore -from synapse.storage.media_repository import MediaRepositoryBackgroundUpdateStore +from synapse.storage.data_stores.main.events_bg_updates import ( + EventsBackgroundUpdatesStore +) +from synapse.storage.data_stores.main.media_repository import ( + MediaRepositoryBackgroundUpdateStore +) from synapse.storage.prepare_database import prepare_database -from synapse.storage.registration import RegistrationBackgroundUpdateStore -from synapse.storage.roommember import RoomMemberBackgroundUpdateStore -from synapse.storage.search import SearchBackgroundUpdateStore -from synapse.storage.state import StateBackgroundUpdateStore -from synapse.storage.stats import StatsStore -from synapse.storage.user_directory import UserDirectoryBackgroundUpdateStore +from synapse.storage.data_stores.main.registration import ( + RegistrationBackgroundUpdateStore +) +from synapse.storage.data_stores.main.roommember import RoomMemberBackgroundUpdateStore +from synapse.storage.data_stores.main.search import SearchBackgroundUpdateStore +from synapse.storage.data_stores.main.state import StateBackgroundUpdateStore +from synapse.storage.data_stores.main.stats import StatsStore +from synapse.storage.data_stores.main.user_directory import ( + UserDirectoryBackgroundUpdateStore +) from synapse.util import Clock logger = logging.getLogger("synapse_port_db") |