Merge pull request #806 from matrix-org/erikj/hash_cache

Cache get_event_reference_hashes
This commit is contained in:
Erik Johnston 2016-06-01 18:07:42 +01:00
commit 0f06b496d1

View file

@ -19,17 +19,24 @@ from ._base import SQLBaseStore
from unpaddedbase64 import encode_base64 from unpaddedbase64 import encode_base64
from synapse.crypto.event_signing import compute_event_reference_hash from synapse.crypto.event_signing import compute_event_reference_hash
from synapse.util.caches.descriptors import cached, cachedList
class SignatureStore(SQLBaseStore): class SignatureStore(SQLBaseStore):
"""Persistence for event signatures and hashes""" """Persistence for event signatures and hashes"""
@cached(lru=True)
def get_event_reference_hash(self, event_id):
return self._get_event_reference_hashes_txn(event_id)
@cachedList(cached_method_name="get_event_reference_hash",
list_name="event_ids", num_args=1)
def get_event_reference_hashes(self, event_ids): def get_event_reference_hashes(self, event_ids):
def f(txn): def f(txn):
return [ return {
self._get_event_reference_hashes_txn(txn, ev) event_id: self._get_event_reference_hashes_txn(txn, event_id)
for ev in event_ids for event_id in event_ids
] }
return self.runInteraction( return self.runInteraction(
"get_event_reference_hashes", "get_event_reference_hashes",
@ -41,15 +48,15 @@ class SignatureStore(SQLBaseStore):
hashes = yield self.get_event_reference_hashes( hashes = yield self.get_event_reference_hashes(
event_ids event_ids
) )
hashes = [ hashes = {
{ e_id: {
k: encode_base64(v) for k, v in h.items() k: encode_base64(v) for k, v in h.items()
if k == "sha256" if k == "sha256"
} }
for h in hashes for e_id, h in hashes.items()
] }
defer.returnValue(zip(event_ids, hashes)) defer.returnValue(hashes.items())
def _get_event_reference_hashes_txn(self, txn, event_id): def _get_event_reference_hashes_txn(self, txn, event_id):
"""Get all the hashes for a given PDU. """Get all the hashes for a given PDU.