From 74c563f94e4b02779465ead2b2dbce0db59e352a Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Thu, 17 Feb 2022 14:11:18 +0800 Subject: merge: Merge remote-tracking branch google/main@4fb1468 Signed-off-by: KunoiSayami --- db/version_set.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'db/version_set.cc') diff --git a/db/version_set.cc b/db/version_set.cc index 8d85fce..4e37bf9 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -626,7 +626,7 @@ class VersionSet::Builder { } // Apply all of the edits in *edit to the current state. - void Apply(VersionEdit* edit) { + void Apply(const VersionEdit* edit) { // Update compaction pointers for (size_t i = 0; i < edit->compact_pointers_.size(); i++) { const int level = edit->compact_pointers_[i].first; @@ -806,7 +806,6 @@ Status VersionSet::LogAndApply(VersionEdit* edit, port::Mutex* mu) { // first call to LogAndApply (when opening the database). assert(descriptor_file_ == nullptr); new_manifest_file = DescriptorFileName(dbname_, manifest_file_number_); - edit->SetNextFile(next_file_number_); s = env_->NewWritableFile(new_manifest_file, &descriptor_file_); if (s.ok()) { descriptor_log_ = new log::Writer(descriptor_file_); @@ -1304,7 +1303,7 @@ Compaction* VersionSet::PickCompaction() { return c; } -// Finds the largest key in a vector of files. Returns true if files it not +// Finds the largest key in a vector of files. Returns true if files is not // empty. bool FindLargestKey(const InternalKeyComparator& icmp, const std::vector& files, -- cgit v1.3.1