Merge pull request #1617 from matrix-org/erikj/intern_state_dict

Correctly intern keys in state cache
2016-11-15 16:45:55 +00:00 · 2016-11-15 16:45:55 +00:00 · c7546b3cdb
parent f9d156d270 587d8ac60f
commit c7546b3cdb
1 changed files with 4 additions and 1 deletions
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@ -653,7 +653,10 @@ class StateStore(SQLBaseStore):
                else:
                    state_dict = results[group]

-                state_dict.update(group_state_dict)
+                state_dict.update({
+                    (intern_string(k[0]), intern_string(k[1])): v
+                    for k, v in group_state_dict.items()
+                })

                self._state_group_cache.update(
                    cache_seq_num,