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

Populate cf_id member of CompactionJobInfo for OnCompactionBegin (#6938)

Browse Source 
Summary:
Looks like somebody simply missed initializing a member variable. The column family ID, cf_id, is not set during OnCompactionBegin. But it is set properly in the next function for OnCompactionCompleted. Need this cf_id for tracking progress of a Stardog optimize since there may be multiple compactions required for a given column family.

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

Reviewed By: siying

Differential Revision: D23153235

Pulled By: ajkr

fbshipit-source-id: 932938de3a4ebbc7ac89702f655583862587d251
This commit is contained in:
matthewvon 2020-08-17 11:52:23 -07:00 committed by Facebook GitHub Bot
parent 2a0d3c7054
commit 2ad88ceae9
1 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
db/db_impl/db_impl_compaction_flush.cc
View File

@ -6,11 +6,10 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl/db_impl.h"
#include <cinttypes> #include <cinttypes>
#include "db/builder.h" #include "db/builder.h"
#include "db/db_impl/db_impl.h"
#include "db/error_handler.h" #include "db/error_handler.h"
#include "db/event_helpers.h" #include "db/event_helpers.h"
#include "file/sst_file_manager_impl.h" #include "file/sst_file_manager_impl.h"
@ -1194,43 +1193,7 @@ void DBImpl::NotifyOnCompactionBegin(ColumnFamilyData* cfd, Compaction* c,
TEST_SYNC_POINT("DBImpl::NotifyOnCompactionBegin::UnlockMutex"); TEST_SYNC_POINT("DBImpl::NotifyOnCompactionBegin::UnlockMutex");
{ {
CompactionJobInfo info{}; CompactionJobInfo info{};
info.cf_name = cfd->GetName(); BuildCompactionJobInfo(cfd, c, st, job_stats, job_id, current, &info);
info.status = st;
info.thread_id = env_->GetThreadID();
info.job_id = job_id;
info.base_input_level = c->start_level();
info.output_level = c->output_level();
info.stats = job_stats;
info.table_properties = c->GetOutputTableProperties();
info.compaction_reason = c->compaction_reason();
info.compression = c->output_compression();
for (size_t i = 0; i < c->num_input_levels(); ++i) {
for (const auto fmd : *c->inputs(i)) {
const FileDescriptor& desc = fmd->fd;
const uint64_t file_number = desc.GetNumber();
auto fn = TableFileName(c->immutable_cf_options()->cf_paths,
file_number, desc.GetPathId());
info.input_files.push_back(fn);
info.input_file_infos.push_back(CompactionFileInfo{
static_cast<int>(i), file_number, fmd->oldest_blob_file_number});
if (info.table_properties.count(fn) == 0) {
std::shared_ptr<const TableProperties> tp;
auto s = current->GetTableProperties(&tp, fmd, &fn);
if (s.ok()) {
info.table_properties[fn] = tp;
}
}
}
}
for (const auto& newf : c->edit()->GetNewFiles()) {
const FileMetaData& meta = newf.second;
const FileDescriptor& desc = meta.fd;
const uint64_t file_number = desc.GetNumber();
info.output_files.push_back(TableFileName(
c->immutable_cf_options()->cf_paths, file_number, desc.GetPathId()));
info.output_file_infos.push_back(CompactionFileInfo{
newf.first, file_number, meta.oldest_blob_file_number});
}
for (auto listener : immutable_db_options_.listeners) { for (auto listener : immutable_db_options_.listeners) {
listener->OnCompactionBegin(this, info); listener->OnCompactionBegin(this, info);
} }
@ -2584,12 +2547,13 @@ Status DBImpl::BackgroundCompaction(bool* made_progress,
if (!c) { if (!c) {
m->done = true; m->done = true;
m->manual_end = nullptr; m->manual_end = nullptr;
ROCKS_LOG_BUFFER(log_buffer, ROCKS_LOG_BUFFER(
"[%s] Manual compaction from level-%d from %s .. " log_buffer,
"%s; nothing to do\n", "[%s] Manual compaction from level-%d from %s .. "
m->cfd->GetName().c_str(), m->input_level, "%s; nothing to do\n",
(m->begin ? m->begin->DebugString(true).c_str() : "(begin)"), m->cfd->GetName().c_str(), m->input_level,
(m->end ? m->end->DebugString(true).c_str() : "(end)")); (m->begin ? m->begin->DebugString(true).c_str() : "(begin)"),
(m->end ? m->end->DebugString(true).c_str() : "(end)"));
} else { } else {
// First check if we have enough room to do the compaction // First check if we have enough room to do the compaction
bool enough_room = EnoughRoomForCompaction( bool enough_room = EnoughRoomForCompaction(