Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

db_bench: fix for issue #290 #370

Merged
merged 1 commit into from
Feb 11, 2023
Merged

db_bench: fix for issue #290 #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions tools/db_bench_tool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2941,7 +2941,6 @@ class Benchmark {
}

void OpenAllDbs(Options options) {
assert(dbs_.empty());
assert(FLAGS_num_multi_db > 0);

// dbs_to_use_ is NOT initialized here since we open the db-s once for all
Expand All @@ -2953,6 +2952,19 @@ class Benchmark {
} else {
auto wal_dir = options.wal_dir;
for (int i = 0; i < FLAGS_num_multi_db; i++) {
#ifndef ROCKSDB_LITE
if (FLAGS_optimistic_transaction_db) {
if (dbs_[i].opt_txn_db) {
continue;
}
} else if (dbs_[i].db) {
continue;
}
#else // ROCKSDB_LITE
if (dbs_[i].db) {
continue;
}
#endif // ROCKSDB_LITE
if (!wal_dir.empty()) {
options.wal_dir = GetPathForMultiple(wal_dir, i);
}
Expand All @@ -2962,17 +2974,17 @@ class Benchmark {
}
}

void DestroyAllDbs() {
// Record the number of db-s as dbs_ is cleared inside DeleteDBs()
auto num_dbs = dbs_.size();

DeleteDBs();
void DestroyUsedDbs() {
for (auto i : db_idxs_to_use) {
dbs_[i].DeleteDBs();
}
dbs_to_use_.clear();

if (num_dbs == 1U) {
if (IsSingleDb()) {
DestroyDB(FLAGS_db, open_options_);
} else if (num_dbs > 1U) {
} else if (IsMultiDb()) {
Options options = open_options_;
for (auto i = 0U; i < num_dbs; ++i) {
for (auto i : db_idxs_to_use) {
if (!open_options_.wal_dir.empty()) {
options.wal_dir = GetPathForMultiple(open_options_.wal_dir, i);
}
Expand Down Expand Up @@ -4006,7 +4018,7 @@ class Benchmark {
"--use_existing_db",
name.c_str());
} else {
DestroyAllDbs();
DestroyUsedDbs();
Open(&open_options_); // use open_options for the last accessed
// There are new DB-s => Re-initialize dbs_to_use_
InitDbsToUse();
Expand Down