diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-03-17 12:33:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 12:33:18 +0000 |
| commit | 567f88f835a55d2241cc129ac44b8b0dcedfa6e2 (patch) | |
| tree | 0f21914aebcaef0735edb3a585b200e0651edb90 /synapse/storage/databases/main/events_worker.py | |
| parent | Add type hints to the room member handler. (#9631) (diff) | |
| download | synapse-567f88f835a55d2241cc129ac44b8b0dcedfa6e2.tar.xz | |
Prep work for removing `outlier` from `internal_metadata` (#9411)
* Populate `internal_metadata.outlier` based on `events` table Rather than relying on `outlier` being in the `internal_metadata` column, populate it based on the `events.outlier` column. * Move `outlier` out of InternalMetadata._dict Ultimately, this will allow us to stop writing it to the database. For now, we have to grandfather it back in so as to maintain compatibility with older versions of Synapse.
Diffstat (limited to 'synapse/storage/databases/main/events_worker.py')
| -rw-r--r-- | synapse/storage/databases/main/events_worker.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/events_worker.py b/synapse/storage/databases/main/events_worker.py index c04e162ccc..952d4969b2 100644 --- a/synapse/storage/databases/main/events_worker.py +++ b/synapse/storage/databases/main/events_worker.py @@ -799,6 +799,7 @@ class EventsWorkerStore(SQLBaseStore): rejected_reason=rejected_reason, ) original_ev.internal_metadata.stream_ordering = row["stream_ordering"] + original_ev.internal_metadata.outlier = row["outlier"] event_map[event_id] = original_ev @@ -905,7 +906,8 @@ class EventsWorkerStore(SQLBaseStore): ej.json, ej.format_version, r.room_version, - rej.reason + rej.reason, + e.outlier FROM events AS e JOIN event_json AS ej USING (event_id) LEFT JOIN rooms r ON r.room_id = e.room_id @@ -929,6 +931,7 @@ class EventsWorkerStore(SQLBaseStore): "room_version_id": row[5], "rejected_reason": row[6], "redactions": [], + "outlier": row[7], } # check for redactions |