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

default grpc

See merge request megasearch/milvus!344

Former-commit-id: 226ea82056583dda7d9defcf27e3304f5c58f025

cpp/CMakeLists.txt

@@ -71,6 +71,7 @@ set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -O0 -g")
 message("CUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT_DIR}")
 message("CUDA_NVCC_FLAGS=${CUDA_NVCC_FLAGS}")
 
+set(MILVUS_WITH_THRIFT "OFF")
 set(GPU_VERSION "ON")
 add_definitions("-DGPU_VERSION")
 

cpp/build.sh

@@ -11,7 +11,6 @@ PROFILING="OFF"
 BUILD_FAISS_WITH_MKL="OFF"
 USE_JFROG_CACHE="OFF"
 KNOWHERE_OPTS=""
-MILVUS_WITH_THRIFT="ON"
 
 while getopts "p:d:t:uhlrcgmj" arg
 do
@@ -52,9 +51,6 @@ do
                 USE_JFROG_CACHE="ON"
                 KNOWHERE_OPTS="${KNOWHERE_OPTS} -j"
                 ;;
-             e)
-                MILVUS_WITH_THRIFT="ON"
-                ;;
              h) # help
                 echo "
 
@@ -69,7 +65,6 @@ parameter:
 -g: profiling(default: OFF)
 -m: build faiss with MKL(default: OFF)
 -j: use jfrog cache build directory
--e: enable thrift
 
 usage:
 ./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-m] [-j]
@@ -108,7 +103,6 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
     -DMILVUS_DB_PATH=${DB_PATH} \
     -DMILVUS_ENABLE_PROFILING=${PROFILING} \
     -DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \
-    -DMILVUS_WITH_THRIFT=${MILVUS_WITH_THRIFT} \
     -DKNOWHERE_BUILD_DIR=${KNOWHERE_BUILD_DIR} \
     -DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \
     $@ ../"