Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0

Former-commit-id: 776f02b12be2e400469fd21609321a962105c379

cpp/src/db/engine/ExecutionEngineImpl.cpp

@@ -92,6 +92,10 @@ Status ExecutionEngineImpl::AddWithIds(long n, const float *xdata, const long *x
 }
 
 size_t ExecutionEngineImpl::Count() const {
+    if(index_ == nullptr) {
+        ENGINE_LOG_ERROR << "ExecutionEngineImpl::index is null";
+        return 0;
+    }
     return index_->Count();
 }
 
@@ -100,6 +104,10 @@ size_t ExecutionEngineImpl::Size() const {
 }
 
 size_t ExecutionEngineImpl::Dimension() const {
+    if(index_ == nullptr) {
+        ENGINE_LOG_ERROR << "ExecutionEngineImpl::index is null";
+        return dim_;
+    }
     return index_->Dimension();
 }
 

cpp/unittest/db/mem_test.cpp

@@ -16,20 +16,29 @@
 #include <iostream>
 #include <cmath>
 #include <random>
+#include <chrono>
 
 using namespace zilliz::milvus;
 
 namespace {
 
-static const char* TABLE_NAME = "test_group";
+static std::string TABLE_NAME = "test_group";
 static constexpr int64_t TABLE_DIM = 256;
 static constexpr int64_t VECTOR_COUNT = 250000;
 static constexpr int64_t INSERT_LOOP = 10000;
 
+std::string GenTableName() {
+    auto now = std::chrono::system_clock::now();
+    auto micros = std::chrono::duration_cast<std::chrono::microseconds>(
+            now.time_since_epoch()).count();
+    TABLE_NAME = std::to_string(micros);
+    return TABLE_NAME;
+}
+
 engine::meta::TableSchema BuildTableSchema() {
     engine::meta::TableSchema table_info;
     table_info.dimension_ = TABLE_DIM;
-    table_info.table_id_ = TABLE_NAME;
+    table_info.table_id_ = GenTableName();
     table_info.engine_type_ = (int) engine::EngineType::FAISS_IDMAP;
     return table_info;
 }
@@ -261,7 +270,6 @@ TEST_F(NewMemManagerTest, SERIAL_INSERT_SEARCH_TEST) {
     }
 
     delete db_;
-    boost::filesystem::remove_all(options.meta.path);
 
 }
 
@@ -297,7 +305,6 @@ TEST_F(NewMemManagerTest, INSERT_TEST) {
     LOG(DEBUG) << "total_time spent in INSERT_TEST (ms) : " << total_time;
 
     delete db_;
-    boost::filesystem::remove_all(options.meta.path);
 
 }
 
@@ -378,7 +385,6 @@ TEST_F(NewMemManagerTest, CONCURRENT_INSERT_SEARCH_TEST) {
     search.join();
 
     delete db_;
-    boost::filesystem::remove_all(options.meta.path);
 };
 
 TEST_F(DBTest, VECTOR_IDS_TEST)
@@ -487,5 +493,4 @@ TEST_F(NewMemManagerTest, MEMMANAGER_TEST) {
     LOG(DEBUG) << "total_time spent in INSERT_TEST (ms) : " << total_time;
 
     delete db_;
-    boost::filesystem::remove_all(options.meta.path);
 }

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());