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

Fix compile fail introduced by merge

Browse Source
This commit is contained in:
Igor Canadi 2014-03-05 12:47:44 -08:00
parent a329dd1b25
commit e2dd148a8b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db/compaction_picker.cc
View File

@ -557,7 +557,7 @@ Compaction* UniversalCompactionPicker::PickCompaction(Version* version) {
// Check for size amplification first. // Check for size amplification first.
Compaction* c; Compaction* c;
if ((c = PickCompactionUniversalSizeAmp(version, score)) != nullptr) { if ((c = PickCompactionUniversalSizeAmp(version, score)) != nullptr) {
Log(options_->info_log, "Universal: compacting for size amp\n"); Log(logger_, "Universal: compacting for size amp\n");
} else { } else {
// Size amplification is within limits. Try reducing read // Size amplification is within limits. Try reducing read
@ -565,7 +565,7 @@ Compaction* UniversalCompactionPicker::PickCompaction(Version* version) {
unsigned int ratio = options_->compaction_options_universal.size_ratio; unsigned int ratio = options_->compaction_options_universal.size_ratio;
if ((c = PickCompactionUniversalReadAmp(version, score, ratio, UINT_MAX)) != nullptr) { if ((c = PickCompactionUniversalReadAmp(version, score, ratio, UINT_MAX)) != nullptr) {
Log(options_->info_log, "Universal: compacting for size ratio\n"); Log(logger_, "Universal: compacting for size ratio\n");
} else { } else {
// Size amplification and file size ratios are within configured limits. // Size amplification and file size ratios are within configured limits.
// If max read amplification is exceeding configured limits, then force // If max read amplification is exceeding configured limits, then force
@ -574,7 +574,7 @@ Compaction* UniversalCompactionPicker::PickCompaction(Version* version) {
unsigned int num_files = version->files_[level].size() - unsigned int num_files = version->files_[level].size() -
options_->level0_file_num_compaction_trigger; options_->level0_file_num_compaction_trigger;
if ((c = PickCompactionUniversalReadAmp(version, score, UINT_MAX, num_files)) != nullptr) { if ((c = PickCompactionUniversalReadAmp(version, score, UINT_MAX, num_files)) != nullptr) {
Log(options_->info_log, "Universal: compacting for file num\n"); Log(logger_, "Universal: compacting for file num\n");
} }
} }
} }
@ -689,7 +689,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(
uint64_t sz = (candidate_size * (100L + ratio)) /100; uint64_t sz = (candidate_size * (100L + ratio)) /100;
if (sz < f->file_size) { if (sz < f->file_size) {
break; break;
} }
if (options_->compaction_options_universal.stop_style == kCompactionStopStyleSimilarSize) { if (options_->compaction_options_universal.stop_style == kCompactionStopStyleSimilarSize) {
// Similar-size stopping rule: also check the last picked file isn't // Similar-size stopping rule: also check the last picked file isn't
// far larger than the next candidate file. // far larger than the next candidate file.