diff options
author | Erik Johnston <erik@matrix.org> | 2016-04-20 13:52:59 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-04-20 13:52:59 +0100 |
commit | 68ebb81e86572daa04367c4d81c59a5eca151c65 (patch) | |
tree | 41de76dbb655236173f2b9fb1a740c380270befd /synapse/state.py | |
parent | Add some logging to state resolve_events (diff) | |
parent | Always use state cache entry if it exists (diff) | |
download | synapse-68ebb81e86572daa04367c4d81c59a5eca151c65.tar.xz |
Merge pull request #740 from matrix-org/erikj/state_cache
Always use state cache entry if it exists
Diffstat (limited to 'synapse/state.py')
-rw-r--r-- | synapse/state.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py index cca9167e5b..d0f76dc4f5 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -214,7 +214,7 @@ class StateHandler(object): if self._state_cache is not None: cache = self._state_cache.get(group_names, None) - if cache and cache.state_group: + if cache: cache.ts = self.clock.time_msec() event_dict = yield self.store.get_events(cache.state.values()) @@ -236,16 +236,23 @@ class StateHandler(object): state_groups.values(), event_type, state_key ) + state_group = None + new_state_event_ids = frozenset(e.event_id for e in new_state.values()) + for sg, events in state_groups.items(): + if new_state_event_ids == frozenset(e.event_id for e in events): + state_group = sg + break + if self._state_cache is not None: cache = _StateCacheEntry( state={key: event.event_id for key, event in new_state.items()}, - state_group=None, + state_group=state_group, ts=self.clock.time_msec() ) self._state_cache[group_names] = cache - defer.returnValue((None, new_state, prev_states)) + defer.returnValue((state_group, new_state, prev_states)) def resolve_events(self, state_sets, event): logger.info( |