2014-10-15 05:04:55 -04:00
|
|
|
# -*- coding: utf-8 -*-
|
2015-01-06 08:21:39 -05:00
|
|
|
# Copyright 2014, 2015 OpenMarket Ltd
|
2014-10-15 05:04:55 -04:00
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
2015-08-11 12:59:32 -04:00
|
|
|
from ._base import SQLBaseStore
|
|
|
|
from synapse.util.caches.descriptors import (
|
|
|
|
cached, cachedInlineCallbacks, cachedList
|
|
|
|
)
|
2014-10-15 05:04:55 -04:00
|
|
|
|
2015-03-20 09:52:56 -04:00
|
|
|
from twisted.internet import defer
|
|
|
|
|
2015-01-06 06:18:12 -05:00
|
|
|
import logging
|
|
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
2014-10-15 05:04:55 -04:00
|
|
|
|
|
|
|
class StateStore(SQLBaseStore):
|
2014-11-12 09:33:34 -05:00
|
|
|
""" Keeps track of the state at a given event.
|
|
|
|
|
|
|
|
This is done by the concept of `state groups`. Every event is a assigned
|
|
|
|
a state group (identified by an arbitrary string), which references a
|
|
|
|
collection of state events. The current state of an event is then the
|
|
|
|
collection of state events referenced by the event's state group.
|
|
|
|
|
|
|
|
Hence, every change in the current state causes a new state group to be
|
|
|
|
generated. However, if no change happens (e.g., if we get a message event
|
|
|
|
with only one parent it inherits the state group from its parent.)
|
|
|
|
|
|
|
|
There are three tables:
|
|
|
|
* `state_groups`: Stores group name, first event with in the group and
|
|
|
|
room id.
|
|
|
|
* `event_to_state_groups`: Maps events to state groups.
|
|
|
|
* `state_groups_state`: Maps state group to state events.
|
|
|
|
"""
|
2014-10-15 05:04:55 -04:00
|
|
|
|
2015-05-13 06:13:31 -04:00
|
|
|
@defer.inlineCallbacks
|
2015-08-05 10:06:51 -04:00
|
|
|
def get_state_groups(self, room_id, event_ids):
|
2014-11-12 09:33:34 -05:00
|
|
|
""" Get the state groups for the given list of event_ids
|
|
|
|
|
|
|
|
The return value is a dict mapping group names to lists of events.
|
|
|
|
"""
|
2015-08-07 13:15:30 -04:00
|
|
|
if not event_ids:
|
|
|
|
defer.returnValue({})
|
2014-11-12 09:33:34 -05:00
|
|
|
|
2015-08-07 13:15:30 -04:00
|
|
|
event_to_groups = yield self._get_state_group_for_events(
|
2015-10-12 10:06:14 -04:00
|
|
|
event_ids,
|
2015-08-07 13:15:30 -04:00
|
|
|
)
|
2014-11-12 09:33:34 -05:00
|
|
|
|
2015-08-07 13:15:30 -04:00
|
|
|
groups = set(event_to_groups.values())
|
|
|
|
group_to_state = yield self._get_state_for_groups(groups)
|
2015-05-13 06:29:03 -04:00
|
|
|
|
2015-08-05 10:06:51 -04:00
|
|
|
defer.returnValue({
|
|
|
|
group: state_map.values()
|
2015-08-07 13:15:30 -04:00
|
|
|
for group, state_map in group_to_state.items()
|
2015-08-05 10:06:51 -04:00
|
|
|
})
|
2015-06-03 09:45:55 -04:00
|
|
|
|
2014-12-05 11:20:48 -05:00
|
|
|
def _store_state_groups_txn(self, txn, event, context):
|
2015-06-25 12:18:19 -04:00
|
|
|
return self._store_mult_state_groups_txn(txn, [(event, context)])
|
2014-10-17 13:56:42 -04:00
|
|
|
|
2015-06-25 12:18:19 -04:00
|
|
|
def _store_mult_state_groups_txn(self, txn, events_and_contexts):
|
|
|
|
state_groups = {}
|
|
|
|
for event, context in events_and_contexts:
|
|
|
|
if context.current_state is None:
|
|
|
|
continue
|
2014-12-05 11:20:48 -05:00
|
|
|
|
2015-06-25 12:18:19 -04:00
|
|
|
if context.state_group is not None:
|
|
|
|
state_groups[event.event_id] = context.state_group
|
|
|
|
continue
|
|
|
|
|
|
|
|
state_events = dict(context.current_state)
|
|
|
|
|
|
|
|
if event.is_state():
|
|
|
|
state_events[(event.type, event.state_key)] = event
|
2014-12-05 11:20:48 -05:00
|
|
|
|
2015-04-13 12:03:49 -04:00
|
|
|
state_group = self._state_groups_id_gen.get_next_txn(txn)
|
2015-04-07 07:05:36 -04:00
|
|
|
self._simple_insert_txn(
|
2014-10-15 05:04:55 -04:00
|
|
|
txn,
|
|
|
|
table="state_groups",
|
|
|
|
values={
|
2015-04-07 07:05:36 -04:00
|
|
|
"id": state_group,
|
2014-10-15 05:04:55 -04:00
|
|
|
"room_id": event.room_id,
|
|
|
|
"event_id": event.event_id,
|
2014-11-12 06:22:51 -05:00
|
|
|
},
|
2014-10-15 05:04:55 -04:00
|
|
|
)
|
|
|
|
|
2015-05-05 10:13:25 -04:00
|
|
|
self._simple_insert_many_txn(
|
|
|
|
txn,
|
|
|
|
table="state_groups_state",
|
|
|
|
values=[
|
|
|
|
{
|
2014-10-15 05:04:55 -04:00
|
|
|
"state_group": state_group,
|
|
|
|
"room_id": state.room_id,
|
|
|
|
"type": state.type,
|
|
|
|
"state_key": state.state_key,
|
|
|
|
"event_id": state.event_id,
|
2015-05-05 10:13:25 -04:00
|
|
|
}
|
|
|
|
for state in state_events.values()
|
|
|
|
],
|
|
|
|
)
|
2015-06-25 12:18:19 -04:00
|
|
|
state_groups[event.event_id] = state_group
|
2014-10-15 05:04:55 -04:00
|
|
|
|
2015-06-25 12:18:19 -04:00
|
|
|
self._simple_insert_many_txn(
|
2014-10-15 05:04:55 -04:00
|
|
|
txn,
|
|
|
|
table="event_to_state_groups",
|
2015-06-25 12:18:19 -04:00
|
|
|
values=[
|
|
|
|
{
|
|
|
|
"state_group": state_groups[event.event_id],
|
|
|
|
"event_id": event.event_id,
|
|
|
|
}
|
|
|
|
for event, context in events_and_contexts
|
|
|
|
if context.current_state is not None
|
|
|
|
],
|
2014-10-15 05:04:55 -04:00
|
|
|
)
|
2015-03-19 11:59:48 -04:00
|
|
|
|
2015-03-20 09:52:56 -04:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
def get_current_state(self, room_id, event_type=None, state_key=""):
|
2015-05-21 06:13:19 -04:00
|
|
|
if event_type and state_key is not None:
|
|
|
|
result = yield self.get_current_state_for_key(
|
|
|
|
room_id, event_type, state_key
|
|
|
|
)
|
|
|
|
defer.returnValue(result)
|
|
|
|
|
2015-04-30 12:12:52 -04:00
|
|
|
def f(txn):
|
|
|
|
sql = (
|
2015-04-30 13:49:26 -04:00
|
|
|
"SELECT event_id FROM current_state_events"
|
|
|
|
" WHERE room_id = ? "
|
2015-04-30 12:12:52 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
if event_type and state_key is not None:
|
2015-04-30 13:49:26 -04:00
|
|
|
sql += " AND type = ? AND state_key = ? "
|
2015-04-30 12:12:52 -04:00
|
|
|
args = (room_id, event_type, state_key)
|
|
|
|
elif event_type:
|
2015-04-30 13:49:26 -04:00
|
|
|
sql += " AND type = ?"
|
2015-04-30 12:12:52 -04:00
|
|
|
args = (room_id, event_type)
|
|
|
|
else:
|
|
|
|
args = (room_id, )
|
2015-03-20 09:52:56 -04:00
|
|
|
|
2015-04-30 12:12:52 -04:00
|
|
|
txn.execute(sql, args)
|
2015-05-15 10:20:05 -04:00
|
|
|
results = txn.fetchall()
|
2015-03-20 09:52:56 -04:00
|
|
|
|
2015-05-15 10:20:05 -04:00
|
|
|
return [r[0] for r in results]
|
2015-03-20 09:52:56 -04:00
|
|
|
|
2015-05-15 10:20:05 -04:00
|
|
|
event_ids = yield self.runInteraction("get_current_state", f)
|
2015-05-15 10:33:01 -04:00
|
|
|
events = yield self._get_events(event_ids, get_prev_content=False)
|
2015-03-20 09:52:56 -04:00
|
|
|
defer.returnValue(events)
|
|
|
|
|
2015-07-27 08:57:29 -04:00
|
|
|
@cachedInlineCallbacks(num_args=3)
|
2015-05-21 06:13:19 -04:00
|
|
|
def get_current_state_for_key(self, room_id, event_type, state_key):
|
|
|
|
def f(txn):
|
|
|
|
sql = (
|
|
|
|
"SELECT event_id FROM current_state_events"
|
|
|
|
" WHERE room_id = ? AND type = ? AND state_key = ?"
|
|
|
|
)
|
|
|
|
|
|
|
|
args = (room_id, event_type, state_key)
|
|
|
|
txn.execute(sql, args)
|
|
|
|
results = txn.fetchall()
|
|
|
|
return [r[0] for r in results]
|
|
|
|
event_ids = yield self.runInteraction("get_current_state_for_key", f)
|
|
|
|
events = yield self._get_events(event_ids, get_prev_content=False)
|
|
|
|
defer.returnValue(events)
|
|
|
|
|
2015-08-07 13:15:30 -04:00
|
|
|
def _get_state_groups_from_groups(self, groups_and_types):
|
2015-08-10 10:01:06 -04:00
|
|
|
"""Returns dictionary state_group -> state event ids
|
2015-08-11 06:40:40 -04:00
|
|
|
|
|
|
|
Args:
|
|
|
|
groups_and_types (list): list of 2-tuple (`group`, `types`)
|
2015-08-10 10:01:06 -04:00
|
|
|
"""
|
2015-08-07 13:15:30 -04:00
|
|
|
def f(txn):
|
|
|
|
results = {}
|
|
|
|
for group, types in groups_and_types:
|
|
|
|
if types is not None:
|
|
|
|
where_clause = "AND (%s)" % (
|
|
|
|
" OR ".join(["(type = ? AND state_key = ?)"] * len(types)),
|
|
|
|
)
|
|
|
|
else:
|
|
|
|
where_clause = ""
|
|
|
|
|
|
|
|
sql = (
|
|
|
|
"SELECT event_id FROM state_groups_state WHERE"
|
|
|
|
" state_group = ? %s"
|
|
|
|
) % (where_clause,)
|
|
|
|
|
|
|
|
args = [group]
|
|
|
|
if types is not None:
|
|
|
|
args.extend([i for typ in types for i in typ])
|
|
|
|
|
|
|
|
txn.execute(sql, args)
|
|
|
|
|
2015-08-13 12:11:30 -04:00
|
|
|
results[group] = [r[0] for r in txn.fetchall()]
|
2015-08-07 13:15:30 -04:00
|
|
|
|
|
|
|
return results
|
|
|
|
|
|
|
|
return self.runInteraction(
|
|
|
|
"_get_state_groups_from_groups",
|
|
|
|
f,
|
|
|
|
)
|
|
|
|
|
2015-08-04 04:32:23 -04:00
|
|
|
@defer.inlineCallbacks
|
2015-10-12 10:06:14 -04:00
|
|
|
def get_state_for_events(self, event_ids, types):
|
2015-08-04 06:08:07 -04:00
|
|
|
"""Given a list of event_ids and type tuples, return a list of state
|
|
|
|
dicts for each event. The state dicts will only have the type/state_keys
|
|
|
|
that are in the `types` list.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
event_ids (list)
|
|
|
|
types (list): List of (type, state_key) tuples which are used to
|
|
|
|
filter the state fetched. `state_key` may be None, which matches
|
|
|
|
any `state_key`
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
deferred: A list of dicts corresponding to the event_ids given.
|
|
|
|
The dicts are mappings from (type, state_key) -> state_events
|
|
|
|
"""
|
2015-08-07 13:15:30 -04:00
|
|
|
event_to_groups = yield self._get_state_group_for_events(
|
2015-10-12 10:06:14 -04:00
|
|
|
event_ids,
|
2015-08-07 13:15:30 -04:00
|
|
|
)
|
2015-08-04 04:32:23 -04:00
|
|
|
|
2015-08-07 13:15:30 -04:00
|
|
|
groups = set(event_to_groups.values())
|
2015-08-13 12:11:30 -04:00
|
|
|
group_to_state = yield self._get_state_for_groups(groups, types)
|
2015-07-02 11:20:10 -04:00
|
|
|
|
2015-08-04 04:32:23 -04:00
|
|
|
event_to_state = {
|
2015-08-05 10:06:51 -04:00
|
|
|
event_id: group_to_state[group]
|
2015-08-07 13:15:30 -04:00
|
|
|
for event_id, group in event_to_groups.items()
|
2015-07-02 11:20:10 -04:00
|
|
|
}
|
|
|
|
|
2015-08-13 12:11:30 -04:00
|
|
|
defer.returnValue({event: event_to_state[event] for event in event_ids})
|
2015-07-02 11:20:10 -04:00
|
|
|
|
2015-11-10 13:27:23 -05:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
def get_state_for_event(self, event_id, types=None):
|
|
|
|
"""
|
|
|
|
Get the state dict corresponding to a particular event
|
|
|
|
|
|
|
|
:param str event_id: event whose state should be returned
|
|
|
|
:param list[(str, str)]|None types: List of (type, state_key) tuples
|
|
|
|
which are used to filter the state fetched. May be None, which
|
|
|
|
matches any key
|
|
|
|
:return: a deferred dict from (type, state_key) -> state_event
|
|
|
|
"""
|
|
|
|
state_map = yield self.get_state_for_events([event_id], types)
|
|
|
|
defer.returnValue(state_map[event_id])
|
|
|
|
|
2015-08-18 06:00:38 -04:00
|
|
|
@cached(num_args=2, lru=True, max_entries=10000)
|
2015-08-05 10:06:51 -04:00
|
|
|
def _get_state_group_for_event(self, room_id, event_id):
|
|
|
|
return self._simple_select_one_onecol(
|
|
|
|
table="event_to_state_groups",
|
|
|
|
keyvalues={
|
|
|
|
"event_id": event_id,
|
|
|
|
},
|
|
|
|
retcol="state_group",
|
|
|
|
allow_none=True,
|
|
|
|
desc="_get_state_group_for_event",
|
|
|
|
)
|
|
|
|
|
2015-08-10 05:05:30 -04:00
|
|
|
@cachedList(cache=_get_state_group_for_event.cache, list_name="event_ids",
|
2015-10-12 10:06:14 -04:00
|
|
|
num_args=1)
|
|
|
|
def _get_state_group_for_events(self, event_ids):
|
2015-08-10 10:01:06 -04:00
|
|
|
"""Returns mapping event_id -> state_group
|
|
|
|
"""
|
2015-08-07 13:15:30 -04:00
|
|
|
def f(txn):
|
|
|
|
results = {}
|
|
|
|
for event_id in event_ids:
|
|
|
|
results[event_id] = self._simple_select_one_onecol_txn(
|
|
|
|
txn,
|
|
|
|
table="event_to_state_groups",
|
|
|
|
keyvalues={
|
|
|
|
"event_id": event_id,
|
|
|
|
},
|
|
|
|
retcol="state_group",
|
|
|
|
allow_none=True,
|
|
|
|
)
|
|
|
|
|
|
|
|
return results
|
|
|
|
|
2015-08-13 12:11:30 -04:00
|
|
|
return self.runInteraction("_get_state_group_for_events", f)
|
2015-08-07 13:15:30 -04:00
|
|
|
|
2015-08-12 12:06:21 -04:00
|
|
|
def _get_some_state_from_cache(self, group, types):
|
2015-08-10 10:01:06 -04:00
|
|
|
"""Checks if group is in cache. See `_get_state_for_groups`
|
2015-08-11 04:12:41 -04:00
|
|
|
|
2015-08-11 06:40:40 -04:00
|
|
|
Returns 3-tuple (`state_dict`, `missing_types`, `got_all`).
|
|
|
|
`missing_types` is the list of types that aren't in the cache for that
|
2015-08-12 12:06:21 -04:00
|
|
|
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:
|
|
|
|
group: The state group to lookup
|
|
|
|
types (list): List of 2-tuples of the form (`type`, `state_key`),
|
|
|
|
where a `state_key` of `None` matches all state_keys for the
|
|
|
|
`type`.
|
2015-08-10 10:01:06 -04:00
|
|
|
"""
|
2015-08-05 10:06:51 -04:00
|
|
|
is_all, state_dict = self._state_group_cache.get(group)
|
|
|
|
|
|
|
|
type_to_key = {}
|
|
|
|
missing_types = set()
|
2015-08-12 12:06:21 -04:00
|
|
|
for typ, state_key in types:
|
|
|
|
if state_key is None:
|
|
|
|
type_to_key[typ] = None
|
|
|
|
missing_types.add((typ, state_key))
|
|
|
|
else:
|
|
|
|
if type_to_key.get(typ, object()) is not None:
|
|
|
|
type_to_key.setdefault(typ, set()).add(state_key)
|
2015-08-05 10:06:51 -04:00
|
|
|
|
2015-08-12 12:06:21 -04:00
|
|
|
if (typ, state_key) not in state_dict:
|
|
|
|
missing_types.add((typ, state_key))
|
2015-08-07 05:17:38 -04:00
|
|
|
|
2015-08-11 04:12:41 -04:00
|
|
|
sentinel = object()
|
2015-08-05 10:06:51 -04:00
|
|
|
|
2015-08-11 04:12:41 -04:00
|
|
|
def include(typ, state_key):
|
|
|
|
valid_state_keys = type_to_key.get(typ, sentinel)
|
|
|
|
if valid_state_keys is sentinel:
|
|
|
|
return False
|
|
|
|
if valid_state_keys is None:
|
|
|
|
return True
|
|
|
|
if state_key in valid_state_keys:
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
2015-08-11 06:40:40 -04:00
|
|
|
got_all = not (missing_types or types is None)
|
|
|
|
|
2015-08-11 04:12:41 -04:00
|
|
|
return {
|
2015-08-13 12:11:30 -04:00
|
|
|
k: v for k, v in state_dict.items()
|
2015-08-11 04:12:41 -04:00
|
|
|
if include(k[0], k[1])
|
2015-08-11 06:40:40 -04:00
|
|
|
}, missing_types, got_all
|
2015-08-07 13:15:30 -04:00
|
|
|
|
2015-08-12 12:06:21 -04:00
|
|
|
def _get_all_state_from_cache(self, group):
|
|
|
|
"""Checks if group is in cache. See `_get_state_for_groups`
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
group: The state group to lookup
|
|
|
|
"""
|
|
|
|
is_all, state_dict = self._state_group_cache.get(group)
|
|
|
|
return state_dict, is_all
|
|
|
|
|
2015-08-07 13:15:30 -04:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
def _get_state_for_groups(self, groups, types=None):
|
2015-08-10 10:01:06 -04:00
|
|
|
"""Given list of groups returns dict of group -> list of state events
|
|
|
|
with matching types. `types` is a list of `(type, state_key)`, where
|
|
|
|
a `state_key` of None matches all state_keys. If `types` is None then
|
|
|
|
all events are returned.
|
|
|
|
"""
|
2015-08-07 13:15:30 -04:00
|
|
|
results = {}
|
|
|
|
missing_groups_and_types = []
|
2015-08-12 12:06:21 -04:00
|
|
|
if types is not None:
|
|
|
|
for group in set(groups):
|
|
|
|
state_dict, missing_types, got_all = self._get_some_state_from_cache(
|
|
|
|
group, types
|
|
|
|
)
|
|
|
|
results[group] = state_dict
|
|
|
|
|
|
|
|
if not got_all:
|
2015-08-13 12:11:30 -04:00
|
|
|
missing_groups_and_types.append((group, missing_types))
|
2015-08-12 12:06:21 -04:00
|
|
|
else:
|
|
|
|
for group in set(groups):
|
|
|
|
state_dict, got_all = self._get_all_state_from_cache(
|
|
|
|
group
|
|
|
|
)
|
|
|
|
results[group] = state_dict
|
2015-08-11 04:12:41 -04:00
|
|
|
|
2015-08-12 12:06:21 -04:00
|
|
|
if not got_all:
|
|
|
|
missing_groups_and_types.append((group, None))
|
2015-08-07 13:15:30 -04:00
|
|
|
|
|
|
|
if not missing_groups_and_types:
|
2015-08-11 04:12:41 -04:00
|
|
|
defer.returnValue({
|
2015-08-12 12:08:05 -04:00
|
|
|
group: {
|
|
|
|
type_tuple: event
|
|
|
|
for type_tuple, event in state.items()
|
|
|
|
if event
|
2015-08-11 04:12:41 -04:00
|
|
|
}
|
2015-08-12 12:08:05 -04:00
|
|
|
for group, state in results.items()
|
2015-08-11 04:12:41 -04:00
|
|
|
})
|
2015-08-05 10:06:51 -04:00
|
|
|
|
|
|
|
# Okay, so we have some missing_types, lets fetch them.
|
|
|
|
cache_seq_num = self._state_group_cache.sequence
|
2015-08-07 13:15:30 -04:00
|
|
|
|
|
|
|
group_state_dict = yield self._get_state_groups_from_groups(
|
|
|
|
missing_groups_and_types
|
2015-08-05 10:06:51 -04:00
|
|
|
)
|
|
|
|
|
2015-08-07 13:15:30 -04:00
|
|
|
state_events = yield self._get_events(
|
|
|
|
[e_id for l in group_state_dict.values() for e_id in l],
|
|
|
|
get_prev_content=False
|
2015-08-05 10:06:51 -04:00
|
|
|
)
|
|
|
|
|
2015-08-13 12:11:30 -04:00
|
|
|
state_events = {e.event_id: e for e in state_events}
|
2015-08-07 13:15:30 -04:00
|
|
|
|
2015-08-12 12:22:54 -04:00
|
|
|
# Now we want to update the cache with all the things we fetched
|
|
|
|
# from the database.
|
2015-08-07 13:15:30 -04:00
|
|
|
for group, state_ids in group_state_dict.items():
|
2015-08-11 04:12:41 -04:00
|
|
|
if types:
|
2015-08-12 12:16:30 -04:00
|
|
|
# We delibrately put key -> None mappings into the cache to
|
|
|
|
# cache absence of the key, on the assumption that if we've
|
|
|
|
# explicitly asked for some types then we will probably ask
|
|
|
|
# for them again.
|
2015-08-13 12:11:30 -04:00
|
|
|
state_dict = {key: None for key in types}
|
2015-08-11 04:12:41 -04:00
|
|
|
state_dict.update(results[group])
|
2015-08-18 11:26:07 -04:00
|
|
|
results[group] = state_dict
|
2015-08-11 04:12:41 -04:00
|
|
|
else:
|
|
|
|
state_dict = results[group]
|
|
|
|
|
2015-08-13 12:00:17 -04:00
|
|
|
for event_id in state_ids:
|
2015-08-21 09:30:34 -04:00
|
|
|
try:
|
|
|
|
state_event = state_events[event_id]
|
|
|
|
state_dict[(state_event.type, state_event.state_key)] = state_event
|
|
|
|
except KeyError:
|
|
|
|
# Hmm. So we do don't have that state event? Interesting.
|
|
|
|
logger.warn(
|
|
|
|
"Can't find state event %r for state group %r",
|
|
|
|
event_id, group,
|
|
|
|
)
|
2015-08-07 13:15:30 -04:00
|
|
|
|
|
|
|
self._state_group_cache.update(
|
|
|
|
cache_seq_num,
|
|
|
|
key=group,
|
2015-08-18 11:26:07 -04:00
|
|
|
value=state_dict,
|
2015-08-07 13:15:30 -04:00
|
|
|
full=(types is None),
|
|
|
|
)
|
|
|
|
|
2015-08-18 06:44:10 -04:00
|
|
|
# Remove all the entries with None values. The None values were just
|
|
|
|
# used for bookkeeping in the cache.
|
|
|
|
for group, state_dict in results.items():
|
2015-08-17 04:39:12 -04:00
|
|
|
results[group] = {
|
2015-08-18 11:28:13 -04:00
|
|
|
key: event for key, event in state_dict.items() if event
|
2015-08-17 04:39:12 -04:00
|
|
|
}
|
2015-08-07 13:15:30 -04:00
|
|
|
|
|
|
|
defer.returnValue(results)
|