diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-05 15:02:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 15:02:17 +0100 |
| commit | 22284a6f65ae8094cc3ebea5107897e8cddeaa03 (patch) | |
| tree | 57c983615ea322809b48376524a73837c17582a0 /synapse/storage/search.py | |
| parent | Merge pull request #3063 from matrix-org/jcgruenhage/cache_settings_stats (diff) | |
| parent | Remove uses of events.content (diff) | |
| download | synapse-22284a6f65ae8094cc3ebea5107897e8cddeaa03.tar.xz | |
Merge pull request #3060 from matrix-org/rav/kill_event_content
Remove uses of events.content
Diffstat (limited to 'synapse/storage/search.py')
| -rw-r--r-- | synapse/storage/search.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py index 984643b057..426cbe6e1a 100644 --- a/synapse/storage/search.py +++ b/synapse/storage/search.py @@ -75,8 +75,9 @@ class SearchStore(BackgroundUpdateStore): def reindex_search_txn(txn): sql = ( - "SELECT stream_ordering, event_id, room_id, type, content, " + "SELECT stream_ordering, event_id, room_id, type, json, " " origin_server_ts FROM events" + " JOIN event_json USING (event_id)" " WHERE ? <= stream_ordering AND stream_ordering < ?" " AND (%s)" " ORDER BY stream_ordering DESC" @@ -104,7 +105,8 @@ class SearchStore(BackgroundUpdateStore): stream_ordering = row["stream_ordering"] origin_server_ts = row["origin_server_ts"] try: - content = json.loads(row["content"]) + event_json = json.loads(row["json"]) + content = event_json["content"] except Exception: continue |