Merge branch 'branch-0.4.0' into 'branch-0.4.0'

Branch 0.4.0

See merge request megasearch/milvus!346

Former-commit-id: 30362fa6fd6bb84374e802e830d7ce24d8ee4af2

cpp/CHANGELOG.md

@@ -3,16 +3,17 @@
 Please mark all change in change log and use the ticket from JIRA.
 
 # Milvus 0.4.0 (2019-07-28)
-- MS-336 - Scheduler interface
-- MS-344 - Add TaskTable Test
-- MS-345 - Add Node Test
-- MS-346 - Add some implementation of scheduler to solve compile error
-- MS-348 - Add ResourceFactory Test
 
 ## Bug
 
 ## Improvement
 - MS-327 - Clean code for milvus
+- MS-336 - Scheduler interface
+- MS-344 - Add TaskTable Test
+- MS-345 - Add Node Test
+- MS-346 - Add some implementation of scheduler to solve compile error
+- MS-348 - Add ResourceFactory Test
+- MS-350 - Remove knowhere submodule
 
 ## New Feature
 - MS-343 - Implement ResourceMgr

cpp/README.md

@@ -19,15 +19,15 @@ sudo ln -s /path/to/libmysqlclient.so /path/to/libmysqlclient_r.so
 
 cmake_build/src/milvus_server is the server
 
-cmake_build/src/libmilvus_engine.a is the static library
-
-    git submodule init
-    git submodule update
+    cd [sourcecode path]/cpp/thirdparty
+    git clone git@192.168.1.105:megasearch/knowhere.git
+    cd knowhere
+    ./build.sh -t Debug
+    or ./build.sh -t Release
 
     cd [sourcecode path]/cpp
     ./build.sh -t Debug
-    ./build.sh -t Release
-    ./build.sh -l -t Release # Build license version(only available for Release)
+    or ./build.sh -t Release
 
 If you encounter the following error when building:
 `protocol https not supported or disabled in libcurl`
@@ -68,19 +68,5 @@ Then launch server with config:
     stop_server.sh
 
 ### Launch test_client(only for debug)
-If you want to test remote api, you can build test_client.
-test_client use same config file with server:
-
-    cd [build output path]/test_client
-    test_client -c [sourcecode path]/cpp/conf/server_config.yaml
-
-### License Generate
-Use get_sys_info to get system info file.
-
-    ./get_sys_info                  # system.info will be generated
-
-Use license_generator to generate license file.
-
-    ./license_generator -s system.info -l system.license -b 2019-05-15 -e 2019-08-14                 
-
-Copy the license file to path assigned by license_path in server config file.
+If you want to test remote api, you can run sdk example.
+    [build output path]/sdk/examples/grpcsimple/sdk_simple

cpp/build.sh

@@ -83,11 +83,8 @@ if [[ ! -d cmake_build ]]; then
 	MAKE_CLEAN="ON"
 fi
 
-# Build Knowhere
-KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere_build"
-pushd `pwd`/thirdparty/knowhere
-./build.sh -t Release -p ${KNOWHERE_BUILD_DIR} ${KNOWHERE_OPTS}
-popd
+# Knowhere build output path
+KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere/knowhere"
 
 cd cmake_build
 

cpp/thirdparty/knowhere

@@ -1 +0,0 @@
-Subproject commit 98c56500b5b26a3502e2fea474586267ac6625f0