tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Store absence of state in cache

Browse source
This commit is contained in:
Erik Johnston 2015-08-07 10:17:38 +01:00
parent 1d08bf7c17
commit fe994e728f
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
synapse/storage/state.py
View file

@ -234,7 +234,8 @@ class StateStore(SQLBaseStore):
]) ])
sql = ( sql = (
"SELECT sg.event_id FROM state_groups_state as sg" "SELECT e.event_id, sg.state_group, sg.event_id"
" FROM state_groups_state as sg"
" INNER JOIN event_to_state_groups as e" " INNER JOIN event_to_state_groups as e"
" ON e.state_group = sg.state_group" " ON e.state_group = sg.state_group"
" WHERE e.event_id = ? AND (%s)" " WHERE e.event_id = ? AND (%s)"
@ -342,8 +343,9 @@ class StateStore(SQLBaseStore):
defer.returnValue(state_dict) defer.returnValue(state_dict)
if is_all or (types is not None and not missing_types): if is_all or (types is not None and not missing_types):
sentinel = object()
def include(typ, state_key): def include(typ, state_key):
sentinel = object()
valid_state_keys = type_to_key.get(typ, sentinel) valid_state_keys = type_to_key.get(typ, sentinel)
if valid_state_keys is sentinel: if valid_state_keys is sentinel:
return False return False
@ -356,20 +358,24 @@ class StateStore(SQLBaseStore):
defer.returnValue({ defer.returnValue({
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 v and include(k[0], k[1])
}) })
# Okay, so we have some missing_types, lets fetch them. # Okay, so we have some missing_types, lets fetch them.
cache_seq_num = self._state_group_cache.sequence cache_seq_num = self._state_group_cache.sequence
_, state_ids = yield self._get_state_groups_from_group( _, state_ids = yield self._get_state_groups_from_group(
group, group,
frozenset(types) if types else None frozenset(missing_types) if types else None
) )
state_events = yield self._get_events(state_ids, get_prev_content=False) state_events = yield self._get_events(state_ids, get_prev_content=False)
state_dict = { state_dict = {
key: None
for key in missing_types
}
state_dict.update({
(e.type, e.state_key): e (e.type, e.state_key): e
for e in state_events for e in state_events
} })
# Update the cache # Update the cache
self._state_group_cache.update( self._state_group_cache.update(
@ -379,7 +385,11 @@ class StateStore(SQLBaseStore):
full=(types is None), full=(types is None),
) )
defer.returnValue(state_dict) defer.returnValue({
key: value
for key, value in state_dict.items()
if value
})
def _make_group_id(clock): def _make_group_id(clock):