|
@@ -1,5 +1,6 @@
|
|
|
# -*- coding: utf-8 -*-
|
|
|
# Copyright 2014-2016 OpenMarket Ltd
|
|
|
+# Copyright 2018 New Vector Ltd
|
|
|
#
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
# you may not use this file except in compliance with the License.
|
|
@@ -12,33 +13,29 @@
|
|
|
# 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.
|
|
|
-from ._base import SQLBaseStore
|
|
|
|
|
|
-from twisted.internet import defer, reactor
|
|
|
+from collections import OrderedDict, deque, namedtuple
|
|
|
+from functools import wraps
|
|
|
+import logging
|
|
|
+
|
|
|
+import simplejson as json
|
|
|
+from twisted.internet import defer
|
|
|
|
|
|
-from synapse.events import FrozenEvent, USE_FROZEN_DICTS
|
|
|
-from synapse.events.utils import prune_event
|
|
|
|
|
|
+from synapse.storage.events_worker import EventsWorkerStore
|
|
|
from synapse.util.async import ObservableDeferred
|
|
|
+from synapse.util.frozenutils import frozendict_json_encoder
|
|
|
from synapse.util.logcontext import (
|
|
|
- preserve_fn, PreserveLoggingContext, make_deferred_yieldable
|
|
|
+ PreserveLoggingContext, make_deferred_yieldable,
|
|
|
)
|
|
|
from synapse.util.logutils import log_function
|
|
|
from synapse.util.metrics import Measure
|
|
|
from synapse.api.constants import EventTypes
|
|
|
from synapse.api.errors import SynapseError
|
|
|
-from synapse.util.caches.descriptors import cached
|
|
|
+from synapse.util.caches.descriptors import cached, cachedInlineCallbacks
|
|
|
from synapse.types import get_domain_from_id
|
|
|
-
|
|
|
-from canonicaljson import encode_canonical_json
|
|
|
-from collections import deque, namedtuple, OrderedDict
|
|
|
-from functools import wraps
|
|
|
-
|
|
|
import synapse.metrics
|
|
|
|
|
|
-import logging
|
|
|
-import ujson as json
|
|
|
-
|
|
|
# these are only included to make the type annotations work
|
|
|
from synapse.events import EventBase # noqa: F401
|
|
|
from synapse.events.snapshot import EventContext # noqa: F401
|
|
@@ -52,23 +49,25 @@ event_counter = metrics.register_counter(
|
|
|
"persisted_events_sep", labels=["type", "origin_type", "origin_entity"]
|
|
|
)
|
|
|
|
|
|
-
|
|
|
-def encode_json(json_object):
|
|
|
- if USE_FROZEN_DICTS:
|
|
|
- # ujson doesn't like frozen_dicts
|
|
|
- return encode_canonical_json(json_object)
|
|
|
- else:
|
|
|
- return json.dumps(json_object, ensure_ascii=False)
|
|
|
+# The number of times we are recalculating the current state
|
|
|
+state_delta_counter = metrics.register_counter(
|
|
|
+ "state_delta",
|
|
|
+)
|
|
|
+# The number of times we are recalculating state when there is only a
|
|
|
+# single forward extremity
|
|
|
+state_delta_single_event_counter = metrics.register_counter(
|
|
|
+ "state_delta_single_event",
|
|
|
+)
|
|
|
+# The number of times we are reculating state when we could have resonably
|
|
|
+# calculated the delta when we calculated the state for an event we were
|
|
|
+# persisting.
|
|
|
+state_delta_reuse_delta_counter = metrics.register_counter(
|
|
|
+ "state_delta_reuse_delta",
|
|
|
+)
|
|
|
|
|
|
|
|
|
-# These values are used in the `enqueus_event` and `_do_fetch` methods to
|
|
|
-# control how we batch/bulk fetch events from the database.
|
|
|
-# The values are plucked out of thing air to make initial sync run faster
|
|
|
-# on jki.re
|
|
|
-# TODO: Make these configurable.
|
|
|
-EVENT_QUEUE_THREADS = 3 # Max number of threads that will fetch events
|
|
|
-EVENT_QUEUE_ITERATIONS = 3 # No. times we block waiting for requests for events
|
|
|
-EVENT_QUEUE_TIMEOUT_S = 0.1 # Timeout when waiting for requests for events
|
|
|
+def encode_json(json_object):
|
|
|
+ return frozendict_json_encoder.encode(json_object)
|
|
|
|
|
|
|
|
|
class _EventPeristenceQueue(object):
|
|
@@ -199,13 +198,12 @@ def _retry_on_integrity_error(func):
|
|
|
return f
|
|
|
|
|
|
|
|
|
-class EventsStore(SQLBaseStore):
|
|
|
+class EventsStore(EventsWorkerStore):
|
|
|
EVENT_ORIGIN_SERVER_TS_NAME = "event_origin_server_ts"
|
|
|
EVENT_FIELDS_SENDER_URL_UPDATE_NAME = "event_fields_sender_url"
|
|
|
|
|
|
def __init__(self, db_conn, hs):
|
|
|
super(EventsStore, self).__init__(db_conn, hs)
|
|
|
- self._clock = hs.get_clock()
|
|
|
self.register_background_update_handler(
|
|
|
self.EVENT_ORIGIN_SERVER_TS_NAME, self._background_reindex_origin_server_ts
|
|
|
)
|
|
@@ -293,10 +291,11 @@ class EventsStore(SQLBaseStore):
|
|
|
def _maybe_start_persisting(self, room_id):
|
|
|
@defer.inlineCallbacks
|
|
|
def persisting_queue(item):
|
|
|
- yield self._persist_events(
|
|
|
- item.events_and_contexts,
|
|
|
- backfilled=item.backfilled,
|
|
|
- )
|
|
|
+ with Measure(self._clock, "persist_events"):
|
|
|
+ yield self._persist_events(
|
|
|
+ item.events_and_contexts,
|
|
|
+ backfilled=item.backfilled,
|
|
|
+ )
|
|
|
|
|
|
self._event_persist_queue.handle_queue(room_id, persisting_queue)
|
|
|
|
|
@@ -378,7 +377,8 @@ class EventsStore(SQLBaseStore):
|
|
|
room_id, ev_ctx_rm, latest_event_ids
|
|
|
)
|
|
|
|
|
|
- if new_latest_event_ids == set(latest_event_ids):
|
|
|
+ latest_event_ids = set(latest_event_ids)
|
|
|
+ if new_latest_event_ids == latest_event_ids:
|
|
|
# No change in extremities, so no change in state
|
|
|
continue
|
|
|
|
|
@@ -399,6 +399,26 @@ class EventsStore(SQLBaseStore):
|
|
|
if all_single_prev_not_state:
|
|
|
continue
|
|
|
|
|
|
+ state_delta_counter.inc()
|
|
|
+ if len(new_latest_event_ids) == 1:
|
|
|
+ state_delta_single_event_counter.inc()
|
|
|
+
|
|
|
+ # This is a fairly handwavey check to see if we could
|
|
|
+ # have guessed what the delta would have been when
|
|
|
+ # processing one of these events.
|
|
|
+ # What we're interested in is if the latest extremities
|
|
|
+ # were the same when we created the event as they are
|
|
|
+ # now. When this server creates a new event (as opposed
|
|
|
+ # to receiving it over federation) it will use the
|
|
|
+ # forward extremities as the prev_events, so we can
|
|
|
+ # guess this by looking at the prev_events and checking
|
|
|
+ # if they match the current forward extremities.
|
|
|
+ for ev, _ in ev_ctx_rm:
|
|
|
+ prev_event_ids = set(e for e, _ in ev.prev_events)
|
|
|
+ if latest_event_ids == prev_event_ids:
|
|
|
+ state_delta_reuse_delta_counter.inc()
|
|
|
+ break
|
|
|
+
|
|
|
logger.info(
|
|
|
"Calculating state delta for room %s", room_id,
|
|
|
)
|
|
@@ -609,62 +629,6 @@ class EventsStore(SQLBaseStore):
|
|
|
|
|
|
defer.returnValue((to_delete, to_insert))
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
- def get_event(self, event_id, check_redacted=True,
|
|
|
- get_prev_content=False, allow_rejected=False,
|
|
|
- allow_none=False):
|
|
|
- """Get an event from the database by event_id.
|
|
|
-
|
|
|
- Args:
|
|
|
- event_id (str): The event_id of the event 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.
|
|
|
- allow_none (bool): If True, return None if no event found, if
|
|
|
- False throw an exception.
|
|
|
-
|
|
|
- Returns:
|
|
|
- Deferred : A FrozenEvent.
|
|
|
- """
|
|
|
- events = yield self._get_events(
|
|
|
- [event_id],
|
|
|
- check_redacted=check_redacted,
|
|
|
- get_prev_content=get_prev_content,
|
|
|
- allow_rejected=allow_rejected,
|
|
|
- )
|
|
|
-
|
|
|
- if not events and not allow_none:
|
|
|
- raise SynapseError(404, "Could not find event %s" % (event_id,))
|
|
|
-
|
|
|
- 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
|
|
|
def _persist_events_txn(self, txn, events_and_contexts, backfilled,
|
|
|
delete_existing=False, state_delta_for_room={},
|
|
@@ -693,6 +657,8 @@ class EventsStore(SQLBaseStore):
|
|
|
list of the event ids which are the forward extremities.
|
|
|
|
|
|
"""
|
|
|
+ all_events_and_contexts = events_and_contexts
|
|
|
+
|
|
|
max_stream_order = events_and_contexts[-1][0].internal_metadata.stream_ordering
|
|
|
|
|
|
self._update_current_state_txn(txn, state_delta_for_room, max_stream_order)
|
|
@@ -755,6 +721,7 @@ class EventsStore(SQLBaseStore):
|
|
|
self._update_metadata_tables_txn(
|
|
|
txn,
|
|
|
events_and_contexts=events_and_contexts,
|
|
|
+ all_events_and_contexts=all_events_and_contexts,
|
|
|
backfilled=backfilled,
|
|
|
)
|
|
|
|
|
@@ -817,7 +784,7 @@ class EventsStore(SQLBaseStore):
|
|
|
|
|
|
for member in members_changed:
|
|
|
self._invalidate_cache_and_stream(
|
|
|
- txn, self.get_rooms_for_user, (member,)
|
|
|
+ txn, self.get_rooms_for_user_with_stream_ordering, (member,)
|
|
|
)
|
|
|
|
|
|
for host in set(get_domain_from_id(u) for u in members_changed):
|
|
@@ -1152,26 +1119,33 @@ class EventsStore(SQLBaseStore):
|
|
|
ec for ec in events_and_contexts if ec[0] not in to_remove
|
|
|
]
|
|
|
|
|
|
- def _update_metadata_tables_txn(self, txn, events_and_contexts, backfilled):
|
|
|
+ def _update_metadata_tables_txn(self, txn, events_and_contexts,
|
|
|
+ all_events_and_contexts, backfilled):
|
|
|
"""Update all the miscellaneous tables for new events
|
|
|
|
|
|
Args:
|
|
|
txn (twisted.enterprise.adbapi.Connection): db connection
|
|
|
events_and_contexts (list[(EventBase, EventContext)]): events
|
|
|
we are persisting
|
|
|
+ all_events_and_contexts (list[(EventBase, EventContext)]): all
|
|
|
+ events that we were going to persist. This includes events
|
|
|
+ we've already persisted, etc, that wouldn't appear in
|
|
|
+ events_and_context.
|
|
|
backfilled (bool): True if the events were backfilled
|
|
|
"""
|
|
|
|
|
|
+ # Insert all the push actions into the event_push_actions table.
|
|
|
+ self._set_push_actions_for_event_and_users_txn(
|
|
|
+ txn,
|
|
|
+ events_and_contexts=events_and_contexts,
|
|
|
+ all_events_and_contexts=all_events_and_contexts,
|
|
|
+ )
|
|
|
+
|
|
|
if not events_and_contexts:
|
|
|
# nothing to do here
|
|
|
return
|
|
|
|
|
|
for event, context in events_and_contexts:
|
|
|
- # Insert all the push actions into the event_push_actions table.
|
|
|
- self._set_push_actions_for_event_and_users_txn(
|
|
|
- txn, event,
|
|
|
- )
|
|
|
-
|
|
|
if event.type == EventTypes.Redaction and event.redacts is not None:
|
|
|
# Remove the entries in the event_push_actions table for the
|
|
|
# redacted event.
|
|
@@ -1375,292 +1349,6 @@ class EventsStore(SQLBaseStore):
|
|
|
"have_events", f,
|
|
|
)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
- def _get_events(self, event_ids, check_redacted=True,
|
|
|
- get_prev_content=False, allow_rejected=False):
|
|
|
- if not event_ids:
|
|
|
- defer.returnValue([])
|
|
|
-
|
|
|
- event_id_list = event_ids
|
|
|
- event_ids = set(event_ids)
|
|
|
-
|
|
|
- event_entry_map = self._get_events_from_cache(
|
|
|
- event_ids,
|
|
|
- allow_rejected=allow_rejected,
|
|
|
- )
|
|
|
-
|
|
|
- missing_events_ids = [e for e in event_ids if e not in event_entry_map]
|
|
|
-
|
|
|
- if missing_events_ids:
|
|
|
- missing_events = yield self._enqueue_events(
|
|
|
- missing_events_ids,
|
|
|
- check_redacted=check_redacted,
|
|
|
- allow_rejected=allow_rejected,
|
|
|
- )
|
|
|
-
|
|
|
- event_entry_map.update(missing_events)
|
|
|
-
|
|
|
- events = []
|
|
|
- for event_id in event_id_list:
|
|
|
- entry = event_entry_map.get(event_id, None)
|
|
|
- if not entry:
|
|
|
- continue
|
|
|
-
|
|
|
- if allow_rejected or not entry.event.rejected_reason:
|
|
|
- if check_redacted and entry.redacted_event:
|
|
|
- event = entry.redacted_event
|
|
|
- else:
|
|
|
- event = entry.event
|
|
|
-
|
|
|
- events.append(event)
|
|
|
-
|
|
|
- if get_prev_content:
|
|
|
- if "replaces_state" in event.unsigned:
|
|
|
- prev = yield self.get_event(
|
|
|
- event.unsigned["replaces_state"],
|
|
|
- get_prev_content=False,
|
|
|
- allow_none=True,
|
|
|
- )
|
|
|
- if prev:
|
|
|
- event.unsigned = dict(event.unsigned)
|
|
|
- event.unsigned["prev_content"] = prev.content
|
|
|
- event.unsigned["prev_sender"] = prev.sender
|
|
|
-
|
|
|
- defer.returnValue(events)
|
|
|
-
|
|
|
- def _invalidate_get_event_cache(self, event_id):
|
|
|
- self._get_event_cache.invalidate((event_id,))
|
|
|
-
|
|
|
- def _get_events_from_cache(self, events, allow_rejected, update_metrics=True):
|
|
|
- """Fetch events from the caches
|
|
|
-
|
|
|
- Args:
|
|
|
- events (list(str)): list of event_ids to fetch
|
|
|
- allow_rejected (bool): Whether to teturn events that were rejected
|
|
|
- update_metrics (bool): Whether to update the cache hit ratio metrics
|
|
|
-
|
|
|
- Returns:
|
|
|
- dict of event_id -> _EventCacheEntry for each event_id in cache. If
|
|
|
- allow_rejected is `False` then there will still be an entry but it
|
|
|
- will be `None`
|
|
|
- """
|
|
|
- event_map = {}
|
|
|
-
|
|
|
- for event_id in events:
|
|
|
- ret = self._get_event_cache.get(
|
|
|
- (event_id,), None,
|
|
|
- update_metrics=update_metrics,
|
|
|
- )
|
|
|
- if not ret:
|
|
|
- continue
|
|
|
-
|
|
|
- if allow_rejected or not ret.event.rejected_reason:
|
|
|
- event_map[event_id] = ret
|
|
|
- else:
|
|
|
- event_map[event_id] = None
|
|
|
-
|
|
|
- return event_map
|
|
|
-
|
|
|
- def _do_fetch(self, conn):
|
|
|
- """Takes a database connection and waits for requests for events from
|
|
|
- the _event_fetch_list queue.
|
|
|
- """
|
|
|
- event_list = []
|
|
|
- i = 0
|
|
|
- while True:
|
|
|
- try:
|
|
|
- with self._event_fetch_lock:
|
|
|
- event_list = self._event_fetch_list
|
|
|
- self._event_fetch_list = []
|
|
|
-
|
|
|
- if not event_list:
|
|
|
- single_threaded = self.database_engine.single_threaded
|
|
|
- if single_threaded or i > EVENT_QUEUE_ITERATIONS:
|
|
|
- self._event_fetch_ongoing -= 1
|
|
|
- return
|
|
|
- else:
|
|
|
- self._event_fetch_lock.wait(EVENT_QUEUE_TIMEOUT_S)
|
|
|
- i += 1
|
|
|
- continue
|
|
|
- i = 0
|
|
|
-
|
|
|
- event_id_lists = zip(*event_list)[0]
|
|
|
- event_ids = [
|
|
|
- item for sublist in event_id_lists for item in sublist
|
|
|
- ]
|
|
|
-
|
|
|
- rows = self._new_transaction(
|
|
|
- conn, "do_fetch", [], [], None, self._fetch_event_rows, event_ids
|
|
|
- )
|
|
|
-
|
|
|
- row_dict = {
|
|
|
- r["event_id"]: r
|
|
|
- for r in rows
|
|
|
- }
|
|
|
-
|
|
|
- # We only want to resolve deferreds from the main thread
|
|
|
- def fire(lst, res):
|
|
|
- for ids, d in lst:
|
|
|
- if not d.called:
|
|
|
- try:
|
|
|
- with PreserveLoggingContext():
|
|
|
- d.callback([
|
|
|
- res[i]
|
|
|
- for i in ids
|
|
|
- if i in res
|
|
|
- ])
|
|
|
- except Exception:
|
|
|
- logger.exception("Failed to callback")
|
|
|
- with PreserveLoggingContext():
|
|
|
- reactor.callFromThread(fire, event_list, row_dict)
|
|
|
- except Exception as e:
|
|
|
- logger.exception("do_fetch")
|
|
|
-
|
|
|
- # We only want to resolve deferreds from the main thread
|
|
|
- def fire(evs):
|
|
|
- for _, d in evs:
|
|
|
- if not d.called:
|
|
|
- with PreserveLoggingContext():
|
|
|
- d.errback(e)
|
|
|
-
|
|
|
- if event_list:
|
|
|
- with PreserveLoggingContext():
|
|
|
- reactor.callFromThread(fire, event_list)
|
|
|
-
|
|
|
- @defer.inlineCallbacks
|
|
|
- def _enqueue_events(self, events, check_redacted=True, allow_rejected=False):
|
|
|
- """Fetches events from the database using the _event_fetch_list. This
|
|
|
- allows batch and bulk fetching of events - it allows us to fetch events
|
|
|
- without having to create a new transaction for each request for events.
|
|
|
- """
|
|
|
- if not events:
|
|
|
- defer.returnValue({})
|
|
|
-
|
|
|
- events_d = defer.Deferred()
|
|
|
- with self._event_fetch_lock:
|
|
|
- self._event_fetch_list.append(
|
|
|
- (events, events_d)
|
|
|
- )
|
|
|
-
|
|
|
- self._event_fetch_lock.notify()
|
|
|
-
|
|
|
- if self._event_fetch_ongoing < EVENT_QUEUE_THREADS:
|
|
|
- self._event_fetch_ongoing += 1
|
|
|
- should_start = True
|
|
|
- else:
|
|
|
- should_start = False
|
|
|
-
|
|
|
- if should_start:
|
|
|
- with PreserveLoggingContext():
|
|
|
- self.runWithConnection(
|
|
|
- self._do_fetch
|
|
|
- )
|
|
|
-
|
|
|
- logger.debug("Loading %d events", len(events))
|
|
|
- with PreserveLoggingContext():
|
|
|
- rows = yield events_d
|
|
|
- logger.debug("Loaded %d events (%d rows)", len(events), len(rows))
|
|
|
-
|
|
|
- if not allow_rejected:
|
|
|
- rows[:] = [r for r in rows if not r["rejects"]]
|
|
|
-
|
|
|
- res = yield make_deferred_yieldable(defer.gatherResults(
|
|
|
- [
|
|
|
- preserve_fn(self._get_event_from_row)(
|
|
|
- row["internal_metadata"], row["json"], row["redacts"],
|
|
|
- rejected_reason=row["rejects"],
|
|
|
- )
|
|
|
- for row in rows
|
|
|
- ],
|
|
|
- consumeErrors=True
|
|
|
- ))
|
|
|
-
|
|
|
- defer.returnValue({
|
|
|
- e.event.event_id: e
|
|
|
- for e in res if e
|
|
|
- })
|
|
|
-
|
|
|
- def _fetch_event_rows(self, txn, events):
|
|
|
- rows = []
|
|
|
- N = 200
|
|
|
- for i in range(1 + len(events) / N):
|
|
|
- evs = events[i * N:(i + 1) * N]
|
|
|
- if not evs:
|
|
|
- break
|
|
|
-
|
|
|
- sql = (
|
|
|
- "SELECT "
|
|
|
- " e.event_id as event_id, "
|
|
|
- " e.internal_metadata,"
|
|
|
- " e.json,"
|
|
|
- " r.redacts as redacts,"
|
|
|
- " rej.event_id as rejects "
|
|
|
- " FROM event_json as e"
|
|
|
- " LEFT JOIN rejections as rej USING (event_id)"
|
|
|
- " LEFT JOIN redactions as r ON e.event_id = r.redacts"
|
|
|
- " WHERE e.event_id IN (%s)"
|
|
|
- ) % (",".join(["?"] * len(evs)),)
|
|
|
-
|
|
|
- txn.execute(sql, evs)
|
|
|
- rows.extend(self.cursor_to_dict(txn))
|
|
|
-
|
|
|
- return rows
|
|
|
-
|
|
|
- @defer.inlineCallbacks
|
|
|
- def _get_event_from_row(self, internal_metadata, js, redacted,
|
|
|
- rejected_reason=None):
|
|
|
- with Measure(self._clock, "_get_event_from_row"):
|
|
|
- d = json.loads(js)
|
|
|
- internal_metadata = json.loads(internal_metadata)
|
|
|
-
|
|
|
- if rejected_reason:
|
|
|
- rejected_reason = yield self._simple_select_one_onecol(
|
|
|
- table="rejections",
|
|
|
- keyvalues={"event_id": rejected_reason},
|
|
|
- retcol="reason",
|
|
|
- desc="_get_event_from_row_rejected_reason",
|
|
|
- )
|
|
|
-
|
|
|
- original_ev = FrozenEvent(
|
|
|
- d,
|
|
|
- internal_metadata_dict=internal_metadata,
|
|
|
- rejected_reason=rejected_reason,
|
|
|
- )
|
|
|
-
|
|
|
- redacted_event = None
|
|
|
- if redacted:
|
|
|
- redacted_event = prune_event(original_ev)
|
|
|
-
|
|
|
- redaction_id = yield self._simple_select_one_onecol(
|
|
|
- table="redactions",
|
|
|
- keyvalues={"redacts": redacted_event.event_id},
|
|
|
- retcol="event_id",
|
|
|
- desc="_get_event_from_row_redactions",
|
|
|
- )
|
|
|
-
|
|
|
- redacted_event.unsigned["redacted_by"] = redaction_id
|
|
|
- # Get the redaction event.
|
|
|
-
|
|
|
- because = yield self.get_event(
|
|
|
- redaction_id,
|
|
|
- check_redacted=False,
|
|
|
- allow_none=True,
|
|
|
- )
|
|
|
-
|
|
|
- if because:
|
|
|
- # It's fine to do add the event directly, since get_pdu_json
|
|
|
- # will serialise this field correctly
|
|
|
- redacted_event.unsigned["redacted_because"] = because
|
|
|
-
|
|
|
- cache_entry = _EventCacheEntry(
|
|
|
- event=original_ev,
|
|
|
- redacted_event=redacted_event,
|
|
|
- )
|
|
|
-
|
|
|
- self._get_event_cache.prefill((original_ev.event_id,), cache_entry)
|
|
|
-
|
|
|
- defer.returnValue(cache_entry)
|
|
|
-
|
|
|
@defer.inlineCallbacks
|
|
|
def count_daily_messages(self):
|
|
|
"""
|
|
@@ -2375,7 +2063,7 @@ class EventsStore(SQLBaseStore):
|
|
|
to_2, so_2 = yield self._get_event_ordering(event_id2)
|
|
|
defer.returnValue((to_1, so_1) > (to_2, so_2))
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
+ @cachedInlineCallbacks(max_entries=5000)
|
|
|
def _get_event_ordering(self, event_id):
|
|
|
res = yield self._simple_select_one(
|
|
|
table="events",
|