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

avoid lcov error

See merge request megasearch/milvus!436

Former-commit-id: 58a5d7d6e76415b4673aad7d8380553810189d30

cpp/unittest/db/search_test.cpp

@@ -216,7 +216,7 @@ TEST(DBSearchTest, MERGE_TEST) {
 TEST(DBSearchTest, PARALLEL_CLUSTER_TEST) {
     server::ServerConfig &config = server::ServerConfig::GetInstance();
     server::ConfigNode& db_config = config.GetConfig(server::CONFIG_DB);
-    db_config.SetValue(server::CONFIG_DB_PARALLEL_REDUCE, "true");
+    db_config.SetValue(server::CONFIG_DB_PARALLEL_REDUCE, "false");//lvoc cannot work for std::function, set to false
 
     bool ascending = true;
     std::vector<long> target_ids;
@@ -252,7 +252,7 @@ TEST(DBSearchTest, PARALLEL_CLUSTER_TEST) {
 TEST(DBSearchTest, PARALLEL_TOPK_TEST) {
     server::ServerConfig &config = server::ServerConfig::GetInstance();
     server::ConfigNode& db_config = config.GetConfig(server::CONFIG_DB);
-    db_config.SetValue(server::CONFIG_DB_PARALLEL_REDUCE, "true");
+    db_config.SetValue(server::CONFIG_DB_PARALLEL_REDUCE, "false");//lvoc cannot work for std::function, set to false
 
     std::vector<long> target_ids;
     std::vector<float> target_distence;

cpp/unittest/metrics/metrics_test.cpp

@@ -25,6 +25,11 @@ using namespace zilliz::milvus;
 
 
 TEST_F(MetricTest, Metric_Tes) {
+    server::ConfigNode &configNode = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_METRIC);
+    configNode.SetValue(server::CONFIG_METRIC_COLLECTOR, "zabbix");
+    server::Metrics::GetInstance();
+    configNode.SetValue(server::CONFIG_METRIC_COLLECTOR, "prometheus");
+    server::Metrics::GetInstance();
 
     server::SystemInfo::GetInstance().Init();
 //    server::Metrics::GetInstance().Init();

cpp/unittest/metrics/prometheus_test.cpp

@@ -12,6 +12,9 @@
 using namespace zilliz::milvus;
 
 TEST(PrometheusTest, PROMETHEUS_TEST){
+    server::ConfigNode &configNode = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_METRIC);
+    configNode.SetValue(server::CONFIG_METRIC_IS_STARTUP, "on");
+
     server::PrometheusMetrics instance = server::PrometheusMetrics::GetInstance();
     instance.Init();
     instance.SetStartup(true);
@@ -51,11 +54,20 @@ TEST(PrometheusTest, PROMETHEUS_TEST){
     instance.GPUMemoryUsageGaugeSet();
     instance.AddVectorsPerSecondGaugeSet(1,1,1);
     instance.QueryIndexTypePerSecondSet("IVF", 1.0);
+    instance.QueryIndexTypePerSecondSet("IDMap", 1.0);
     instance.ConnectionGaugeIncrement();
     instance.ConnectionGaugeDecrement();
     instance.KeepingAliveCounterIncrement();
     instance.OctetsSet();
+
+    instance.CPUCoreUsagePercentSet();
+    instance.GPUTemperature();
+    instance.CPUTemperature();
+
+    configNode.SetValue(server::CONFIG_METRIC_IS_STARTUP, "off");
+    instance.Init();
     instance.CPUCoreUsagePercentSet();
     instance.GPUTemperature();
     instance.CPUTemperature();
+
 }
\ No newline at end of file

cpp/unittest/server/config_test.cpp

@@ -43,6 +43,10 @@ TEST(ConfigTest, CONFIG_TEST) {
     server::ConfigNode& db_config = root_config.GetChild("db_config");
     server::ConfigNode& metric_config = root_config.GetChild("metric_config");
     server::ConfigNode& cache_config = root_config.GetChild("cache_config");
+    server::ConfigNode invalid_config = root_config.GetChild("invalid_config");
+    auto valus = invalid_config.GetSequence("not_exist");
+    float ff = invalid_config.GetFloatValue("not_exist", 3.0);
+    ASSERT_EQ(ff, 3.0);
 
     std::string address = server_config.GetValue("address");
     ASSERT_TRUE(!address.empty());