Commit f0194ae3 authored by jinhai's avatar jinhai
Browse files

Merge branch '0.5.1' into '0.5.1' 

0.5.1

See merge request megasearch/milvus!819

Former-commit-id: 5a113d81baa029ab705f5d7ce289a1fb01a3016e
parents 2db958e0 0cfd69d6

core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ if(NOT GIT_BRANCH_NAME STREQUAL "") 
    string(REGEX REPLACE "\n" "" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})

endif()



set(MILVUS_VERSION "${GIT_BRANCH_NAME}")

set(MILVUS_VERSION "0.5.1")

string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]" MILVUS_VERSION "${MILVUS_VERSION}")



find_package(ClangTools)

core/unittest/server/test_config.cpp

+5 −3
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ TEST_F(ConfigTest, SERVER_CONFIG_INVALID_TEST) { 


    s = config.LoadConfigFile(config_path + INVALID_CONFIG_FILE);

    ASSERT_FALSE(s.ok());

    s = config.LoadConfigFile(config_path + "dummy.yaml");

    ASSERT_FALSE(s.ok());



    /* server config */

    s = config.SetServerConfigAddress("0.0.0");
@@ -167,7 +169,7 @@ TEST_F(ConfigTest, SERVER_CONFIG_INVALID_TEST) { 


    s = config.SetDBConfigInsertBufferSize("a");

    ASSERT_FALSE(s.ok());

    s = config.SetDBConfigInsertBufferSize("-1");

    s = config.SetDBConfigInsertBufferSize("0");

    ASSERT_FALSE(s.ok());

    s = config.SetDBConfigInsertBufferSize("2048");

    ASSERT_FALSE(s.ok());
@@ -185,7 +187,7 @@ TEST_F(ConfigTest, SERVER_CONFIG_INVALID_TEST) { 
    /* cache config */

    s = config.SetCacheConfigCpuCacheCapacity("a");

    ASSERT_FALSE(s.ok());

    s = config.SetCacheConfigCpuCacheCapacity("-1");

    s = config.SetCacheConfigCpuCacheCapacity("0");

    ASSERT_FALSE(s.ok());

    s = config.SetCacheConfigCpuCacheCapacity("2048");

    ASSERT_FALSE(s.ok());
@@ -214,7 +216,7 @@ TEST_F(ConfigTest, SERVER_CONFIG_INVALID_TEST) { 


    s = config.SetEngineConfigOmpThreadNum("a");

    ASSERT_FALSE(s.ok());

    s = config.SetEngineConfigOmpThreadNum("-1");

    s = config.SetEngineConfigOmpThreadNum("10000");

    ASSERT_FALSE(s.ok());



    s = config.SetEngineConfigGpuSearchThreshold("-1");