diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-28 14:45:36 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-28 14:45:36 +0000 |
| commit | 167d1df699d64683f1f9ace759c772af1890ca56 (patch) | |
| tree | a9222f66b36c828df5ca2fcd455db820dcd80dca /synapse/storage/events.py | |
| parent | Quot all the things (diff) | |
| parent | Clean up a bit. Add comment (diff) | |
| download | synapse-167d1df699d64683f1f9ace759c772af1890ca56.tar.xz | |
Merge pull request #534 from matrix-org/erikj/setup
Add a Homeserver.setup method
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index ba368a3eca..298cb9bada 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -66,11 +66,9 @@ class EventsStore(SQLBaseStore): return if backfilled: - if not self.min_token_deferred.called: - yield self.min_token_deferred - start = self.min_token - 1 - self.min_token -= len(events_and_contexts) + 1 - stream_orderings = range(start, self.min_token, -1) + start = self.min_stream_token - 1 + self.min_stream_token -= len(events_and_contexts) + 1 + stream_orderings = range(start, self.min_stream_token, -1) @contextmanager def stream_ordering_manager(): @@ -107,10 +105,8 @@ class EventsStore(SQLBaseStore): is_new_state=True, current_state=None): stream_ordering = None if backfilled: - if not self.min_token_deferred.called: - yield self.min_token_deferred - self.min_token -= 1 - stream_ordering = self.min_token + self.min_stream_token -= 1 + stream_ordering = self.min_stream_token if stream_ordering is None: stream_ordering_manager = yield self._stream_id_gen.get_next(self) |