OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2160 from matrix-org/erikj/reduce_join_cache_size 

Make state caches cache in ascii
pull/2168/head
Erik Johnston 2017-04-26 14:02:06 +01:00 committed by GitHub
parent 94f36b0273 f053a1409e
commit 7239258ae6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/storage/state.py
View File

@ -16,6 +16,7 @@
from ._base import SQLBaseStore from ._base import SQLBaseStore
from synapse.util.caches.descriptors import cached, cachedList from synapse.util.caches.descriptors import cached, cachedList
from synapse.util.caches import intern_string from synapse.util.caches import intern_string
from synapse.util.stringutils import to_ascii
from synapse.storage.engines import PostgresEngine from synapse.storage.engines import PostgresEngine
from twisted.internet import defer from twisted.internet import defer
@ -89,7 +90,7 @@ class StateStore(SQLBaseStore):
) )
return { return {
(r[0], r[1]): r[2] for r in txn (intern_string(r[0]), intern_string(r[1])): to_ascii(r[2]) for r in txn
} }
return self.runInteraction( return self.runInteraction(
@ -655,7 +656,7 @@ class StateStore(SQLBaseStore):
state_dict = results[group] state_dict = results[group]
state_dict.update( state_dict.update(
((intern_string(k[0]), intern_string(k[1])), v) ((intern_string(k[0]), intern_string(k[1])), to_ascii(v))
for k, v in group_state_dict.iteritems() for k, v in group_state_dict.iteritems()
) )