Merge pull request #2154 from matrix-org/erikj/remove_unused_cache

Remove unused cache
pull/1036/merge
Erik Johnston 2017-04-24 14:24:46 +01:00 committed by GitHub
commit 26bcda31b8
2 changed files with 1 additions and 9 deletions

View File

@ -102,9 +102,6 @@ class SlavedEventStore(BaseSlavedStore):
_get_state_groups_from_groups_txn = ( _get_state_groups_from_groups_txn = (
DataStore._get_state_groups_from_groups_txn.__func__ 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 = ( get_recent_event_ids_for_room = (
StreamStore.__dict__["get_recent_event_ids_for_room"] StreamStore.__dict__["get_recent_event_ids_for_room"]
) )

View File

@ -279,12 +279,7 @@ class StateStore(SQLBaseStore):
return count return count
@cached(num_args=2, max_entries=100000, iterable=True) @defer.inlineCallbacks
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)
def _get_state_groups_from_groups(self, groups, types): def _get_state_groups_from_groups(self, groups, types):
"""Returns dictionary state_group -> (dict of (type, state_key) -> event id) """Returns dictionary state_group -> (dict of (type, state_key) -> event id)
""" """