From ad395a7f06b92a6ed67c790a9f04eb157d56b776 Mon Sep 17 00:00:00 2001
From: "yudong.cai" <yudong.cai@zilliz.com>
Date: Sun, 3 Nov 2019 16:05:38 +0800
Subject: [PATCH 1/2] #175 update invalid config unittest

Former-commit-id: 06ef1ca314a4ad5d55a5a3352f75ec6e265cb4a0
---
 core/unittest/server/test_config.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/unittest/server/test_config.cpp b/core/unittest/server/test_config.cpp
index a4b76ca157..123ddf5265 100644
--- a/core/unittest/server/test_config.cpp
+++ b/core/unittest/server/test_config.cpp
@@ -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");

From bf2e3e790c9d231437f356937346c33570226911 Mon Sep 17 00:00:00 2001
From: JinHai-CN <hai.jin@zilliz.com>
Date: Sun, 3 Nov 2019 17:19:28 +0800
Subject: [PATCH 2/2] Update milvus version

Former-commit-id: 3d345b0dc6eaaba41b78f87a46ef70e5d4ca6c19
---
 core/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index df7cd9183b..402e65fb10 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -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)