OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

incorporate more review.

pull/2970/head
Matthew Hodgson 2018-07-25 16:15:33 +01:00
parent cb5c37a57c
commit 7d9fb88617
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
synapse/storage/state.py
View File

@ -493,12 +493,6 @@ class StateGroupWorkerStore(SQLBaseStore):
def _get_some_state_from_cache(self, group, types, filtered_types=None): def _get_some_state_from_cache(self, group, types, filtered_types=None):
"""Checks if group is in cache. See `_get_state_for_groups` """Checks if group is in cache. See `_get_state_for_groups`
Returns 3-tuple (`state_dict`, `missing_types`, `got_all`).
`missing_types` is the list of types that aren't in the cache for that
group. `got_all` is a bool indicating if we successfully retrieved all
requests state from the cache, if False we need to query the DB for the
missing state.
Args: Args:
group(int): The state group to lookup group(int): The state group to lookup
types(list[str, str|None]): List of 2-tuples of the form types(list[str, str|None]): List of 2-tuples of the form
@ -507,6 +501,11 @@ class StateGroupWorkerStore(SQLBaseStore):
filtered_types(list[str]|None): Only apply filtering via `types` to this filtered_types(list[str]|None): Only apply filtering via `types` to this
list of event types. Other types of events are returned unfiltered. list of event types. Other types of events are returned unfiltered.
If None, `types` filtering is applied to all events. If None, `types` filtering is applied to all events.
Returns 2-tuple (`state_dict`, `got_all`).
`got_all` is a bool indicating if we successfully retrieved all
requests state from the cache, if False we need to query the DB for the
missing state.
""" """
is_all, known_absent, state_dict_ids = self._state_group_cache.get(group) is_all, known_absent, state_dict_ids = self._state_group_cache.get(group)
@ -520,7 +519,7 @@ class StateGroupWorkerStore(SQLBaseStore):
if ( if (
state_key is None or state_key is None or
filtered_types is not None and typ not in filtered_types (filtered_types is not None and typ not in filtered_types)
): ):
type_to_key[typ] = None type_to_key[typ] = None
# we mark the type as missing from the cache because # we mark the type as missing from the cache because
@ -547,18 +546,17 @@ class StateGroupWorkerStore(SQLBaseStore):
return True return True
return False return False
if types == [] and filtered_types is not None:
# special wildcard case for empty type-list but an explicit filtered_types
# which means that we'll try to return all types which aren't in the
# filtered_types list. missing_types will always be empty, so we ignore it.
got_all = is_all got_all = is_all
else: if not got_all:
got_all = is_all or not missing_types # the cache is incomplete. We may still have got all the results we need, if
# we don't have any wildcards in the match list.
if not missing_types and filtered_types is None:
got_all = True
return { return {
k: v for k, v in iteritems(state_dict_ids) k: v for k, v in iteritems(state_dict_ids)
if include(k[0], k[1]) if include(k[0], k[1])
}, missing_types, got_all }, got_all
def _get_all_state_from_cache(self, group): def _get_all_state_from_cache(self, group):
"""Checks if group is in cache. See `_get_state_for_groups` """Checks if group is in cache. See `_get_state_for_groups`
@ -603,7 +601,7 @@ class StateGroupWorkerStore(SQLBaseStore):
missing_groups = [] missing_groups = []
if types is not None: if types is not None:
for group in set(groups): for group in set(groups):
state_dict_ids, _, got_all = self._get_some_state_from_cache( state_dict_ids, got_all = self._get_some_state_from_cache(
group, types, filtered_types group, types, filtered_types
) )
results[group] = state_dict_ids results[group] = state_dict_ids