diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-11-08 09:22:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-08 09:22:13 +0000 |
commit | 02a9a93bdec7bdb5fb2585e8e314002f5e55d31b (patch) | |
tree | 58ca4b4feab3cd96748de53ec03a486e1ee1791f /synapse/storage/_base.py | |
parent | Merge pull request #2643 from matrix-org/matthew/user_dir_typos (diff) | |
parent | s/items/iteritems/ (diff) | |
download | synapse-02a9a93bdec7bdb5fb2585e8e314002f5e55d31b.tar.xz |
Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_res
Fix bug in state group storage
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r-- | synapse/storage/_base.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 6caf7b3356..a37d1934ec 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -16,8 +16,6 @@ import logging from synapse.api.errors import StoreError from synapse.util.logcontext import LoggingContext, PreserveLoggingContext -from synapse.util.caches import CACHE_SIZE_FACTOR -from synapse.util.caches.dictionary_cache import DictionaryCache from synapse.util.caches.descriptors import Cache from synapse.storage.engines import PostgresEngine import synapse.metrics @@ -180,10 +178,6 @@ class SQLBaseStore(object): self._get_event_cache = Cache("*getEvent*", keylen=3, max_entries=hs.config.event_cache_size) - self._state_group_cache = DictionaryCache( - "*stateGroupCache*", 100000 * CACHE_SIZE_FACTOR - ) - self._event_fetch_lock = threading.Condition() self._event_fetch_list = [] self._event_fetch_ongoing = 0 |