dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant consistency check from VersionStorageInfo::AddFile (#7237) 

Summary:
`VersionStorageInfo::AddFile` currently has a debug-mode consistency
check to make sure the newly added file does not overlap with the
previous one (for levels below L0). Considering that
`VersionBuilder::CheckConsistency` also performs similar checks (in
fact, those checks are more comprehensive and cover L0 as well), this
check is redundant. The patch removes it and also cleans up `AddFile` a
little.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/7237

Test Plan: `make check`

Reviewed By: riversand963

Differential Revision: D23041937

Pulled By: ltamasi

fbshipit-source-id: e00665f3b83bfd17f86c54c238800f3d77d739bd
This commit is contained in:
Levi Tamasi 2020-08-11 09:22:00 -07:00 committed by Facebook GitHub Bot
parent 7eebe6d38a
commit a99fb67233
3 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/version_builder.cc
View File

@ -989,8 +989,7 @@ class VersionBuilder::Rep {
if (add_it != add_files.end() && add_it->second != f) { if (add_it != add_files.end() && add_it->second != f) {
vstorage->RemoveCurrentStats(f); vstorage->RemoveCurrentStats(f);
} else { } else {
assert(ioptions_); vstorage->AddFile(level, f);
vstorage->AddFile(level, f, ioptions_->info_log);
} }
} }
} }

30
db/version_set.cc
View File

@ -2645,37 +2645,17 @@ bool CompareCompensatedSizeDescending(const Fsize& first, const Fsize& second) {
} }
} // anonymous namespace } // anonymous namespace
void VersionStorageInfo::AddFile(int level, FileMetaData* f, Logger* info_log) { void VersionStorageInfo::AddFile(int level, FileMetaData* f) {
auto* level_files = &files_[level]; auto& level_files = files_[level];
// Must not overlap level_files.push_back(f);
#ifndef NDEBUG
if (level > 0 && !level_files->empty() &&
internal_comparator_->Compare(
(*level_files)[level_files->size() - 1]->largest, f->smallest) >= 0) {
auto* f2 = (*level_files)[level_files->size() - 1];
if (info_log != nullptr) {
Error(info_log, "Adding new file %" PRIu64
" range (%s, %s) to level %d but overlapping "
"with existing file %" PRIu64 " %s %s",
f->fd.GetNumber(), f->smallest.DebugString(true).c_str(),
f->largest.DebugString(true).c_str(), level, f2->fd.GetNumber(),
f2->smallest.DebugString(true).c_str(),
f2->largest.DebugString(true).c_str());
LogFlush(info_log);
}
assert(false);
}
#else
(void)info_log;
#endif
f->refs++; f->refs++;
level_files->push_back(f);
const uint64_t file_number = f->fd.GetNumber(); const uint64_t file_number = f->fd.GetNumber();
assert(file_locations_.find(file_number) == file_locations_.end()); assert(file_locations_.find(file_number) == file_locations_.end());
file_locations_.emplace(file_number, file_locations_.emplace(file_number,
FileLocation(level, level_files->size() - 1)); FileLocation(level, level_files.size() - 1));
} }
void VersionStorageInfo::AddBlobFile( void VersionStorageInfo::AddBlobFile(

2
db/version_set.h
View File

@ -119,7 +119,7 @@ class VersionStorageInfo {
void Reserve(int level, size_t size) { files_[level].reserve(size); } void Reserve(int level, size_t size) { files_[level].reserve(size); }
void AddFile(int level, FileMetaData* f, Logger* info_log = nullptr); void AddFile(int level, FileMetaData* f);
void AddBlobFile(std::shared_ptr<BlobFileMetaData> blob_file_meta); void AddBlobFile(std::shared_ptr<BlobFileMetaData> blob_file_meta);