summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-06-22 11:20:20 +0100
committerGitHub <noreply@github.com>2018-06-22 11:20:20 +0100
commit240f1925238aa76eb37a924de14ab6f906952e79 (patch)
tree239c2f8466f6e0a3ffc4420bb811d94b2c036f92 /synapse/storage/state.py
parentMerge pull request #3419 from matrix-org/rav/events_per_request (diff)
parentOptimise state_group_cache update (diff)
downloadsynapse-240f1925238aa76eb37a924de14ab6f906952e79.tar.xz
Merge pull request #3382 from matrix-org/rav/optimise_state_groups
Optimise state_group_cache update
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 85b8ec2b8f..986a20400c 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -567,11 +567,7 @@ class StateGroupWorkerStore(SQLBaseStore):
             # from the database.
             for group, group_state_dict in iteritems(group_to_state_dict):
                 state_dict = results[group]
-
-                state_dict.update(
-                    ((intern_string(k[0]), intern_string(k[1])), to_ascii(v))
-                    for k, v in iteritems(group_state_dict)
-                )
+                state_dict.update(group_state_dict)
 
                 self._state_group_cache.update(
                     cache_seq_num,