Make StateHandler._state_cache only store event_ids.

This commit is contained in:
Erik Johnston 2016-03-22 15:31:13 +00:00
parent d787e41b20
commit 99f929f36b
2 changed files with 42 additions and 7 deletions

View File

@ -28,6 +28,7 @@ from collections import namedtuple
import logging import logging
import hashlib import hashlib
import os
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -35,8 +36,11 @@ logger = logging.getLogger(__name__)
KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key")) KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
SIZE_OF_CACHE = 1000 CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.1))
EVICTION_TIMEOUT_SECONDS = 20
SIZE_OF_CACHE = int(5000 * CACHE_SIZE_FACTOR)
EVICTION_TIMEOUT_SECONDS = 60 * 60
class _StateCacheEntry(object): class _StateCacheEntry(object):
@ -92,7 +96,9 @@ class StateHandler(object):
if cache: if cache:
cache.ts = self.clock.time_msec() cache.ts = self.clock.time_msec()
state = cache.state
event_dict = yield self.store.get_events(cache.state.values())
state = {(e.type, e.state_key): e for e in event_dict.values()}
else: else:
res = yield self.resolve_state_groups(room_id, event_ids) res = yield self.resolve_state_groups(room_id, event_ids)
state = res[1] state = res[1]
@ -191,14 +197,18 @@ class StateHandler(object):
cache = self._state_cache.get(frozenset(event_ids), None) cache = self._state_cache.get(frozenset(event_ids), None)
if cache and cache.state_group: if cache and cache.state_group:
cache.ts = self.clock.time_msec() cache.ts = self.clock.time_msec()
prev_state = cache.state.get((event_type, state_key), None)
event_dict = yield self.store.get_events(cache.state.values())
state = {(e.type, e.state_key): e for e in event_dict.values()}
prev_state = state.get((event_type, state_key), None)
if prev_state: if prev_state:
prev_state = prev_state.event_id prev_state = prev_state.event_id
prev_states = [prev_state] prev_states = [prev_state]
else: else:
prev_states = [] prev_states = []
defer.returnValue( defer.returnValue(
(cache.state_group, cache.state, prev_states) (cache.state_group, state, prev_states)
) )
state_groups = yield self.store.get_state_groups( state_groups = yield self.store.get_state_groups(
@ -226,7 +236,7 @@ class StateHandler(object):
if self._state_cache is not None: if self._state_cache is not None:
cache = _StateCacheEntry( cache = _StateCacheEntry(
state=state, state={key: event.event_id for key, event in state.items()},
state_group=name, state_group=name,
ts=self.clock.time_msec() ts=self.clock.time_msec()
) )
@ -241,7 +251,7 @@ class StateHandler(object):
if self._state_cache is not None: if self._state_cache is not None:
cache = _StateCacheEntry( cache = _StateCacheEntry(
state=new_state, state={key: event.event_id for key, event in new_state.items()},
state_group=None, state_group=None,
ts=self.clock.time_msec() ts=self.clock.time_msec()
) )

View File

@ -151,6 +151,31 @@ class EventsStore(SQLBaseStore):
defer.returnValue(events[0] if events else None) defer.returnValue(events[0] if events else None)
@defer.inlineCallbacks
def get_events(self, event_ids, check_redacted=True,
get_prev_content=False, allow_rejected=False):
"""Get events from the database
Args:
event_ids (list): The event_ids of the events to fetch
check_redacted (bool): If True, check if event has been redacted
and redact it.
get_prev_content (bool): If True and event is a state event,
include the previous states content in the unsigned field.
allow_rejected (bool): If True return rejected events.
Returns:
Deferred : Dict from event_id to event.
"""
events = yield self._get_events(
event_ids,
check_redacted=check_redacted,
get_prev_content=get_prev_content,
allow_rejected=allow_rejected,
)
defer.returnValue({e.event_id: e for e in events})
@log_function @log_function
def _persist_event_txn(self, txn, event, context, def _persist_event_txn(self, txn, event, context,
is_new_state=True, current_state=None): is_new_state=True, current_state=None):