diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-03-29 23:05:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-03-29 23:17:12 +0100 |
| commit | 2fe3f848b92ee9493a724935167fad84678a7eb2 (patch) | |
| tree | f826f14cef84cc40f5921ae5844468274d1e299a /synapse/storage/room.py | |
| parent | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creation (diff) | |
| download | synapse-2fe3f848b92ee9493a724935167fad84678a7eb2.tar.xz | |
Remove uses of events.content
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 908551d6d9..740c036975 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -594,7 +594,8 @@ class RoomStore(RoomWorkerStore, SearchStore): while next_token: sql = """ - SELECT stream_ordering, content FROM events + SELECT stream_ordering, json FROM events + JOIN event_json USING (event_id) WHERE room_id = ? AND stream_ordering < ? AND contains_url = ? AND outlier = ? @@ -606,8 +607,8 @@ class RoomStore(RoomWorkerStore, SearchStore): next_token = None for stream_ordering, content_json in txn: next_token = stream_ordering - content = json.loads(content_json) - + event_json = json.loads(content_json) + content = event_json["content"] content_url = content.get("url") thumbnail_url = content.get("info", {}).get("thumbnail_url") |