diff --git a/cpp/unittest/db/CMakeLists.txt b/cpp/unittest/db/CMakeLists.txt index f76d3536301d4035f86e40c44e28def594ecc06f..99ef28c9814e42ff72e54f355138bd479e02717f 100644 --- a/cpp/unittest/db/CMakeLists.txt +++ b/cpp/unittest/db/CMakeLists.txt @@ -26,6 +26,7 @@ set(db_test_src ${db_srcs} ${wrapper_src} ${require_files} + utils.cpp db_tests.cpp) cuda_add_executable(db_test ${db_test_src}) diff --git a/cpp/unittest/db/db_tests.cpp b/cpp/unittest/db/db_tests.cpp index 723f52e2c8ad5907d6f0138ed8c5c5ffee3ca174..61c4ab45df4a1237ae3e4ba527098c705eab599e 100644 --- a/cpp/unittest/db/db_tests.cpp +++ b/cpp/unittest/db/db_tests.cpp @@ -6,48 +6,12 @@ #include #include #include -#include +#include "utils.h" #include "db/DB.h" using namespace zilliz::vecwise; -#define TIMING - -#ifdef TIMING -#define INIT_TIMER auto start = std::chrono::high_resolution_clock::now(); -#define START_TIMER start = std::chrono::high_resolution_clock::now(); -#define STOP_TIMER(name) LOG(DEBUG) << "RUNTIME of " << name << ": " << \ - std::chrono::duration_cast( \ - std::chrono::high_resolution_clock::now()-start \ - ).count() << " ms "; -#else -#define INIT_TIMER -#define START_TIMER -#define STOP_TIMER(name) -#endif - -class DBTest : public ::testing::Test { -protected: - virtual void SetUp() { - el::Configurations defaultConf; - defaultConf.setToDefault(); - defaultConf.set(el::Level::Debug, - el::ConfigurationType::Format, "[%thread-%datetime-%level]: %msg (%fbase:%line)"); - el::Loggers::reconfigureLogger("default", defaultConf); - } - -}; - -namespace { - void ASSERT_STATS(engine::Status& stat) { - ASSERT_TRUE(stat.ok()); - if(!stat.ok()) { - std::cout << stat.ToString() << std::endl; - } - } -} - TEST_F(DBTest, DB_TEST) { static const std::string group_name = "test_group"; diff --git a/cpp/unittest/db/utils.cpp b/cpp/unittest/db/utils.cpp new file mode 100644 index 0000000000000000000000000000000000000000..cf105a1dc90fc4b38d90f18527fe3d2dea76097e --- /dev/null +++ b/cpp/unittest/db/utils.cpp @@ -0,0 +1,27 @@ +//////////////////////////////////////////////////////////////////////////////// +// Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved +// Unauthorized copying of this file, via any medium is strictly prohibited. +// Proprietary and confidential. +//////////////////////////////////////////////////////////////////////////////// + +#include +#include + +#include "utils.h" + +using namespace zilliz::vecwise; + +void ASSERT_STATS(engine::Status& stat) { + ASSERT_TRUE(stat.ok()); + if(!stat.ok()) { + std::cout << stat.ToString() << std::endl; + } +} + +void DBTest::SetUp() { + el::Configurations defaultConf; + defaultConf.setToDefault(); + defaultConf.set(el::Level::Debug, + el::ConfigurationType::Format, "[%thread-%datetime-%level]: %msg (%fbase:%line)"); + el::Loggers::reconfigureLogger("default", defaultConf); +} diff --git a/cpp/unittest/db/utils.h b/cpp/unittest/db/utils.h new file mode 100644 index 0000000000000000000000000000000000000000..3ee01bcd7f1d721ada67a883c15911d5b8768d0e --- /dev/null +++ b/cpp/unittest/db/utils.h @@ -0,0 +1,37 @@ +//////////////////////////////////////////////////////////////////////////////// +// Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved +// Unauthorized copying of this file, via any medium is strictly prohibited. +// Proprietary and confidential. +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include + +#include "db/DB.h" + + +#define TIMING + +#ifdef TIMING +#define INIT_TIMER auto start = std::chrono::high_resolution_clock::now(); +#define START_TIMER start = std::chrono::high_resolution_clock::now(); +#define STOP_TIMER(name) LOG(DEBUG) << "RUNTIME of " << name << ": " << \ + std::chrono::duration_cast( \ + std::chrono::high_resolution_clock::now()-start \ + ).count() << " ms "; +#else +#define INIT_TIMER +#define START_TIMER +#define STOP_TIMER(name) +#endif + + +void ASSERT_STATS(zilliz::vecwise::engine::Status& stat); + + +class DBTest : public ::testing::Test { +protected: + virtual void SetUp() override; +};