summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-19 16:29:58 +0100
committerGitHub <noreply@github.com>2016-08-19 16:29:58 +0100
commite6784daf0777c24a8efd2fe0c2d72f730369ad2b (patch)
treebdf2f54eaedc0d8ec3c5ecb2efde6e35521ae179 /synapse/storage/state.py
parentMerge pull request #1029 from matrix-org/erikj/appservice_stream (diff)
parentEnsure invalidation list does not grow unboundedly (diff)
downloadsynapse-e6784daf0777c24a8efd2fe0c2d72f730369ad2b.tar.xz
Merge pull request #1030 from matrix-org/erikj/cache_contexts
Add concept of cache contexts
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 5b743db67a..0e8fa93e1f 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -174,7 +174,7 @@ class StateStore(SQLBaseStore):
             return [r[0] for r in results]
         return self.runInteraction("get_current_state_for_key", f)
 
-    @cached(num_args=2, lru=True, max_entries=1000)
+    @cached(num_args=2, max_entries=1000)
     def _get_state_group_from_group(self, group, types):
         raise NotImplementedError()
 
@@ -272,7 +272,7 @@ class StateStore(SQLBaseStore):
         state_map = yield self.get_state_for_events([event_id], types)
         defer.returnValue(state_map[event_id])
 
-    @cached(num_args=2, lru=True, max_entries=10000)
+    @cached(num_args=2, max_entries=10000)
     def _get_state_group_for_event(self, room_id, event_id):
         return self._simple_select_one_onecol(
             table="event_to_state_groups",