diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-31 13:44:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 13:44:04 +0100 |
| commit | 5de936caa1c1d607c39b09909ee983568e31ebb1 (patch) | |
| tree | 2ef87b37cdef97b54375d575216dd60039d31d1b /synapse/storage/events.py | |
| parent | Merge pull request #3629 from ptman/patch-1 (diff) | |
| parent | reinstate explicit include of EventsWorkerStore (diff) | |
| download | synapse-5de936caa1c1d607c39b09909ee983568e31ebb1.tar.xz | |
Merge pull request #3612 from matrix-org/rav/store_heirarchy
Make EventStore inherit from EventFederationStore
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 2f482af3a1..c98e524ba1 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -34,6 +34,8 @@ from synapse.api.errors import SynapseError from synapse.events import EventBase # noqa: F401 from synapse.events.snapshot import EventContext # noqa: F401 from synapse.metrics.background_process_metrics import run_as_background_process +from synapse.storage.background_updates import BackgroundUpdateStore +from synapse.storage.event_federation import EventFederationStore from synapse.storage.events_worker import EventsWorkerStore from synapse.types import RoomStreamToken, get_domain_from_id from synapse.util.async import ObservableDeferred @@ -193,7 +195,9 @@ def _retry_on_integrity_error(func): return f -class EventsStore(EventsWorkerStore): +# inherits from EventFederationStore so that we can call _update_backward_extremities +# and _handle_mult_prev_events (though arguably those could both be moved in here) +class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore): EVENT_ORIGIN_SERVER_TS_NAME = "event_origin_server_ts" EVENT_FIELDS_SENDER_URL_UPDATE_NAME = "event_fields_sender_url" |