andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

firstIndex fix for multi-threaded compaction code.

Browse Source 
Summary:
Prior to multi-threaded compaction, wrap-around would be done by using
current_->files_[level[0]. With this change we should be
using the first file for which f->being_compacted is not true.

1ca0584345 (commitcomment-2041516)

Test Plan: make check

Differential Revision: https://reviews.facebook.net/D6165
This commit is contained in:
Dhruba Borthakur 2012-10-23 22:36:22 -07:00
parent 47bce26aca
commit 8fb5f40468
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db/version_set.cc
View File

@ -1587,7 +1587,7 @@ Compaction* VersionSet::PickCompactionBySize(int level) {
MaxGrandParentOverlapBytes(level), NumberLevels());
// remember the first file that is not being compacted
int firstIndex = 0;
int firstIndex = -1;
// Pick the first file that comes after compact_pointer_[level]
for (size_t i = 0; i < current_->files_[level].size(); i++) {
@ -1597,7 +1597,9 @@ Compaction* VersionSet::PickCompactionBySize(int level) {
if (f->being_compacted) {
continue;
}
firstIndex = i;
if (firstIndex == -1) {
firstIndex = i;
}
// Pick a file that has a key-range larger than the range
// we picked in the previous call to PickCompaction.
@ -1612,7 +1614,7 @@ Compaction* VersionSet::PickCompactionBySize(int level) {
break;
}
}
if (c->inputs_[0].empty()) {
if (c->inputs_[0].empty() && firstIndex != -1) {
// Wrap-around to the beginning of the key space
FileMetaData* f = current_->files_[level][firstIndex];
if (!f->being_compacted && !ParentFilesInCompaction(f, level)) {