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

DBImpl::FindObsoleteFiles() not to call GetChildren() on the same path

Browse Source 
Summary:
DBImpl::FindObsoleteFiles() may call GetChildren() multiple times if different CFs are on the same path. Fix it.
Closes https://github.com/facebook/rocksdb/pull/3885

Differential Revision: D8084634

Pulled By: siying

fbshipit-source-id: b471fbc251f6a05e9243304dc14c0831060cc0b0
This commit is contained in:
Siying Dong 2018-05-31 12:53:43 -07:00 committed by Facebook Github Bot
parent a35451eaa4
commit 82089d59c3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/db_impl_files.cc
View File

@ -12,6 +12,7 @@
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif
#include <inttypes.h> #include <inttypes.h>
#include <set>
#include <unordered_set> #include <unordered_set>
#include "db/event_helpers.h" #include "db/event_helpers.h"
#include "db/memtable_list.h" #include "db/memtable_list.h"
@ -99,10 +100,10 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
if (doing_the_full_scan) { if (doing_the_full_scan) {
InfoLogPrefix info_log_prefix(!immutable_db_options_.db_log_dir.empty(), InfoLogPrefix info_log_prefix(!immutable_db_options_.db_log_dir.empty(),
dbname_); dbname_);
std::vector<std::string> paths; std::set<std::string> paths;
for (size_t path_id = 0; path_id < immutable_db_options_.db_paths.size(); for (size_t path_id = 0; path_id < immutable_db_options_.db_paths.size();
path_id++) { path_id++) {
paths.emplace_back(immutable_db_options_.db_paths[path_id].path); paths.insert(immutable_db_options_.db_paths[path_id].path);
} }
// Note that if cf_paths is not specified in the ColumnFamilyOptions // Note that if cf_paths is not specified in the ColumnFamilyOptions
@ -113,7 +114,11 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
for (auto cfd : *versions_->GetColumnFamilySet()) { for (auto cfd : *versions_->GetColumnFamilySet()) {
for (size_t path_id = 0; path_id < cfd->ioptions()->cf_paths.size(); for (size_t path_id = 0; path_id < cfd->ioptions()->cf_paths.size();
path_id++) { path_id++) {
paths.emplace_back(cfd->ioptions()->cf_paths[path_id].path); auto& path = cfd->ioptions()->cf_paths[path_id].path;
if (paths.find(path) == paths.end()) {
paths.insert(path);
}
} }
} }