mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 05:00:20 +00:00
Merge pull request #2269 from matrix-org/erikj/cache_state_delta
Cache state deltas
This commit is contained in:
commit
f540b494a4
2 changed files with 16 additions and 4 deletions
|
@ -108,7 +108,7 @@ class SlavedEventStore(BaseSlavedStore):
|
||||||
get_current_state_ids = (
|
get_current_state_ids = (
|
||||||
StateStore.__dict__["get_current_state_ids"]
|
StateStore.__dict__["get_current_state_ids"]
|
||||||
)
|
)
|
||||||
get_state_group_delta = DataStore.get_state_group_delta.__func__
|
get_state_group_delta = StateStore.__dict__["get_state_group_delta"]
|
||||||
_get_joined_hosts_cache = RoomMemberStore.__dict__["_get_joined_hosts_cache"]
|
_get_joined_hosts_cache = RoomMemberStore.__dict__["_get_joined_hosts_cache"]
|
||||||
has_room_changed_since = DataStore.has_room_changed_since.__func__
|
has_room_changed_since = DataStore.has_room_changed_since.__func__
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ from synapse.util.stringutils import to_ascii
|
||||||
from synapse.storage.engines import PostgresEngine
|
from synapse.storage.engines import PostgresEngine
|
||||||
|
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
from collections import namedtuple
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
@ -29,6 +30,16 @@ logger = logging.getLogger(__name__)
|
||||||
MAX_STATE_DELTA_HOPS = 100
|
MAX_STATE_DELTA_HOPS = 100
|
||||||
|
|
||||||
|
|
||||||
|
class _GetStateGroupDelta(namedtuple("_GetStateGroupDelta", ("prev_group", "delta_ids"))):
|
||||||
|
"""Return type of get_state_group_delta that implements __len__, which lets
|
||||||
|
us use the itrable flag when caching
|
||||||
|
"""
|
||||||
|
__slots__ = []
|
||||||
|
|
||||||
|
def __len__(self):
|
||||||
|
return len(self.delta_ids) if self.delta_ids else 0
|
||||||
|
|
||||||
|
|
||||||
class StateStore(SQLBaseStore):
|
class StateStore(SQLBaseStore):
|
||||||
""" Keeps track of the state at a given event.
|
""" Keeps track of the state at a given event.
|
||||||
|
|
||||||
|
@ -98,6 +109,7 @@ class StateStore(SQLBaseStore):
|
||||||
_get_current_state_ids_txn,
|
_get_current_state_ids_txn,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@cached(max_entries=10000, iterable=True)
|
||||||
def get_state_group_delta(self, state_group):
|
def get_state_group_delta(self, state_group):
|
||||||
"""Given a state group try to return a previous group and a delta between
|
"""Given a state group try to return a previous group and a delta between
|
||||||
the old and the new.
|
the old and the new.
|
||||||
|
@ -117,7 +129,7 @@ class StateStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
|
|
||||||
if not prev_group:
|
if not prev_group:
|
||||||
return None, None
|
return _GetStateGroupDelta(None, None)
|
||||||
|
|
||||||
delta_ids = self._simple_select_list_txn(
|
delta_ids = self._simple_select_list_txn(
|
||||||
txn,
|
txn,
|
||||||
|
@ -128,10 +140,10 @@ class StateStore(SQLBaseStore):
|
||||||
retcols=("type", "state_key", "event_id",)
|
retcols=("type", "state_key", "event_id",)
|
||||||
)
|
)
|
||||||
|
|
||||||
return prev_group, {
|
return _GetStateGroupDelta(prev_group, {
|
||||||
(row["type"], row["state_key"]): row["event_id"]
|
(row["type"], row["state_key"]): row["event_id"]
|
||||||
for row in delta_ids
|
for row in delta_ids
|
||||||
}
|
})
|
||||||
return self.runInteraction(
|
return self.runInteraction(
|
||||||
"get_state_group_delta",
|
"get_state_group_delta",
|
||||||
_get_state_group_delta_txn,
|
_get_state_group_delta_txn,
|
||||||
|
|
Loading…
Reference in a new issue