From 2b0bd8ccd9223673c2a1016ac6bb3de53d641058 Mon Sep 17 00:00:00 2001 From: tkaya Date: Wed, 1 Apr 2020 22:53:28 +0200 Subject: [PATCH 1/3] added unit tests (for db.cpp) and changed CMake to include new unit tests --- tests/unit/CMakeLists.txt | 60 ++++++++- tests/unit/db_test.cpp | 270 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 327 insertions(+), 3 deletions(-) create mode 100644 tests/unit/db_test.cpp diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 08a6f139e..d3ab402c6 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -29,16 +29,70 @@ target_link_libraries(catch2_main Catch2::Catch2 ) +# needed for filesystem header +set(CMAKE_CXX_STANDARD 17) + # define executables for tests and make them depend on the convenience # library (and Catch2 transitively) and fmt + +# test source files +set(test_src + test_example_00.cpp + test_example_01.cpp + db_test.cpp + ) + +# needed headers +set(test_headers + ../../src/global/rpc/rpc_utils.cpp + ../../src/global/path_util.cpp + ../../src/daemon/ops/metadentry.cpp + ../../src/daemon/classes/fs_data.cpp + ../../src/daemon/handler/h_preload.cpp + ../../src/global/metadata.cpp + ../../include/global/metadata.hpp + ../../include/daemon/classes/fs_data.hpp + ../../include/daemon/main.hpp + ../../include/version.hpp + ../../include/global/configure.hpp + ../../include/global/global_defs.hpp + ../../include/global/rpc/rpc_types.hpp + ../../include/global/rpc/rpc_utils.hpp + ../../include/global/path_util.hpp + ../../include/daemon/main.hpp + ../../include/daemon/ops/metadentry.hpp + ../../include/daemon/classes/fs_data.hpp + ../../include/daemon/classes/rpc_data.hpp + ../../include/daemon/handler/rpc_defs.hpp + ) + add_executable(tests - test_example_00.cpp - test_example_01.cpp -) + ${test_src} + ${test_headers} + ) +# probably dont need all yet target_link_libraries(tests catch2_main fmt::fmt + metadata + metadata_db + storage + distributor + log_util + env_util + spdlog + hermes + # margo libs + ${ABT_LIBRARIES} + mercury + ${MARGO_LIBRARIES} + # others + Boost::boost # needed for tokenizer header + Boost::program_options + Boost::filesystem + Threads::Threads + pthread ) # Catch2's contrib folder includes some helper functions diff --git a/tests/unit/db_test.cpp b/tests/unit/db_test.cpp new file mode 100644 index 000000000..a5c1dfa88 --- /dev/null +++ b/tests/unit/db_test.cpp @@ -0,0 +1,270 @@ +// +// Created by tunahan on 10.02.20. +// + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +// BDD STYLE +SCENARIO("Test Db functionality"){ + + GIVEN("Open a db") { + int i = 0; + // when open db + std::string metadata_path = "/tmp/db_test" + std::to_string(i); + MetadataDB db = MetadataDB(metadata_path); + i++; + WHEN("Try to input key") { + std::string key = "/a"; + std::string val = "453|123|"; + + db.put(key, val); + THEN("Key and value in DB") { + auto res = db.get(key); + REQUIRE(res == val); + } + } + system( (std::string("rm -rf ") + metadata_path).data()); + metadata_path = "/tmp/db_test" + std::to_string(i); + db = MetadataDB(metadata_path); + i++; + WHEN("RocksDB 1 key two values - returns first value"){ + std::string key = "/a"; + std::string val = "453|123|"; + std::string val2 = "453|124|"; + + THEN("First value returns for key"){ + + db.put(key, val); + db.put(key, val2); + + auto res = db.get(key); + REQUIRE(res == val); + } + } + + system( (std::string("rm -rf ") + metadata_path).data()); + + } + +} + +// Regular test case style +TEST_CASE("RocksDB single input"){ + std::string metadata_path = "/home/tunahan/rocksdb"; + std::string key = "/a"; + std::string val = "453|123|"; + try { + MetadataDB db = MetadataDB(metadata_path); + db.put(key, val); + + auto res = db.get(key); + REQUIRE(res == val); + + } catch (const std::exception & e) { + throw; + } +} +TEST_CASE("RocksDB 1 key two values - returns first value"){ + std::string metadata_path = "/home/tunahan/rocksdb"; + + std::string key = "/a"; + std::string val = "453|123|"; + std::string val2 = "453|124|"; + + try { + MetadataDB db = MetadataDB(metadata_path); + db.put(key, val); + db.put(key, val2); + auto res = db.get(key); + REQUIRE(res == val); + + } catch (const std::exception & e) { + throw; + } +} + +TEST_CASE("RocksDB delete inserted key"){ + std::string metadata_path = "/home/tunahan/rocksdb"; + + std::string key = "/"; + std::string val = "453|123|"; + + try { + MetadataDB db = MetadataDB(metadata_path); + db.put(key, val); + db.remove(key); + + } catch (const std::exception & e) { + throw; + } +} + + +TEST_CASE("RocksDB get deleted key"){ + std::string metadata_path = "/home/tunahan/rocksdb"; + + std::string key = "/"; + std::string val = "453|123|"; + + try { + MetadataDB db = MetadataDB(metadata_path); + db.put(key, val); + db.remove(key); + REQUIRE_THROWS(db.get(key), "Not Found: "); + + } catch (const std::exception & e) { + throw; + } +} + + +TEST_CASE("RocksDB update key"){ + std::string metadata_path = "/home/tunahan/rocksdb"; + + std::string key = "/"; + std::string key2 = "/a"; + std::string val = "453|123|"; + std::string val2 = "453|151|"; + + try { + MetadataDB db = MetadataDB(metadata_path); + db.put(key, val); + db.update(key, key2, val2); + auto res2 = db.get(key2); + REQUIRE_THROWS(db.get(key), "Not Found: "); + REQUIRE(res2 == val2); + } catch (const std::exception & e) { + throw; + } +} + +std::string gen_random(const int len, bool key) { + std::string s; + s.resize(len); + static const char alphanum[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz"; + + static const char numbers[] = "123456789"; + if (key) { + s[0] = '/'; + for (int i = 1; i < len; ++i) { + s[i] = alphanum[std::rand() % (sizeof(alphanum) - 1)]; + } + s[len] = '\0'; + }else{ + if(len < 6) return s; + for (int i = 0; i < len-5; ++i) { + s[i] = numbers[std::rand() % (sizeof(numbers) - 1)]; + } + s[len-5] = '|'; + for (int i = len-4; i < len; ++i) { + s[i] = numbers[std::rand() % (sizeof(numbers) - 1)]; + } + + s[len-1] = '|'; + } + return s; +} + +TEST_CASE("Bulk Insert/Get - single core"){ + std::string metadata_path = "/home/tunahan/rocksdb"; + + const int number_Entries = 100; + const int len_strings = 10; + std::set keyList; + std::vector valList; + for(int i = 0; i < number_Entries; i++){ + std::string temp; + temp = gen_random(len_strings, false); + valList.push_back(temp); + //std::cout << temp << "\n"; + temp = gen_random(len_strings, true); + keyList.insert(temp); + //std::cout << temp << "\n"; + } + + try { + MetadataDB db = MetadataDB(metadata_path); + auto keys = keyList.begin(); + for(int i = 0; i threads; + + for (int i = 0; i < 8; ++i) { + threads.emplace_back([&](){ + const int len_strings = 10; + std::set keyList; + std::vector valList; + for(int i = 0; i < number_Entries; i++){ + std::string temp; + temp = gen_random(len_strings, false); + valList.push_back(temp); + temp = gen_random(len_strings, true); + keyList.insert(temp); + } + auto keys = keyList.begin(); + for(int i = 0; i Date: Tue, 5 May 2020 22:14:31 +0200 Subject: [PATCH 2/3] Added unit-tests for RocksDB --- tests/unit/CMakeLists.txt | 3 +- tests/unit/db_test.cpp | 368 +++++++++++++++++++++----------------- 2 files changed, 208 insertions(+), 163 deletions(-) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index d3ab402c6..8e03e55d0 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -29,8 +29,7 @@ target_link_libraries(catch2_main Catch2::Catch2 ) -# needed for filesystem header -set(CMAKE_CXX_STANDARD 17) + # define executables for tests and make them depend on the convenience # library (and Catch2 transitively) and fmt diff --git a/tests/unit/db_test.cpp b/tests/unit/db_test.cpp index a5c1dfa88..1e3126a37 100644 --- a/tests/unit/db_test.cpp +++ b/tests/unit/db_test.cpp @@ -14,13 +14,46 @@ #include #include #include +#include +// nach auflistugn/beschreibungsmöglichkeiten schauen +// -l -t für auflistung +// --list-test-names-only +std::string gen_random(const int len, bool key) { + std::string s; + s.resize(len); + static const char alphanum[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz"; + + static const char numbers[] = "123456789"; + if (key) { + s[0] = '/'; + for (int i = 1; i < len; ++i) { + s[i] = alphanum[std::rand() % (sizeof(alphanum) - 1)]; + } + s[len] = '\0'; + }else{ + if(len < 6) return s; + for (int i = 0; i < len-5; ++i) { + s[i] = numbers[std::rand() % (sizeof(numbers) - 1)]; + } + s[len-5] = '|'; + for (int i = len-4; i < len; ++i) { + s[i] = numbers[std::rand() % (sizeof(numbers) - 1)]; + } + + s[len-1] = '|'; + } + return s; +} // BDD STYLE -SCENARIO("Test Db functionality"){ +int i = 0; +SCENARIO( "RDB - Input single Key", "[RocksDB]") { GIVEN("Open a db") { - int i = 0; + // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); MetadataDB db = MetadataDB(metadata_path); @@ -30,21 +63,34 @@ SCENARIO("Test Db functionality"){ std::string val = "453|123|"; db.put(key, val); + THEN("Key and value in DB") { auto res = db.get(key); REQUIRE(res == val); } } - system( (std::string("rm -rf ") + metadata_path).data()); + boost::filesystem::remove_all(metadata_path); + //system( (std::string("rm -rf ") + metadata_path).data()); // boost verwenden metadata_path = "/tmp/db_test" + std::to_string(i); db = MetadataDB(metadata_path); i++; - WHEN("RocksDB 1 key two values - returns first value"){ + } +} + +SCENARIO( "RDB - Insert 1 key with two values", "[RocksDB]") { + GIVEN("Open a db") { + + // when open db + std::string metadata_path = "/tmp/db_test" + std::to_string(i); + MetadataDB db = MetadataDB(metadata_path); + i++; + + WHEN("RocksDB 1 key two values - returns first value") { std::string key = "/a"; std::string val = "453|123|"; std::string val2 = "453|124|"; - THEN("First value returns for key"){ + THEN("First value returns for key") { db.put(key, val); db.put(key, val2); @@ -54,217 +100,217 @@ SCENARIO("Test Db functionality"){ } } - system( (std::string("rm -rf ") + metadata_path).data()); - + boost::filesystem::remove_all(metadata_path); + metadata_path = "/tmp/db_test" + std::to_string(i); + db = MetadataDB(metadata_path); + i++; } - } -// Regular test case style -TEST_CASE("RocksDB single input"){ - std::string metadata_path = "/home/tunahan/rocksdb"; - std::string key = "/a"; - std::string val = "453|123|"; - try { - MetadataDB db = MetadataDB(metadata_path); - db.put(key, val); - - auto res = db.get(key); - REQUIRE(res == val); - } catch (const std::exception & e) { - throw; - } -} -TEST_CASE("RocksDB 1 key two values - returns first value"){ - std::string metadata_path = "/home/tunahan/rocksdb"; - - std::string key = "/a"; - std::string val = "453|123|"; - std::string val2 = "453|124|"; +SCENARIO( "RDB - delete existing Key", "[RocksDB]") { + GIVEN("Open a db") { - try { + // when open db + std::string metadata_path = "/tmp/db_test" + std::to_string(i); MetadataDB db = MetadataDB(metadata_path); - db.put(key, val); - db.put(key, val2); - auto res = db.get(key); - REQUIRE(res == val); - - } catch (const std::exception & e) { - throw; - } -} + i++; -TEST_CASE("RocksDB delete inserted key"){ - std::string metadata_path = "/home/tunahan/rocksdb"; + WHEN("RocksDB delete inserted key") { + std::string metadata_path = "/home/tunahan/rocksdb"; - std::string key = "/"; - std::string val = "453|123|"; + std::string key = "/"; + std::string val = "453|123|"; + THEN("Key not in DB anymore") { + db.put(key, val); + db.remove(key); + } + } - try { - MetadataDB db = MetadataDB(metadata_path); - db.put(key, val); - db.remove(key); - } catch (const std::exception & e) { - throw; + boost::filesystem::remove_all(metadata_path); + metadata_path = "/tmp/db_test" + std::to_string(i); + db = MetadataDB(metadata_path); + i++; } } -TEST_CASE("RocksDB get deleted key"){ - std::string metadata_path = "/home/tunahan/rocksdb"; - - std::string key = "/"; - std::string val = "453|123|"; +SCENARIO( "RDB - Get deleted Key", "[RocksDB]") { + GIVEN("Open a db") { - try { + // when open db + std::string metadata_path = "/tmp/db_test" + std::to_string(i); MetadataDB db = MetadataDB(metadata_path); - db.put(key, val); - db.remove(key); - REQUIRE_THROWS(db.get(key), "Not Found: "); - - } catch (const std::exception & e) { - throw; - } -} + i++; + WHEN("RocksDB get deleted key") { + std::string metadata_path = "/home/tunahan/rocksdb"; -TEST_CASE("RocksDB update key"){ - std::string metadata_path = "/home/tunahan/rocksdb"; + std::string key = "/"; + std::string val = "453|123|"; + THEN(" requie return = Nor Found: ") { + db.put(key, val); + db.remove(key); + REQUIRE_THROWS(db.get(key), "Not Found: "); + } + } - std::string key = "/"; - std::string key2 = "/a"; - std::string val = "453|123|"; - std::string val2 = "453|151|"; + boost::filesystem::remove_all(metadata_path); + metadata_path = "/tmp/db_test" + std::to_string(i); + db = MetadataDB(metadata_path); + i++; - try { - MetadataDB db = MetadataDB(metadata_path); - db.put(key, val); - db.update(key, key2, val2); - auto res2 = db.get(key2); - REQUIRE_THROWS(db.get(key), "Not Found: "); - REQUIRE(res2 == val2); - } catch (const std::exception & e) { - throw; } } -std::string gen_random(const int len, bool key) { - std::string s; - s.resize(len); - static const char alphanum[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz"; - - static const char numbers[] = "123456789"; - if (key) { - s[0] = '/'; - for (int i = 1; i < len; ++i) { - s[i] = alphanum[std::rand() % (sizeof(alphanum) - 1)]; - } - s[len] = '\0'; - }else{ - if(len < 6) return s; - for (int i = 0; i < len-5; ++i) { - s[i] = numbers[std::rand() % (sizeof(numbers) - 1)]; - } - s[len-5] = '|'; - for (int i = len-4; i < len; ++i) { - s[i] = numbers[std::rand() % (sizeof(numbers) - 1)]; - } - - s[len-1] = '|'; - } - return s; -} -TEST_CASE("Bulk Insert/Get - single core"){ - std::string metadata_path = "/home/tunahan/rocksdb"; - - const int number_Entries = 100; - const int len_strings = 10; - std::set keyList; - std::vector valList; - for(int i = 0; i < number_Entries; i++){ - std::string temp; - temp = gen_random(len_strings, false); - valList.push_back(temp); - //std::cout << temp << "\n"; - temp = gen_random(len_strings, true); - keyList.insert(temp); - //std::cout << temp << "\n"; - } +SCENARIO( "RDB - update existing Key", "[RocksDB]") { + GIVEN("Open a db") { - try { + // when open db + std::string metadata_path = "/tmp/db_test" + std::to_string(i); MetadataDB db = MetadataDB(metadata_path); - auto keys = keyList.begin(); - for(int i = 0; i threads; - for (int i = 0; i < 8; ++i) { - threads.emplace_back([&](){ + const int number_Entries = 100; const int len_strings = 10; std::set keyList; std::vector valList; - for(int i = 0; i < number_Entries; i++){ + for (int j = 0; j < number_Entries; j++) { std::string temp; temp = gen_random(len_strings, false); valList.push_back(temp); + //std::cout << temp << "\n"; temp = gen_random(len_strings, true); keyList.insert(temp); + //std::cout << temp << "\n"; } - auto keys = keyList.begin(); - for(int i = 0; i threads; + + for (int i = 0; i < 8; ++i) { + threads.emplace_back([&]() { + const int len_strings = 10; + std::set keyList; + std::vector valList; + for (int i = 0; i < number_Entries; i++) { + std::string temp; + temp = gen_random(len_strings, false); + valList.push_back(temp); + temp = gen_random(len_strings, true); + keyList.insert(temp); + } + auto keys = keyList.begin(); + for (int i = 0; i < number_Entries; i++) { + auto key = *(keys++); + db.put(key, valList[i]); + auto res = db.get(key); + REQUIRE(res == valList[i]); + } + }); + } + + for (auto &t : threads) { t.join(); } + } + boost::filesystem::remove_all(metadata_path); + metadata_path = "/tmp/db_test" + std::to_string(i); + db = MetadataDB(metadata_path); + i++; - } catch (const std::exception & e) { - throw; } } +SCENARIO( "RDB - Merge Operator", "[RocksDB]") { + GIVEN("Open a db") { + + // when open db + std::string metadata_path = "/tmp/db_test" + std::to_string(i); + MetadataDB db = MetadataDB(metadata_path); + i++; + WHEN("Merge Operation") { + + std::string key = "/a"; + std::string val = "4523|123|"; + + THEN("increase size of key") { + db.put(key, val); + db.increase_size(key, 10, true); + } + } + } + +} -- GitLab From 8ee2223a2b99f8322e27a8b0f2d85d359b9b077e Mon Sep 17 00:00:00 2001 From: tkaya Date: Tue, 5 May 2020 23:20:18 +0200 Subject: [PATCH 3/3] solved conflicts --- tests/unit/CMakeLists.txt | 8 +++--- tests/unit/db_test.cpp | 54 +++++++++++++++------------------------ 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 8e03e55d0..9ca9efb05 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -30,6 +30,9 @@ target_link_libraries(catch2_main ) +# needed for filesystem header +set(CMAKE_CXX_STANDARD 17) + # define executables for tests and make them depend on the convenience # library (and Catch2 transitively) and fmt @@ -43,22 +46,17 @@ set(test_src # needed headers set(test_headers - ../../src/global/rpc/rpc_utils.cpp ../../src/global/path_util.cpp ../../src/daemon/ops/metadentry.cpp ../../src/daemon/classes/fs_data.cpp - ../../src/daemon/handler/h_preload.cpp ../../src/global/metadata.cpp ../../include/global/metadata.hpp ../../include/daemon/classes/fs_data.hpp - ../../include/daemon/main.hpp ../../include/version.hpp ../../include/global/configure.hpp ../../include/global/global_defs.hpp ../../include/global/rpc/rpc_types.hpp - ../../include/global/rpc/rpc_utils.hpp ../../include/global/path_util.hpp - ../../include/daemon/main.hpp ../../include/daemon/ops/metadentry.hpp ../../include/daemon/classes/fs_data.hpp ../../include/daemon/classes/rpc_data.hpp diff --git a/tests/unit/db_test.cpp b/tests/unit/db_test.cpp index 1e3126a37..bc2e93f28 100644 --- a/tests/unit/db_test.cpp +++ b/tests/unit/db_test.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include #include @@ -56,7 +55,7 @@ SCENARIO( "RDB - Input single Key", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; WHEN("Try to input key") { std::string key = "/a"; @@ -69,11 +68,9 @@ SCENARIO( "RDB - Input single Key", "[RocksDB]") { REQUIRE(res == val); } } + boost::filesystem::remove_all(metadata_path); - //system( (std::string("rm -rf ") + metadata_path).data()); // boost verwenden - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; + } } @@ -82,16 +79,15 @@ SCENARIO( "RDB - Insert 1 key with two values", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; - WHEN("RocksDB 1 key two values - returns first value") { + WHEN("RocksDB 1 key two values - returns first value"){ std::string key = "/a"; std::string val = "453|123|"; std::string val2 = "453|124|"; THEN("First value returns for key") { - db.put(key, val); db.put(key, val2); @@ -101,9 +97,7 @@ SCENARIO( "RDB - Insert 1 key with two values", "[RocksDB]") { } boost::filesystem::remove_all(metadata_path); - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; + } } @@ -113,7 +107,7 @@ SCENARIO( "RDB - delete existing Key", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; WHEN("RocksDB delete inserted key") { @@ -129,9 +123,7 @@ SCENARIO( "RDB - delete existing Key", "[RocksDB]") { boost::filesystem::remove_all(metadata_path); - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; + } } @@ -141,7 +133,7 @@ SCENARIO( "RDB - Get deleted Key", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; WHEN("RocksDB get deleted key") { @@ -157,20 +149,17 @@ SCENARIO( "RDB - Get deleted Key", "[RocksDB]") { } boost::filesystem::remove_all(metadata_path); - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; } -} +} SCENARIO( "RDB - update existing Key", "[RocksDB]") { GIVEN("Open a db") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; @@ -192,9 +181,7 @@ SCENARIO( "RDB - update existing Key", "[RocksDB]") { } boost::filesystem::remove_all(metadata_path); - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; + } } @@ -205,7 +192,7 @@ SCENARIO( "RDB - Bulk Put/Get - single core", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; WHEN("Bulk Insert/Get - single core") { @@ -238,9 +225,7 @@ SCENARIO( "RDB - Bulk Put/Get - single core", "[RocksDB]") { } boost::filesystem::remove_all(metadata_path); - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; + } } @@ -252,7 +237,7 @@ SCENARIO( "RDB - Multithreaded Bulk Insert and Get", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; WHEN("Multithreaded Bulk Insert and Get") { @@ -288,9 +273,7 @@ SCENARIO( "RDB - Multithreaded Bulk Insert and Get", "[RocksDB]") { } boost::filesystem::remove_all(metadata_path); - metadata_path = "/tmp/db_test" + std::to_string(i); - db = MetadataDB(metadata_path); - i++; + } } @@ -299,7 +282,7 @@ SCENARIO( "RDB - Merge Operator", "[RocksDB]") { // when open db std::string metadata_path = "/tmp/db_test" + std::to_string(i); - MetadataDB db = MetadataDB(metadata_path); + gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path); i++; WHEN("Merge Operation") { @@ -311,6 +294,9 @@ SCENARIO( "RDB - Merge Operator", "[RocksDB]") { db.increase_size(key, 10, true); } } + boost::filesystem::remove_all(metadata_path); + } } + -- GitLab