Merge branch 'branch-0.4.0' into 'branch-0.4.0'

MS-297: disable mysql unit test

See merge request megasearch/milvus!286

Former-commit-id: 74d0f3f6a2c661a5ace48e5507fb75df963a1a88

cpp/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Please mark all change in change log and use the ticket from JIRA.
 
+# Milvus 0.4.0 (2019-07-28)
+
+## Bug
+
+## Improvement
+
+## New Feature
+
+## Task
+- MS-297 - disable mysql unit test
 
 # Milvus 0.3.1 (2019-07-10)
 

cpp/unittest/db/CMakeLists.txt

@@ -64,17 +64,6 @@ set(knowhere_libs
         cublas
         )
 
-target_link_libraries(db_test
-        ${knowhere_libs}
-        ${db_libs}
-        ${unittest_libs}
-        sqlite
-        boost_system_static
-        boost_filesystem_static
-        lz4
-        mysqlpp
-        )
-
 if(${BUILD_FAISS_WITH_MKL} STREQUAL "ON")
     set(db_libs ${db_libs} ${MKL_LIBS} ${MKL_LIBS})
 else()
@@ -83,7 +72,7 @@ else()
             openblas)
 endif()
 
-target_link_libraries(db_test ${db_libs} ${unittest_libs})
+target_link_libraries(db_test ${db_libs} ${knowhere_libs} ${unittest_libs})
 
 install(TARGETS db_test DESTINATION bin)
 

cpp/unittest/db/mysql_db_test.cpp

@@ -46,7 +46,7 @@ namespace {
 }
 
 
-TEST_F(MySQLDBTest, DB_TEST) {
+TEST_F(DISABLED_MySQLDBTest, DB_TEST) {
 
     auto options = GetOptions();
     auto db_ = engine::DBFactory::Build(options);
@@ -139,7 +139,7 @@ TEST_F(MySQLDBTest, DB_TEST) {
     delete dummyDB;
 };
 
-TEST_F(MySQLDBTest, SEARCH_TEST) {
+TEST_F(DISABLED_MySQLDBTest, SEARCH_TEST) {
     auto options = GetOptions();
     auto db_ = engine::DBFactory::Build(options);
 
@@ -202,7 +202,7 @@ TEST_F(MySQLDBTest, SEARCH_TEST) {
     // TODO(linxj): add groundTruth assert
 };
 
-TEST_F(MySQLDBTest, ARHIVE_DISK_CHECK) {
+TEST_F(DISABLED_MySQLDBTest, ARHIVE_DISK_CHECK) {
 
     auto options = GetOptions();
     options.meta.archive_conf = engine::ArchiveConf("delete", "disk:1");
@@ -258,7 +258,7 @@ TEST_F(MySQLDBTest, ARHIVE_DISK_CHECK) {
     delete dummyDB;
 };
 
-TEST_F(MySQLDBTest, DELETE_TEST) {
+TEST_F(DISABLED_MySQLDBTest, DELETE_TEST) {
 
     auto options = GetOptions();
     options.meta.archive_conf = engine::ArchiveConf("delete", "disk:1");

cpp/unittest/db/mysql_meta_test.cpp

@@ -21,7 +21,7 @@
 
 using namespace zilliz::milvus::engine;
 
-TEST_F(MySQLTest, TABLE_TEST) {
+TEST_F(DISABLED_MySQLTest, TABLE_TEST) {
     DBMetaOptions options;
     try {
         options = getDBMetaOptions();
@@ -63,7 +63,7 @@ TEST_F(MySQLTest, TABLE_TEST) {
     ASSERT_TRUE(status.ok());
 }
 
-TEST_F(MySQLTest, TABLE_FILE_TEST) {
+TEST_F(DISABLED_MySQLTest, TABLE_FILE_TEST) {
     DBMetaOptions options;
     try {
         options = getDBMetaOptions();
@@ -136,7 +136,7 @@ TEST_F(MySQLTest, TABLE_FILE_TEST) {
     ASSERT_TRUE(status.ok());
 }
 
-TEST_F(MySQLTest, ARCHIVE_TEST_DAYS) {
+TEST_F(DISABLED_MySQLTest, ARCHIVE_TEST_DAYS) {
     srand(time(0));
     DBMetaOptions options;
     try {
@@ -198,7 +198,7 @@ TEST_F(MySQLTest, ARCHIVE_TEST_DAYS) {
     ASSERT_TRUE(status.ok());
 }
 
-TEST_F(MySQLTest, ARCHIVE_TEST_DISK) {
+TEST_F(DISABLED_MySQLTest, ARCHIVE_TEST_DISK) {
     DBMetaOptions options;
     try {
         options = getDBMetaOptions();
@@ -252,7 +252,7 @@ TEST_F(MySQLTest, ARCHIVE_TEST_DISK) {
     ASSERT_TRUE(status.ok());
 }
 
-TEST_F(MySQLTest, TABLE_FILES_TEST) {
+TEST_F(DISABLED_MySQLTest, TABLE_FILES_TEST) {
     DBMetaOptions options;
     try {
         options = getDBMetaOptions();

cpp/unittest/db/utils.cpp

@@ -85,7 +85,7 @@ void MetaTest::TearDown() {
     impl_->DropAll();
 }
 
-zilliz::milvus::engine::DBMetaOptions MySQLTest::getDBMetaOptions() {
+zilliz::milvus::engine::DBMetaOptions DISABLED_MySQLTest::getDBMetaOptions() {
 //    std::string path = "/tmp/milvus_test";
 //    engine::DBMetaOptions options = engine::DBMetaOptionsFactory::Build(path);
     zilliz::milvus::engine::DBMetaOptions options;
@@ -99,7 +99,7 @@ zilliz::milvus::engine::DBMetaOptions MySQLTest::getDBMetaOptions() {
     return options;
 }
 
-zilliz::milvus::engine::Options MySQLDBTest::GetOptions() {
+zilliz::milvus::engine::Options DISABLED_MySQLDBTest::GetOptions() {
     auto options = engine::OptionsFactory::Build();
     options.meta.path = "/tmp/milvus_test";
     options.meta.backend_uri = DBTestEnvironment::getURI();

cpp/unittest/db/utils.h

@@ -77,13 +77,13 @@ class MetaTest : public DBTest {
     virtual void TearDown() override;
 };
 
-class MySQLTest : public ::testing::Test {
+class DISABLED_MySQLTest : public ::testing::Test {
  protected:
 //    std::shared_ptr<zilliz::milvus::engine::meta::MySQLMetaImpl> impl_;
     zilliz::milvus::engine::DBMetaOptions getDBMetaOptions();
 };
 
-class MySQLDBTest : public ::testing::Test {
+class DISABLED_MySQLDBTest : public ::testing::Test {
  protected:
     zilliz::milvus::engine::Options GetOptions();
 };