diff options
author | Erik Johnston <erik@matrix.org> | 2017-11-13 10:05:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-11-13 10:05:33 +0000 |
commit | ab335edb023d66cd0be439e045b10ca104b73cb5 (patch) | |
tree | fefab30c2a333c4824464f4554ecc1c48b1deca0 /synapse/storage/state.py | |
parent | Up cache size of get_global_account_data_by_type_for_user (diff) | |
download | synapse-ab335edb023d66cd0be439e045b10ca104b73cb5.tar.xz |
Revert "move _state_group_cache to statestore"
This reverts commit f5cf3638e9c6086e1c33ddad8eda9298cf53a58e.
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r-- | synapse/storage/state.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py index a1da3ad7a5..5673e4aa96 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -13,17 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import namedtuple -import logging +from ._base import SQLBaseStore +from synapse.util.caches.descriptors import cached, cachedList +from synapse.util.caches import intern_string +from synapse.util.stringutils import to_ascii +from synapse.storage.engines import PostgresEngine from twisted.internet import defer +from collections import namedtuple -from synapse.storage.engines import PostgresEngine -from synapse.util.caches import intern_string, CACHE_SIZE_FACTOR -from synapse.util.caches.descriptors import cached, cachedList -from synapse.util.caches.dictionary_cache import DictionaryCache -from synapse.util.stringutils import to_ascii -from ._base import SQLBaseStore +import logging logger = logging.getLogger(__name__) @@ -82,10 +81,6 @@ class StateStore(SQLBaseStore): where_clause="type='m.room.member'", ) - self._state_group_cache = DictionaryCache( - "*stateGroupCache*", 100000 * CACHE_SIZE_FACTOR - ) - @cached(max_entries=100000, iterable=True) def get_current_state_ids(self, room_id): """Get the current state event ids for a room based on the |