diff options
| author | Erik Johnston <erikj@jki.re> | 2019-03-11 09:22:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 09:22:33 +0000 |
| commit | ca7f7d84f4121b24fc6c133e82bb46f1e4a2f52d (patch) | |
| tree | 60fcb924a8018fee7551df7f6157e9fff754dd9f | |
| parent | Merge pull request #4814 from matrix-org/erikj/soft_fail_impl (diff) | |
| parent | Add comment to schema (diff) | |
| download | synapse-ca7f7d84f4121b24fc6c133e82bb46f1e4a2f52d.tar.xz | |
Merge pull request #4837 from matrix-org/erikj/optional_prev_state
Make `prev_state` field optional
| -rw-r--r-- | changelog.d/4837.bugfix | 1 | ||||
| -rw-r--r-- | synapse/events/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/storage/events.py | 15 | ||||
| -rw-r--r-- | synapse/storage/schema/full_schemas/11/event_edges.sql | 2 |
4 files changed, 3 insertions, 16 deletions
diff --git a/changelog.d/4837.bugfix b/changelog.d/4837.bugfix new file mode 100644 index 0000000000..989aeb82bb --- /dev/null +++ b/changelog.d/4837.bugfix @@ -0,0 +1 @@ +Fix bug where synapse expected an un-specced `prev_state` field on state events. diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index bd130f8816..fafa135182 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -141,7 +141,6 @@ class EventBase(object): origin = _event_dict_property("origin") origin_server_ts = _event_dict_property("origin_server_ts") prev_events = _event_dict_property("prev_events") - prev_state = _event_dict_property("prev_state") redacts = _event_dict_property("redacts") room_id = _event_dict_property("room_id") sender = _event_dict_property("sender") diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 990a5eaaae..428300ea0a 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1407,21 +1407,6 @@ class EventsStore(StateGroupWorkerStore, EventFederationStore, EventsWorkerStore values=state_values, ) - self._simple_insert_many_txn( - txn, - table="event_edges", - values=[ - { - "event_id": event.event_id, - "prev_event_id": prev_id, - "room_id": event.room_id, - "is_state": True, - } - for event, _ in state_events_and_contexts - for prev_id, _ in event.prev_state - ], - ) - # Prefill the event cache self._add_to_cache(txn, events_and_contexts) diff --git a/synapse/storage/schema/full_schemas/11/event_edges.sql b/synapse/storage/schema/full_schemas/11/event_edges.sql index 52eec88357..bccd1c6f74 100644 --- a/synapse/storage/schema/full_schemas/11/event_edges.sql +++ b/synapse/storage/schema/full_schemas/11/event_edges.sql @@ -37,6 +37,8 @@ CREATE TABLE IF NOT EXISTS event_edges( event_id TEXT NOT NULL, prev_event_id TEXT NOT NULL, room_id TEXT NOT NULL, + -- We no longer insert prev_state into this table, so all new rows will have + -- is_state as false. is_state BOOL NOT NULL, UNIQUE (event_id, prev_event_id, room_id, is_state) ); |