diff options
| author | Erik Johnston <erikj@jki.re> | 2016-11-15 16:45:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 16:45:55 +0000 |
| commit | c7546b3cdbe45b613f4e5e5fc4028ffc7f5c2207 (patch) | |
| tree | 4c8fc4fc7471eb37161dcf7ea75ae45e59d6d635 /synapse | |
| parent | New Flake8 fixes (diff) | |
| parent | Correctly intern keys in state cache (diff) | |
| download | synapse-c7546b3cdbe45b613f4e5e5fc4028ffc7f5c2207.tar.xz | |
Merge pull request #1617 from matrix-org/erikj/intern_state_dict
Correctly intern keys in state cache
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/state.py | 5 |
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, |