diff options
| author | Erik Johnston <erikj@jki.re> | 2017-03-24 11:40:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 11:40:08 +0000 |
| commit | 57cfa513f5ff939d88ebb3a213d977517395a631 (patch) | |
| tree | 6e658aa7007fd8f890a631c5ea8c654b721d375d /synapse/storage/account_data.py | |
| parent | Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestToken (diff) | |
| parent | Replace some calls to cursor_to_dict (diff) | |
| download | synapse-57cfa513f5ff939d88ebb3a213d977517395a631.tar.xz | |
Merge pull request #2054 from matrix-org/erikj/user_iter_cursor
Reduce some CPU work on DB threads
Diffstat (limited to 'synapse/storage/account_data.py')
| -rw-r--r-- | synapse/storage/account_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/account_data.py b/synapse/storage/account_data.py index 3fa226e92d..aa84ffc2b0 100644 --- a/synapse/storage/account_data.py +++ b/synapse/storage/account_data.py @@ -182,7 +182,7 @@ class AccountDataStore(SQLBaseStore): txn.execute(sql, (user_id, stream_id)) global_account_data = { - row[0]: json.loads(row[1]) for row in txn.fetchall() + row[0]: json.loads(row[1]) for row in txn } sql = ( @@ -193,7 +193,7 @@ class AccountDataStore(SQLBaseStore): txn.execute(sql, (user_id, stream_id)) account_data_by_room = {} - for row in txn.fetchall(): + for row in txn: room_account_data = account_data_by_room.setdefault(row[0], {}) room_account_data[row[1]] = json.loads(row[2]) |