Fix compaction summary log for trivial move

Summary: When trivial move commit is done, we log the summary of the input version instead of current. This is inconsistent with other log messages and confusing.

Test Plan: compiles

Reviewers: sdong

Reviewed By: sdong

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D30939
This commit is contained in:
Igor Canadi 2015-01-05 17:32:49 -08:00
parent 9d5bd411be
commit 07aa4e0e35

View File

@ -2163,11 +2163,12 @@ Status DBImpl::BackgroundCompaction(bool* madeProgress, JobContext* job_context,
VersionStorageInfo::LevelSummaryStorage tmp; VersionStorageInfo::LevelSummaryStorage tmp;
c->column_family_data()->internal_stats()->IncBytesMoved( c->column_family_data()->internal_stats()->IncBytesMoved(
c->level() + 1, f->fd.GetFileSize()); c->level() + 1, f->fd.GetFileSize());
LogToBuffer(log_buffer, "[%s] Moved #%" PRIu64 " to level-%d %" PRIu64 LogToBuffer(
" bytes %s: %s\n", log_buffer,
c->column_family_data()->GetName().c_str(), f->fd.GetNumber(), "[%s] Moved #%" PRIu64 " to level-%d %" PRIu64 " bytes %s: %s\n",
c->level() + 1, f->fd.GetFileSize(), status.ToString().c_str(), c->column_family_data()->GetName().c_str(), f->fd.GetNumber(),
c->input_version()->storage_info()->LevelSummary(&tmp)); c->level() + 1, f->fd.GetFileSize(), status.ToString().c_str(),
c->column_family_data()->current()->storage_info()->LevelSummary(&tmp));
c->ReleaseCompactionFiles(status); c->ReleaseCompactionFiles(status);
*madeProgress = true; *madeProgress = true;
} else { } else {