diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-04-01 15:13:14 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-01 15:13:14 +0100 |
commit | f2b916534bdbb5d126311a3fbe653fa9d1e4dcf0 (patch) | |
tree | 0c0edfab04b20cde74447189dd0917b454b2b030 /synapse/storage/account_data.py | |
parent | Merge pull request #685 from matrix-org/erikj/sync_leave (diff) | |
parent | Assert that the step != 0 (diff) | |
download | synapse-f2b916534bdbb5d126311a3fbe653fa9d1e4dcf0.tar.xz |
Merge pull request #684 from matrix-org/markjh/backfill_id_gen
Use a stream id generator for backfilled ids
Diffstat (limited to 'synapse/storage/account_data.py')
-rw-r--r-- | synapse/storage/account_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/account_data.py b/synapse/storage/account_data.py index faddefe219..7a7fbf1e52 100644 --- a/synapse/storage/account_data.py +++ b/synapse/storage/account_data.py @@ -200,7 +200,7 @@ class AccountDataStore(SQLBaseStore): "add_room_account_data", add_account_data_txn, next_id ) - result = self._account_data_id_gen.get_max_token() + result = self._account_data_id_gen.get_current_token() defer.returnValue(result) @defer.inlineCallbacks @@ -239,7 +239,7 @@ class AccountDataStore(SQLBaseStore): "add_user_account_data", add_account_data_txn, next_id ) - result = self._account_data_id_gen.get_max_token() + result = self._account_data_id_gen.get_current_token() defer.returnValue(result) def _update_max_stream_id(self, txn, next_id): |