Commit d43abc8a authored by peng.xu's avatar peng.xu
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

fix unittest build error

See merge request megasearch/milvus!616

Former-commit-id: ac90f6b7c93c3d9c14439a6e6697168cdded0dec
parents d7fdbc12 26eb46eb

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ 
---

BasedOnStyle:  Google

DerivePointerAlignment: false

ColumnLimit: 90
 
ColumnLimit: 120

cpp/unittest/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ set(unittest_files 
        ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)



set(helper_files

        ${MILVUS_ENGINE_SRC}/server/ServerConfig.cpp

        ${MILVUS_ENGINE_SRC}/server/Config.cpp

        ${MILVUS_ENGINE_SRC}/utils/CommonUtil.cpp

        ${MILVUS_ENGINE_SRC}/utils/TimeRecorder.cpp

        ${MILVUS_ENGINE_SRC}/utils/Status.cpp

cpp/unittest/db/search_test.cpp

+0 −9
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "scheduler/task/SearchTask.h"

#include "utils/TimeRecorder.h"





using namespace zilliz::milvus;



namespace {
@@ -226,10 +225,6 @@ 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, "false");//lvoc cannot work for std::function, set to false



    bool ascending = true;

    std::vector<long> target_ids;

    std::vector<float> target_distence;
@@ -262,10 +257,6 @@ 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, "false");//lvoc cannot work for std::function, set to false



    std::vector<long> target_ids;

    std::vector<float> target_distence;

    scheduler::ResultSet src_result;

cpp/unittest/metrics/metrics_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
//#include "prometheus/registry.h"

//#include "prometheus/exposer.h"

#include <cache/CpuCacheMgr.h>

#include <src/server/Config.h>



#include "metrics/Metrics.h"

#include "utils.h"
@@ -36,10 +37,9 @@ using namespace zilliz::milvus; 




TEST_F(MetricTest, METRIC_TEST) {

    server::ConfigNode &configNode = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_METRIC);

    configNode.SetValue(server::CONFIG_METRIC_COLLECTOR, "zabbix");

    server::Config::GetInstance().SetMetricConfigCollector("zabbix");

    server::Metrics::GetInstance();

    configNode.SetValue(server::CONFIG_METRIC_COLLECTOR, "prometheus");

    server::Config::GetInstance().SetMetricConfigCollector("prometheus");

    server::Metrics::GetInstance();



    server::SystemInfo::GetInstance().Init();

cpp/unittest/metrics/prometheus_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 




#include "metrics/PrometheusMetrics.h"

#include "server/Config.h"



#include <gtest/gtest.h>

#include <iostream>
@@ -24,8 +25,7 @@ 
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::Config::GetInstance().SetMetricConfigAutoBootup("on");



    server::PrometheusMetrics instance = server::PrometheusMetrics::GetInstance();

    instance.Init();
@@ -76,7 +76,7 @@ TEST(PrometheusTest, PROMETHEUS_TEST){ 
    instance.GPUTemperature();

    instance.CPUTemperature();



    configNode.SetValue(server::CONFIG_METRIC_IS_STARTUP, "off");

    server::Config::GetInstance().SetMetricConfigAutoBootup("off");

    instance.Init();

    instance.CPUCoreUsagePercentSet();

    instance.GPUTemperature();