diff options
author | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
commit | 6e80c03d45c3d09a7e7457f58beff69f14034964 (patch) | |
tree | 06d05072f93e410dbccba1437d7fd5a545c10b86 /synapse/storage/state.py | |
parent | Explicit join (diff) | |
parent | Merge pull request #1032 from matrix-org/matthew/workerdoc (diff) | |
download | synapse-6e80c03d45c3d09a7e7457f58beff69f14034964.tar.xz |
Merge branch 'develop' into dbkr/notifications_api
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r-- | synapse/storage/state.py | 4 |
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", |