From 6f5ceff3db58b014901a74bf4d671590408abdf4 Mon Sep 17 00:00:00 2001
From: Andrew Byers <andrew.d.byers@gmail.com>
Date: Sat, 11 Feb 2023 06:38:38 -0600
Subject: [PATCH] db_bench: fix for issue (#290) (#370)

Changed db_bench so that when using multiple databases (num_multi_db > 1) we only destroy databases that were used for the current group (databases specified in dbs_to_use).

Added logic in `OpenAllDbs()` to handle the case where the `-optimistic_transaction_db` option is used.

Co-authored-by: andy-byers <andrew.byers@utdallas.edu>
---
 tools/db_bench_tool.cc | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc
index e596c975fd..e3bf00b84d 100644
--- a/tools/db_bench_tool.cc
+++ b/tools/db_bench_tool.cc
@@ -2943,7 +2943,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
@@ -2955,6 +2954,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);
         }
@@ -2964,17 +2976,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);
         }
@@ -4023,7 +4035,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();