milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

fix unittest build error

See merge request megasearch/milvus!616

Former-commit-id: 94d59f8b59da542d692b8523a96f6a17fe1ce4fe
pull/191/head
peng.xu 2019-09-26 13:02:34 +08:00
parent c7111d1b02 9eb1ebc677
commit 3ead2274aa
10 changed files with 68 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -17,4 +17,4 @@
--- ---
BasedOnStyle: Google BasedOnStyle: Google
DerivePointerAlignment: false DerivePointerAlignment: false
ColumnLimit: 90 ColumnLimit: 120

2
cpp/unittest/CMakeLists.txt
View File

@ -72,7 +72,7 @@ set(unittest_files
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
set(helper_files 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/CommonUtil.cpp
${MILVUS_ENGINE_SRC}/utils/TimeRecorder.cpp ${MILVUS_ENGINE_SRC}/utils/TimeRecorder.cpp
${MILVUS_ENGINE_SRC}/utils/Status.cpp ${MILVUS_ENGINE_SRC}/utils/Status.cpp

9
cpp/unittest/db/search_test.cpp
View File

@ -22,7 +22,6 @@
#include "scheduler/task/SearchTask.h" #include "scheduler/task/SearchTask.h"
#include "utils/TimeRecorder.h" #include "utils/TimeRecorder.h"
using namespace zilliz::milvus; using namespace zilliz::milvus;
namespace { namespace {
@ -226,10 +225,6 @@ TEST(DBSearchTest, MERGE_TEST) {
} }
TEST(DBSearchTest, PARALLEL_CLUSTER_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; bool ascending = true;
std::vector<long> target_ids; std::vector<long> target_ids;
std::vector<float> target_distence; std::vector<float> target_distence;
@ -262,10 +257,6 @@ TEST(DBSearchTest, PARALLEL_CLUSTER_TEST) {
} }
TEST(DBSearchTest, PARALLEL_TOPK_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<long> target_ids;
std::vector<float> target_distence; std::vector<float> target_distence;
scheduler::ResultSet src_result; scheduler::ResultSet src_result;

6
cpp/unittest/metrics/metrics_test.cpp
View File

@ -25,6 +25,7 @@
//#include "prometheus/registry.h" //#include "prometheus/registry.h"
//#include "prometheus/exposer.h" //#include "prometheus/exposer.h"
#include <cache/CpuCacheMgr.h> #include <cache/CpuCacheMgr.h>
#include <src/server/Config.h>
#include "metrics/Metrics.h" #include "metrics/Metrics.h"
#include "utils.h" #include "utils.h"
@ -36,10 +37,9 @@ using namespace zilliz::milvus;
TEST_F(MetricTest, METRIC_TEST) { TEST_F(MetricTest, METRIC_TEST) {
server::ConfigNode &configNode = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_METRIC); server::Config::GetInstance().SetMetricConfigCollector("zabbix");
configNode.SetValue(server::CONFIG_METRIC_COLLECTOR, "zabbix");
server::Metrics::GetInstance(); server::Metrics::GetInstance();
configNode.SetValue(server::CONFIG_METRIC_COLLECTOR, "prometheus"); server::Config::GetInstance().SetMetricConfigCollector("prometheus");
server::Metrics::GetInstance(); server::Metrics::GetInstance();
server::SystemInfo::GetInstance().Init(); server::SystemInfo::GetInstance().Init();

6
cpp/unittest/metrics/prometheus_test.cpp
View File

@ -17,6 +17,7 @@
#include "metrics/PrometheusMetrics.h" #include "metrics/PrometheusMetrics.h"
#include "server/Config.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <iostream> #include <iostream>
@ -24,8 +25,7 @@
using namespace zilliz::milvus; using namespace zilliz::milvus;
TEST(PrometheusTest, PROMETHEUS_TEST){ TEST(PrometheusTest, PROMETHEUS_TEST){
server::ConfigNode &configNode = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_METRIC); server::Config::GetInstance().SetMetricConfigAutoBootup("on");
configNode.SetValue(server::CONFIG_METRIC_IS_STARTUP, "on");
server::PrometheusMetrics instance = server::PrometheusMetrics::GetInstance(); server::PrometheusMetrics instance = server::PrometheusMetrics::GetInstance();
instance.Init(); instance.Init();
@ -76,7 +76,7 @@ TEST(PrometheusTest, PROMETHEUS_TEST){
instance.GPUTemperature(); instance.GPUTemperature();
instance.CPUTemperature(); instance.CPUTemperature();
configNode.SetValue(server::CONFIG_METRIC_IS_STARTUP, "off"); server::Config::GetInstance().SetMetricConfigAutoBootup("off");
instance.Init(); instance.Init();
instance.CPUCoreUsagePercentSet(); instance.CPUCoreUsagePercentSet();
instance.GPUTemperature(); instance.GPUTemperature();

3
cpp/unittest/scheduler/schedinst_test.cpp
View File

@ -18,6 +18,7 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "server/Config.h"
#include "scheduler/SchedInst.h" #include "scheduler/SchedInst.h"
namespace zilliz { namespace zilliz {
@ -65,7 +66,7 @@ protected:
fstream << ss.str(); fstream << ss.str();
fstream.close(); fstream.close();
server::ServerConfig::GetInstance().LoadConfigFile(CONFIG_FILE); server::Config::GetInstance().LoadConfigFile(CONFIG_FILE);
} }
void void

1
cpp/unittest/server/cache_test.cpp
View File

@ -18,7 +18,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "cache/CpuCacheMgr.h" #include "cache/CpuCacheMgr.h"
#include "cache/GpuCacheMgr.h" #include "cache/GpuCacheMgr.h"
#include "server/ServerConfig.h"
#include "utils/Error.h" #include "utils/Error.h"
#include "wrapper/VecIndex.h" #include "wrapper/VecIndex.h"

94
cpp/unittest/server/config_test.cpp
View File

@ -21,6 +21,7 @@
#include "config/ConfigMgr.h" #include "config/ConfigMgr.h"
#include "utils/CommonUtil.h" #include "utils/CommonUtil.h"
#include "utils/ValidationUtil.h" #include "utils/ValidationUtil.h"
#include "server/Config.h"
using namespace zilliz::milvus; using namespace zilliz::milvus;
@ -105,54 +106,53 @@ TEST(ConfigTest, CONFIG_TEST) {
} }
TEST(ConfigTest, SERVER_CONFIG_TEST) { TEST(ConfigTest, SERVER_CONFIG_TEST) {
server::ServerConfig& config = server::ServerConfig::GetInstance(); auto status = server::Config::GetInstance().LoadConfigFile(CONFIG_FILE_PATH);
auto status = config.LoadConfigFile(CONFIG_FILE_PATH);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
status = server::ServerConfig::GetInstance().ValidateConfig(); // status = server::Config::GetInstance().ValidateConfig();
ASSERT_TRUE(status.ok()); // ASSERT_TRUE(status.ok());
//
// const server::ServerConfig& config_const = config;
// server::ConfigNode node1 = config_const.GetConfig("server_config");
// server::ConfigNode& node2 = config.GetConfig("cache_config");
// node1.Combine(node2);
//
// int32_t cap = node1.GetInt32Value("cpu_cache_capacity");
// ASSERT_GT(cap, 0);
//
// node1.SetValue("bool", "true");
// bool bt = node1.GetBoolValue("bool");
// ASSERT_TRUE(bt);
const server::ServerConfig& config_const = config; // server::Config::GetInstance().PrintAll();
server::ConfigNode node1 = config_const.GetConfig("server_config"); //
server::ConfigNode& node2 = config.GetConfig("cache_config"); // unsigned long total_mem = 0, free_mem = 0;
node1.Combine(node2); // server::CommonUtil::GetSystemMemInfo(total_mem, free_mem);
//
int32_t cap = node1.GetInt32Value("cpu_cache_capacity"); // size_t gpu_mem = 0;
ASSERT_GT(cap, 0); // server::ValidationUtil::GetGpuMemory(0, gpu_mem);
//
node1.SetValue("bool", "true"); // server::ConfigNode& server_config = config.GetConfig("server_config");
bool bt = node1.GetBoolValue("bool"); // server::ConfigNode& db_config = config.GetConfig("db_config");
ASSERT_TRUE(bt); // server::ConfigNode& cache_config = config.GetConfig(server::CONFIG_CACHE);
// cache_config.SetValue(server::CACHE_FREE_PERCENT, "2.0");
config.PrintAll(); // status = config.ValidateConfig();
// ASSERT_FALSE(status.ok());
unsigned long total_mem = 0, free_mem = 0; //
server::CommonUtil::GetSystemMemInfo(total_mem, free_mem); // size_t cache_cap = 16;
// size_t insert_buffer_size = (total_mem - cache_cap*GB + 1*GB)/GB;
size_t gpu_mem = 0; // db_config.SetValue(server::CONFIG_DB_INSERT_BUFFER_SIZE, std::to_string(insert_buffer_size));
server::ValidationUtil::GetGpuMemory(0, gpu_mem); // cache_config.SetValue(server::CONFIG_CPU_CACHE_CAPACITY, std::to_string(cache_cap));
// status = config.ValidateConfig();
server::ConfigNode& server_config = config.GetConfig("server_config"); // ASSERT_FALSE(status.ok());
server::ConfigNode& db_config = config.GetConfig("db_config"); //
server::ConfigNode& cache_config = config.GetConfig(server::CONFIG_CACHE); // cache_cap = total_mem/GB + 2;
cache_config.SetValue(server::CACHE_FREE_PERCENT, "2.0"); // cache_config.SetValue(server::CONFIG_CPU_CACHE_CAPACITY, std::to_string(cache_cap));
status = config.ValidateConfig(); // status = config.ValidateConfig();
ASSERT_FALSE(status.ok()); // ASSERT_FALSE(status.ok());
//
size_t cache_cap = 16; // insert_buffer_size = total_mem/GB + 2;
size_t insert_buffer_size = (total_mem - cache_cap*GB + 1*GB)/GB; // db_config.SetValue(server::CONFIG_DB_INSERT_BUFFER_SIZE, std::to_string(insert_buffer_size));
db_config.SetValue(server::CONFIG_DB_INSERT_BUFFER_SIZE, std::to_string(insert_buffer_size)); // status = config.ValidateConfig();
cache_config.SetValue(server::CONFIG_CPU_CACHE_CAPACITY, std::to_string(cache_cap)); // ASSERT_FALSE(status.ok());
status = config.ValidateConfig();
ASSERT_FALSE(status.ok());
cache_cap = total_mem/GB + 2;
cache_config.SetValue(server::CONFIG_CPU_CACHE_CAPACITY, std::to_string(cache_cap));
status = config.ValidateConfig();
ASSERT_FALSE(status.ok());
insert_buffer_size = total_mem/GB + 2;
db_config.SetValue(server::CONFIG_DB_INSERT_BUFFER_SIZE, std::to_string(insert_buffer_size));
status = config.ValidateConfig();
ASSERT_FALSE(status.ok());
} }

23
cpp/unittest/server/rpc_test.cpp
View File

@ -29,6 +29,7 @@
#include "grpc/gen-status/status.pb.h" #include "grpc/gen-status/status.pb.h"
#include "server/DBWrapper.h" #include "server/DBWrapper.h"
#include "server/Config.h"
#include "scheduler/SchedInst.h" #include "scheduler/SchedInst.h"
#include "scheduler/ResourceFactory.h" #include "scheduler/ResourceFactory.h"
#include "utils/CommonUtil.h" #include "utils/CommonUtil.h"
@ -65,20 +66,14 @@ class RpcHandlerTest : public testing::Test {
engine::DBOptions opt; engine::DBOptions opt;
server::ConfigNode &db_config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_DB); server::Config::GetInstance().SetDBConfigBackendUrl("sqlite://:@:/");
db_config.SetValue(server::CONFIG_DB_BACKEND_URL, "sqlite://:@:/"); server::Config::GetInstance().SetDBConfigPath("/tmp/milvus_test");
db_config.SetValue(server::CONFIG_DB_PATH, "/tmp/milvus_test"); server::Config::GetInstance().SetDBConfigSlavePath("");
db_config.SetValue(server::CONFIG_DB_SLAVE_PATH, ""); server::Config::GetInstance().SetDBConfigArchiveDiskThreshold("");
db_config.SetValue(server::CONFIG_DB_ARCHIVE_DISK, ""); server::Config::GetInstance().SetDBConfigArchiveDaysThreshold("");
db_config.SetValue(server::CONFIG_DB_ARCHIVE_DAYS, ""); server::Config::GetInstance().SetCacheConfigCacheInsertData("");
server::Config::GetInstance().SetEngineConfigOmpThreadNum("");
server::ConfigNode &cache_config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_CACHE);
cache_config.SetValue(server::CONFIG_INSERT_CACHE_IMMEDIATELY, "");
server::ConfigNode &engine_config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_ENGINE);
engine_config.SetValue(server::CONFIG_ENGINE_OMP_THREAD_NUM, "");
server::ConfigNode &serverConfig = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_SERVER);
// serverConfig.SetValue(server::CONFIG_CLUSTER_MODE, "cluster"); // serverConfig.SetValue(server::CONFIG_CLUSTER_MODE, "cluster");
// DBWrapper::GetInstance().GetInstance().StartService(); // DBWrapper::GetInstance().GetInstance().StartService();
// DBWrapper::GetInstance().GetInstance().StopService(); // DBWrapper::GetInstance().GetInstance().StopService();
@ -87,7 +82,7 @@ class RpcHandlerTest : public testing::Test {
// DBWrapper::GetInstance().GetInstance().StartService(); // DBWrapper::GetInstance().GetInstance().StartService();
// DBWrapper::GetInstance().GetInstance().StopService(); // DBWrapper::GetInstance().GetInstance().StopService();
serverConfig.SetValue(server::CONFIG_CLUSTER_MODE, "single"); server::Config::GetInstance().SetResourceConfigMode("single");
server::DBWrapper::GetInstance().StartService(); server::DBWrapper::GetInstance().StartService();
//initialize handler, create table //initialize handler, create table

5
cpp/unittest/server/util_test.cpp
View File

@ -331,9 +331,8 @@ TEST(ValidationUtilTest, VALIDATE_BOOL_TEST) {
} }
TEST(ValidationUtilTest, VALIDATE_DOUBLE_TEST) { TEST(ValidationUtilTest, VALIDATE_DOUBLE_TEST) {
double ret = 0.0; ASSERT_EQ(server::ValidationUtil::ValidateStringIsFloat("2.5").code(), SERVER_SUCCESS);
ASSERT_EQ(server::ValidationUtil::ValidateStringIsDouble("2.5", ret).code(), SERVER_SUCCESS); ASSERT_NE(server::ValidationUtil::ValidateStringIsFloat("not double").code(), SERVER_SUCCESS);
ASSERT_NE(server::ValidationUtil::ValidateStringIsDouble("not double", ret).code(), SERVER_SUCCESS);
} }
TEST(ValidationUtilTest, VALIDATE_DBURI_TEST) { TEST(ValidationUtilTest, VALIDATE_DBURI_TEST) {