From d9076789d0ce194d86ff8e69a21cef7bb9ab9b18 Mon Sep 17 00:00:00 2001 From: zhiru Date: Fri, 14 Jun 2019 19:02:06 +0800 Subject: [PATCH] update Former-commit-id: c72896aebcabce77cb12c4912b75aa109468a225 --- cpp/src/db/MySQLMetaImpl.h | 3 ++- cpp/unittest/db/CMakeLists.txt | 5 ++++- cpp/unittest/db/utils.h | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cpp/src/db/MySQLMetaImpl.h b/cpp/src/db/MySQLMetaImpl.h index e099fbb262..3e8bcdeeec 100644 --- a/cpp/src/db/MySQLMetaImpl.h +++ b/cpp/src/db/MySQLMetaImpl.h @@ -19,6 +19,8 @@ namespace meta { public: MySQLMetaImpl(const DBMetaOptions& options_); + Status Initialize(); + virtual Status CreateTable(TableSchema& table_schema) override; virtual Status DeleteTable(const std::string& table_id) override; virtual Status DescribeTable(TableSchema& group_info_) override; @@ -69,7 +71,6 @@ namespace meta { std::string GetTablePath(const std::string& table_id); std::string GetTableDatePartitionPath(const std::string& table_id, DateT& date); void GetTableFilePath(TableFileSchema& group_file); - Status Initialize(); const DBMetaOptions options_; }; // DBMetaImpl diff --git a/cpp/unittest/db/CMakeLists.txt b/cpp/unittest/db/CMakeLists.txt index ecfeb1e92c..9471f5d69d 100644 --- a/cpp/unittest/db/CMakeLists.txt +++ b/cpp/unittest/db/CMakeLists.txt @@ -28,10 +28,13 @@ set(db_test_src ${db_scheduler_srcs} ${wrapper_src} ${require_files} + MySQLMetaImpl_test.cpp utils.cpp db_tests.cpp meta_tests.cpp) +include_directories(/usr/include/mysql) + cuda_add_executable(db_test ${db_test_src}) set(db_libs @@ -44,4 +47,4 @@ set(db_libs lz4 ) -target_link_libraries(db_test ${db_libs} ${unittest_libs}) +target_link_libraries(db_test ${db_libs} ${unittest_libs} /usr/local/lib/libmysqlpp.so) diff --git a/cpp/unittest/db/utils.h b/cpp/unittest/db/utils.h index cf0ff360f1..2116072f20 100644 --- a/cpp/unittest/db/utils.h +++ b/cpp/unittest/db/utils.h @@ -8,6 +8,7 @@ #include #include +#include #include "db/DB.h" #include "db/DBMetaImpl.h" @@ -55,3 +56,8 @@ protected: virtual void SetUp() override; virtual void TearDown() override; }; + +class MySQLTest : public DBTest { +protected: + //std::shared_ptr impl_; +};