diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-07 17:30:37 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-07 17:30:37 +0100 |
| commit | da84fa3d747cf7c926b08abb17ed68a6dd195b24 (patch) | |
| tree | 8641d93b820f619f28b8cd588e7b532839b955c4 /synapse | |
| parent | Merge pull request #704 from matrix-org/markh/slaveIII (diff) | |
| parent | Add tests for redactions (diff) | |
| download | synapse-da84fa3d747cf7c926b08abb17ed68a6dd195b24.tar.xz | |
Merge pull request #706 from matrix-org/markjh/slaveIV
Add tests for redactions
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/replication/slave/storage/events.py | 4 | ||||
| -rw-r--r-- | synapse/storage/util/id_generators.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 707ddd248a..cfc728a038 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -69,6 +69,7 @@ class SlavedEventStore(BaseSlavedStore): "_get_current_state_for_key" ] + get_event = DataStore.get_event.__func__ get_current_state = DataStore.get_current_state.__func__ get_current_state_for_key = DataStore.get_current_state_for_key.__func__ get_rooms_for_user_where_membership_is = ( @@ -103,7 +104,7 @@ class SlavedEventStore(BaseSlavedStore): def stream_positions(self): result = super(SlavedEventStore, self).stream_positions() result["events"] = self._stream_id_gen.get_current_token() - result["backfilled"] = self._backfill_id_gen.get_current_token() + result["backfill"] = self._backfill_id_gen.get_current_token() return result def process_replication(self, result): @@ -145,7 +146,6 @@ class SlavedEventStore(BaseSlavedStore): position = row[0] internal = json.loads(row[1]) event_json = json.loads(row[2]) - event = FrozenEvent(event_json, internal_metadata_dict=internal) self._invalidate_caches_for_event( event, backfilled, reset_state=position in state_resets diff --git a/synapse/storage/util/id_generators.py b/synapse/storage/util/id_generators.py index f69f1cdad4..46cf93ff87 100644 --- a/synapse/storage/util/id_generators.py +++ b/synapse/storage/util/id_generators.py @@ -112,7 +112,7 @@ class StreamIdGenerator(object): self._current + self._step * (n + 1), self._step ) - self._current += n + self._current += n * self._step for next_id in next_ids: self._unfinished_ids.append(next_id) |