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

Correctly intern keys in state cache

1 files changed, 4 insertions, 1 deletions

diff --git a/synapse/storage/state.py b/synapse/storage/state.py

index 49abf0ac74..23e7ad9922 100644
--- 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,