Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-22 11:04:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Comments

Browse Source
This commit is contained in:
Erik Johnston 2015-08-11 11:40:40 +01:00
parent 6eaa116867
commit 53a817518b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/storage/_base.py
View File

@ -315,6 +315,8 @@ class CacheListDescriptor(object):
ret_d = ObservableDeferred(ret_d) ret_d = ObservableDeferred(ret_d)
# We need to create deferreds for each arg in the list so that
# we can insert the new deferred into the cache.
for arg in missing: for arg in missing:
observer = ret_d.observe() observer = ret_d.observe()
observer.addCallback(lambda r, arg: r[arg], arg) observer.addCallback(lambda r, arg: r[arg], arg)

14
synapse/storage/state.py
View File

@ -173,6 +173,9 @@ class StateStore(SQLBaseStore):
def _get_state_groups_from_groups(self, groups_and_types): def _get_state_groups_from_groups(self, groups_and_types):
"""Returns dictionary state_group -> state event ids """Returns dictionary state_group -> state event ids
Args:
groups_and_types (list): list of 2-tuple (`group`, `types`)
""" """
def f(txn): def f(txn):
results = {} results = {}
@ -284,8 +287,11 @@ class StateStore(SQLBaseStore):
def _get_state_for_group_from_cache(self, group, types=None): def _get_state_for_group_from_cache(self, group, 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 2-tuple (`state_dict`, `missing_types`). `missing_types` is the Returns 3-tuple (`state_dict`, `missing_types`, `got_all`).
list of types that aren't in the cache for that group. `missing_types` is the list of types that aren't in the cache for that
group, or None if `types` is None. `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, state_dict = self._state_group_cache.get(group) is_all, state_dict = self._state_group_cache.get(group)
@ -323,11 +329,13 @@ class StateStore(SQLBaseStore):
return True return True
return False return False
got_all = not (missing_types or types is None)
return { return {
k: v k: v
for k, v in state_dict.items() for k, v in state_dict.items()
if include(k[0], k[1]) if include(k[0], k[1])
}, missing_types, not missing_types and types is not None }, missing_types, got_all
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_state_for_groups(self, groups, types=None): def _get_state_for_groups(self, groups, types=None):