diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-24 14:24:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 14:24:46 +0100 |
| commit | 26bcda31b8c37b230ffa01873dbe06e34a35bcc5 (patch) | |
| tree | 180d40e166876fa896eb3fcc166c1f32988b9328 | |
| parent | Document some of the admin APIs (#2143) (diff) | |
| parent | Remove unused cache (diff) | |
| download | synapse-26bcda31b8c37b230ffa01873dbe06e34a35bcc5.tar.xz | |
Merge pull request #2154 from matrix-org/erikj/remove_unused_cache
Remove unused cache
| -rw-r--r-- | synapse/replication/slave/storage/events.py | 3 | ||||
| -rw-r--r-- | synapse/storage/state.py | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 4ca1e5aa8c..ab48ff925e 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -102,9 +102,6 @@ class SlavedEventStore(BaseSlavedStore): _get_state_groups_from_groups_txn = ( DataStore._get_state_groups_from_groups_txn.__func__ ) - _get_state_group_from_group = ( - StateStore.__dict__["_get_state_group_from_group"] - ) get_recent_event_ids_for_room = ( StreamStore.__dict__["get_recent_event_ids_for_room"] ) diff --git a/synapse/storage/state.py b/synapse/storage/state.py index acd69944c4..927a936013 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -279,12 +279,7 @@ class StateStore(SQLBaseStore): return count - @cached(num_args=2, max_entries=100000, iterable=True) - def _get_state_group_from_group(self, group, types): - raise NotImplementedError() - - @cachedList(cached_method_name="_get_state_group_from_group", - list_name="groups", num_args=2, inlineCallbacks=True) + @defer.inlineCallbacks def _get_state_groups_from_groups(self, groups, types): """Returns dictionary state_group -> (dict of (type, state_key) -> event id) """ |