diff options
| author | Pieter Wuille <[email protected]> | 2016-12-01 16:14:45 -0800 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-12-01 16:14:45 -0800 |
| commit | 605d701471c3ee84682b0c149e41142d7cea95e7 (patch) | |
| tree | 7a6af0e78ee2202f510686e9a3561c28829b8a4b /src/leveldb/db/db_impl.h | |
| parent | Merge #9183: Final Preparation for main.cpp Split (diff) | |
| parent | Squashed 'src/leveldb/' changes from 20ca81f..a31c8aa (diff) | |
| download | discoin-605d701471c3ee84682b0c149e41142d7cea95e7.tar.xz discoin-605d701471c3ee84682b0c149e41142d7cea95e7.zip | |
Merge in LevelDB 1.19 changes
Diffstat (limited to 'src/leveldb/db/db_impl.h')
| -rw-r--r-- | src/leveldb/db/db_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leveldb/db/db_impl.h b/src/leveldb/db/db_impl.h index cfc998164..8ff323e72 100644 --- a/src/leveldb/db/db_impl.h +++ b/src/leveldb/db/db_impl.h @@ -78,7 +78,8 @@ class DBImpl : public DB { // Recover the descriptor from persistent storage. May do a significant // amount of work to recover recently logged updates. Any changes to // be made to the descriptor are added to *edit. - Status Recover(VersionEdit* edit) EXCLUSIVE_LOCKS_REQUIRED(mutex_); + Status Recover(VersionEdit* edit, bool* save_manifest) + EXCLUSIVE_LOCKS_REQUIRED(mutex_); void MaybeIgnoreError(Status* s) const; @@ -90,9 +91,8 @@ class DBImpl : public DB { // Errors are recorded in bg_error_. void CompactMemTable() EXCLUSIVE_LOCKS_REQUIRED(mutex_); - Status RecoverLogFile(uint64_t log_number, - VersionEdit* edit, - SequenceNumber* max_sequence) + Status RecoverLogFile(uint64_t log_number, bool last_log, bool* save_manifest, + VersionEdit* edit, SequenceNumber* max_sequence) EXCLUSIVE_LOCKS_REQUIRED(mutex_); Status WriteLevel0Table(MemTable* mem, VersionEdit* edit, Version* base) |