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

add unitest cases

See merge request megasearch/milvus!542

Former-commit-id: a0ca536c337549d45e163ec7707295a0676f70ba

cpp/unittest/db/mem_test.cpp

@@ -55,9 +55,6 @@ void BuildVectors(int64_t n, std::vector<float> &vectors) {
 }
 
 TEST_F(MemManagerTest, VECTOR_SOURCE_TEST) {
-
-    std::shared_ptr<engine::meta::SqliteMetaImpl> impl_ = engine::DBMetaImplFactory::Build();
-
     engine::meta::TableSchema table_schema = BuildTableSchema();
     auto status = impl_->CreateTable(table_schema);
     ASSERT_TRUE(status.ok());
@@ -96,16 +93,10 @@ TEST_F(MemManagerTest, VECTOR_SOURCE_TEST) {
 
     vector_ids = source.GetVectorIds();
     ASSERT_EQ(vector_ids.size(), 100);
-
-
-    status = impl_->DropAll();
-    ASSERT_TRUE(status.ok());
 }
 
 TEST_F(MemManagerTest, MEM_TABLE_FILE_TEST) {
-
-    std::shared_ptr<engine::meta::SqliteMetaImpl> impl_ = engine::DBMetaImplFactory::Build();
-    auto options = engine::OptionsFactory::Build();
+    auto options = GetOptions();
 
     engine::meta::TableSchema table_schema = BuildTableSchema();
     auto status = impl_->CreateTable(table_schema);
@@ -143,15 +134,10 @@ TEST_F(MemManagerTest, MEM_TABLE_FILE_TEST) {
     ASSERT_EQ(vector_ids.size(), n_max - n_100);
 
     ASSERT_TRUE(mem_table_file.IsFull());
-
-    status = impl_->DropAll();
-    ASSERT_TRUE(status.ok());
 }
 
 TEST_F(MemManagerTest, MEM_TABLE_TEST) {
-
-    std::shared_ptr<engine::meta::SqliteMetaImpl> impl_ = engine::DBMetaImplFactory::Build();
-    auto options = engine::OptionsFactory::Build();
+    auto options = GetOptions();
 
     engine::meta::TableSchema table_schema = BuildTableSchema();
     auto status = impl_->CreateTable(table_schema);
@@ -211,9 +197,6 @@ TEST_F(MemManagerTest, MEM_TABLE_TEST) {
 
     status = mem_table.Serialize();
     ASSERT_TRUE(status.ok());
-
-    status = impl_->DropAll();
-    ASSERT_TRUE(status.ok());
 }
 
 TEST_F(MemManagerTest2, SERIAL_INSERT_SEARCH_TEST) {

cpp/unittest/db/meta_tests.cpp

@@ -324,6 +324,12 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
     status = impl_->DeleteTableFiles(table_id);
     ASSERT_TRUE(status.ok());
 
+    status = impl_->CreateTableFile(table_file);
+    table_file.file_type_ = meta::TableFileSchema::NEW;
+    status = impl_->UpdateTableFile(table_file);
+    status = impl_->CleanUp();
+    ASSERT_TRUE(status.ok());
+
     status = impl_->DeleteTable(table_id);
     ASSERT_TRUE(status.ok());
 

cpp/unittest/db/misc_test.cpp

@@ -128,6 +128,14 @@ TEST(DBMiscTest, UTILS_TEST) {
        ASSERT_TRUE(boost::filesystem::exists(path));
     }
 
+    options.slave_paths.push_back("/");
+    status =  engine::utils::CreateTablePath(options, TABLE_NAME);
+    ASSERT_FALSE(status.ok());
+
+    options.path = "/";
+    status =  engine::utils::CreateTablePath(options, TABLE_NAME);
+    ASSERT_FALSE(status.ok());
+
     engine::meta::TableFileSchema file;
     file.id_ = 50;
     file.table_id_ = TABLE_NAME;
@@ -142,6 +150,4 @@ TEST(DBMiscTest, UTILS_TEST) {
 
     status = engine::utils::DeleteTableFilePath(options, file);
     ASSERT_TRUE(status.ok());
-
-
 }
\ No newline at end of file

cpp/unittest/db/utils.h

@@ -87,7 +87,7 @@ class MySqlMetaTest : public BaseTest {
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class MemManagerTest : public BaseTest {
+class MemManagerTest : public MetaTest {
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////

cpp/unittest/server/config_test.cpp

@@ -101,7 +101,8 @@ TEST(ConfigTest, SERVER_CONFIG_TEST) {
     err = server::ServerConfig::GetInstance().ValidateConfig();
     ASSERT_EQ(err, SERVER_SUCCESS);
 
-    server::ConfigNode node1 = config.GetConfig("server_config");
+    const server::ServerConfig& config_const = config;
+    server::ConfigNode node1 = config_const.GetConfig("server_config");
     server::ConfigNode& node2 = config.GetConfig("cache_config");
     node1.Combine(node2);
 

cpp/unittest/server/util_test.cpp

@@ -158,7 +158,17 @@ TEST(UtilTest, LOG_TEST) {
     ASSERT_EQ(fname, "log_config.conf");
 }
 
-TEST(UtilTest, VALIDATE_TABLENAME_TEST) {
+TEST(UtilTest, TIMERECORDER_TEST) {
+    for(int64_t log_level = 0; log_level <= 6; log_level++) {
+        if(log_level == 5) {
+            continue; //skip fatal
+        }
+        server::TimeRecorder rc("time", log_level);
+        rc.RecordSection("end");
+    }
+}
+
+TEST(ValidationUtilTest, VALIDATE_TABLENAME_TEST) {
     std::string table_name = "Normal123_";
     ErrorCode res = server::ValidationUtil::ValidateTableName(table_name);
     ASSERT_EQ(res, SERVER_SUCCESS);
@@ -192,7 +202,7 @@ TEST(UtilTest, VALIDATE_TABLENAME_TEST) {
     ASSERT_EQ(res, SERVER_INVALID_TABLE_NAME);
 }
 
-TEST(UtilTest, VALIDATE_DIMENSIONTEST) {
+TEST(ValidationUtilTest, VALIDATE_DIMENSION_TEST) {
     ASSERT_EQ(server::ValidationUtil::ValidateTableDimension(-1), SERVER_INVALID_VECTOR_DIMENSION);
     ASSERT_EQ(server::ValidationUtil::ValidateTableDimension(0), SERVER_INVALID_VECTOR_DIMENSION);
     ASSERT_EQ(server::ValidationUtil::ValidateTableDimension(16385), SERVER_INVALID_VECTOR_DIMENSION);
@@ -200,7 +210,7 @@ TEST(UtilTest, VALIDATE_DIMENSIONTEST) {
     ASSERT_EQ(server::ValidationUtil::ValidateTableDimension(1), SERVER_SUCCESS);
 }
 
-TEST(UtilTest, VALIDATE_INDEX_TEST) {
+TEST(ValidationUtilTest, VALIDATE_INDEX_TEST) {
     ASSERT_EQ(server::ValidationUtil::ValidateTableIndexType((int)engine::EngineType::INVALID), SERVER_INVALID_INDEX_TYPE);
     for(int i = 1; i <= (int)engine::EngineType::MAX_VALUE; i++) {
         ASSERT_EQ(server::ValidationUtil::ValidateTableIndexType(i), SERVER_SUCCESS);
@@ -218,14 +228,14 @@ TEST(UtilTest, VALIDATE_INDEX_TEST) {
     ASSERT_EQ(server::ValidationUtil::ValidateTableIndexMetricType(2), SERVER_SUCCESS);
 }
 
-TEST(ValidationUtilTest, ValidateTopkTest) {
+TEST(ValidationUtilTest, VALIDATE_TOPK_TEST) {
     engine::meta::TableSchema schema;
     ASSERT_EQ(server::ValidationUtil::ValidateSearchTopk(10, schema), SERVER_SUCCESS);
     ASSERT_NE(server::ValidationUtil::ValidateSearchTopk(65536, schema), SERVER_SUCCESS);
     ASSERT_NE(server::ValidationUtil::ValidateSearchTopk(0, schema), SERVER_SUCCESS);
 }
 
-TEST(ValidationUtilTest, ValidateNprobeTest) {
+TEST(ValidationUtilTest, VALIDATE_NPROBE_TEST) {
     engine::meta::TableSchema schema;
     schema.nlist_ = 100;
     ASSERT_EQ(server::ValidationUtil::ValidateSearchNprobe(10, schema), SERVER_SUCCESS);
@@ -233,7 +243,7 @@ TEST(ValidationUtilTest, ValidateNprobeTest) {
     ASSERT_NE(server::ValidationUtil::ValidateSearchNprobe(101, schema), SERVER_SUCCESS);
 }
 
-TEST(ValidationUtilTest, ValidateGpuTest) {
+TEST(ValidationUtilTest, VALIDATE_GPU_TEST) {
     ASSERT_EQ(server::ValidationUtil::ValidateGpuIndex(0), SERVER_SUCCESS);
     ASSERT_NE(server::ValidationUtil::ValidateGpuIndex(100), SERVER_SUCCESS);
 
@@ -242,12 +252,33 @@ TEST(ValidationUtilTest, ValidateGpuTest) {
     ASSERT_NE(server::ValidationUtil::GetGpuMemory(100, memory), SERVER_SUCCESS);
 }
 
-TEST(UtilTest, TIMERECORDER_TEST) {
-    for(int64_t log_level = 0; log_level <= 6; log_level++) {
-        if(log_level == 5) {
-            continue; //skip fatal
-        }
-        server::TimeRecorder rc("time", log_level);
-        rc.RecordSection("end");
-    }
+TEST(ValidationUtilTest, VALIDATE_IPADDRESS_TEST) {
+    ASSERT_EQ(server::ValidationUtil::ValidateIpAddress("127.0.0.1"), SERVER_SUCCESS);
+    ASSERT_NE(server::ValidationUtil::ValidateIpAddress("not ip"), SERVER_SUCCESS);
+}
+
+TEST(ValidationUtilTest, VALIDATE_NUMBER_TEST) {
+    ASSERT_EQ(server::ValidationUtil::ValidateStringIsNumber("1234"), SERVER_SUCCESS);
+    ASSERT_NE(server::ValidationUtil::ValidateStringIsNumber("not number"), SERVER_SUCCESS);
+}
+
+TEST(ValidationUtilTest, VALIDATE_BOOL_TEST) {
+    std::string str = "true";
+    ASSERT_EQ(server::ValidationUtil::ValidateStringIsBool(str), SERVER_SUCCESS);
+    str = "not bool";
+    ASSERT_NE(server::ValidationUtil::ValidateStringIsBool(str), SERVER_SUCCESS);
+}
+
+TEST(ValidationUtilTest, VALIDATE_DOUBLE_TEST) {
+    double ret = 0.0;
+    ASSERT_EQ(server::ValidationUtil::ValidateStringIsDouble("2.5", ret), SERVER_SUCCESS);
+    ASSERT_NE(server::ValidationUtil::ValidateStringIsDouble("not double", ret), SERVER_SUCCESS);
+}
+
+TEST(ValidationUtilTest, VALIDATE_DBURI_TEST) {
+    ASSERT_EQ(server::ValidationUtil::ValidateDbURI("sqlite://:@:/"), SERVER_SUCCESS);
+    ASSERT_NE(server::ValidationUtil::ValidateDbURI("xxx://:@:/"), SERVER_SUCCESS);
+    ASSERT_NE(server::ValidationUtil::ValidateDbURI("not uri"), SERVER_SUCCESS);
+    ASSERT_EQ(server::ValidationUtil::ValidateDbURI("mysql://root:123456@127.0.0.1:3303/milvus"), SERVER_SUCCESS);
+    ASSERT_NE(server::ValidationUtil::ValidateDbURI("mysql://root:123456@127.0.0.1:port/milvus"), SERVER_SUCCESS);
 }