MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-22 08:04:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'notifier_unify' into notifier_performance

Browse source
This commit is contained in:
Mark Haines 2015-05-12 13:11:54 +01:00
commit 78672a9fd5
3 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/notifier.py
View file

@ -316,7 +316,7 @@ class Notifier(object):
user, getattr(from_token, keyname), limit, user, getattr(from_token, keyname), limit,
) )
events.extend(stuff) events.extend(stuff)
end_token = from_token.copy_and_replace(keyname, new_key) end_token = end_token.copy_and_replace(keyname, new_key)
if events: if events:
defer.returnValue((events, (from_token, end_token))) defer.returnValue((events, (from_token, end_token)))

18
synapse/storage/events.py
View file

@ -23,6 +23,7 @@ from synapse.crypto.event_signing import compute_event_reference_hash
from syutil.base64util import decode_base64 from syutil.base64util import decode_base64
from syutil.jsonutil import encode_canonical_json from syutil.jsonutil import encode_canonical_json
from contextlib import contextmanager
import logging import logging
@ -41,7 +42,15 @@ class EventsStore(SQLBaseStore):
self.min_token -= 1 self.min_token -= 1
stream_ordering = self.min_token stream_ordering = self.min_token
if stream_ordering is None:
stream_ordering_manager = yield self._stream_id_gen.get_next(self)
else:
@contextmanager
def stream_ordering_manager():
yield stream_ordering
try: try:
with stream_ordering_manager as stream_ordering:
yield self.runInteraction( yield self.runInteraction(
"persist_event", "persist_event",
self._persist_event_txn, self._persist_event_txn,
@ -95,15 +104,6 @@ class EventsStore(SQLBaseStore):
# Remove the any existing cache entries for the event_id # Remove the any existing cache entries for the event_id
txn.call_after(self._invalidate_get_event_cache, event.event_id) txn.call_after(self._invalidate_get_event_cache, event.event_id)
if stream_ordering is None:
with self._stream_id_gen.get_next_txn(txn) as stream_ordering:
return self._persist_event_txn(
txn, event, context, backfilled,
stream_ordering=stream_ordering,
is_new_state=is_new_state,
current_state=current_state,
)
# We purposefully do this first since if we include a `current_state` # We purposefully do this first since if we include a `current_state`
# key, we *want* to update the `current_state_events` table # key, we *want* to update the `current_state_events` table
if current_state: if current_state:

12
synapse/storage/util/id_generators.py
View file

@ -78,14 +78,18 @@ class StreamIdGenerator(object):
self._current_max = None self._current_max = None
self._unfinished_ids = deque() self._unfinished_ids = deque()
def get_next_txn(self, txn): @defer.inlineCallbacks
def get_next(self, store):
""" """
Usage: Usage:
with stream_id_gen.get_next_txn(txn) as stream_id: with yield stream_id_gen.get_next as stream_id:
# ... persist event ... # ... persist event ...
""" """
if not self._current_max: if not self._current_max:
self._get_or_compute_current_max(txn) yield store.runInteraction(
"_compute_current_max",
self._get_or_compute_current_max,
)
with self._lock: with self._lock:
self._current_max += 1 self._current_max += 1
@ -101,7 +105,7 @@ class StreamIdGenerator(object):
with self._lock: with self._lock:
self._unfinished_ids.remove(next_id) self._unfinished_ids.remove(next_id)
return manager() defer.returnValue(manager())
@defer.inlineCallbacks @defer.inlineCallbacks
def get_max_token(self, store): def get_max_token(self, store):