From 6c4fcde5493a38b3c933ba935eba150ebfb4906e Mon Sep 17 00:00:00 2001
From: mrambacher <mrambach@gmail.com>
Date: Thu, 5 May 2022 13:42:34 -0400
Subject: [PATCH] Add GetTestNameForDB Method

Add a method that allows the test name to be part of the DB name.  This makes it easier to associate a given test run with a given test.  Otherwise, some of the tests will overwrite the old data from a previous test.
---
 db/db_test_util.cc       |  2 +-
 test_util/testharness.cc | 24 ++++++++++++++++++++++++
 test_util/testharness.h  |  3 +++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/db/db_test_util.cc b/db/db_test_util.cc
index 2fa5c0997..586f3d0b0 100644
--- a/db/db_test_util.cc
+++ b/db/db_test_util.cc
@@ -87,7 +87,7 @@ DBTestBase::DBTestBase(const std::string path, bool env_do_fsync)
   env_->SetBackgroundThreads(1, Env::LOW);
   env_->SetBackgroundThreads(1, Env::HIGH);
   env_->skip_fsync_ = !env_do_fsync;
-  dbname_ = test::PerThreadDBPath(env_, path);
+  dbname_ = test::PerThreadDBPath(env_, test::GetTestNameForDB(path));
   alternative_wal_dir_ = dbname_ + "/wal";
   alternative_db_log_dir_ = dbname_ + "/db_log_dir";
   auto options = CurrentOptions();
diff --git a/test_util/testharness.cc b/test_util/testharness.cc
index 32d8a07d7..0072ab24d 100644
--- a/test_util/testharness.cc
+++ b/test_util/testharness.cc
@@ -33,6 +33,30 @@ std::string GetPidStr() { return std::to_string(getpid()); }
   }
 }
 
+// If suggested is empty, the name will be <test case>-<test name>
+// Replaces all of the "/" in the test case/name with "_", so that they will not
+// appear as directories
+std::string GetTestNameForDB(const std::string& suggested) {
+  const testing::TestInfo* const test_info =
+      testing::UnitTest::GetInstance()->current_test_info();
+  std::string test_name = test_info->name();
+  std::string test_case = test_info->test_case_name();
+  auto pos = test_case.find("/");
+  if (pos != test_case.npos && !suggested.empty()) {
+    test_case = suggested;
+  } else {
+    while (pos != test_case.npos) {
+      test_case[pos] = '_';
+      pos = test_case.find("/", pos);
+    }
+  }
+  for (pos = test_name.find("/"); pos != test_name.npos;
+       pos = test_name.find("/", pos)) {
+    test_name[pos] = '_';
+  }
+  return test_case + "-" + test_name;
+}
+
 std::string TmpDir(Env* env) {
   std::string dir;
   Status s = env->GetTestDirectory(&dir);
diff --git a/test_util/testharness.h b/test_util/testharness.h
index 8576eea62..ddc1c99b3 100644
--- a/test_util/testharness.h
+++ b/test_util/testharness.h
@@ -57,6 +57,9 @@
 namespace ROCKSDB_NAMESPACE {
 namespace test {
 
+// Return a name of the DB for this test, based on the test case/name
+std::string GetTestNameForDB(const std::string& suggested = "");
+
 // Return the directory to use for temporary storage.
 std::string TmpDir(Env* env = Env::Default());