Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move persist_events out from main data store. #6240

Merged
merged 6 commits into from Oct 30, 2019

Conversation

@erikjohnston
Copy link
Member

erikjohnston commented Oct 23, 2019

This is in preparation for splitting out of state_groups_state from the
main store into it own one, as persisting events depends on calculating
state.

Broadly I've just moved functions from the main data store up into an EventPersistenceStore and changed calls to storage functions to self.main_store.* and self.state_store.*

This is in preparation for splitting out of state_groups_state from the
main store into it own one, as persisting events depends on calculating
state.
@erikjohnston erikjohnston force-pushed the erikj/split_out_persistence_store branch from d008268 to ab581c2 Oct 23, 2019
@erikjohnston

This comment has been minimized.

Copy link
Member Author

erikjohnston commented Oct 23, 2019

I'm currently fiddling to change the way we access the persistence store ftr

@erikjohnston erikjohnston force-pushed the erikj/split_out_persistence_store branch from ab581c2 to 9fb9688 Oct 23, 2019
@erikjohnston

This comment has been minimized.

Copy link
Member Author

erikjohnston commented Oct 23, 2019

So the plan is broadly that all the new storage classes get added to the Storage class (accessed via get_storage) and that getting the main data store directly via get_datastore() is sort of deprecated?

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Oct 23, 2019
@erikjohnston erikjohnston added this to In progress in Homeserver Task Board via automation Oct 24, 2019
@erikjohnston erikjohnston moved this from In progress to Review in Homeserver Task Board Oct 25, 2019
Copy link
Member

richvdh left a comment

generally lgtm, though it's not easy to see from the diff what's happening. A few requests for docstrings etc

synapse/server.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/events.py Outdated Show resolved Hide resolved
synapse/storage/data_stores/main/events.py Outdated Show resolved Hide resolved
@erikjohnston erikjohnston force-pushed the erikj/split_out_persistence_store branch from a73963e to ec6de1c Oct 30, 2019
@erikjohnston erikjohnston merged commit b7fe62b into develop Oct 30, 2019
20 checks passed
20 checks passed
buildkite/synapse Build #5253 passed (21 minutes, 3 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 37 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 46 seconds)
Details
buildkite/synapse/isort Passed (17 seconds)
Details
buildkite/synapse/mypy Passed (27 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (16 seconds)
Details
buildkite/synapse/packaging Passed (17 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (19 minutes, 5 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 25 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (9 minutes, 33 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 19 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (17 minutes, 48 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (18 minutes, 26 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (6 minutes, 45 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (1 minute, 15 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (1 minute, 21 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (13 minutes, 52 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (14 minutes, 13 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (14 minutes, 22 seconds)
Details
Homeserver Task Board automation moved this from Review to Done Oct 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
2 participants
You can’t perform that action at this time.