diff options
| author | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
| commit | 041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch) | |
| tree | db669225768b3322fe4d63451fdd05799634599a /synapse/storage/search.py | |
| parent | Merge remote-tracking branch 'upstream/master' into feat-dockerfile (diff) | |
| parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff) | |
| download | synapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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 |