merge upstream/branch-0.4.0

Former-commit-id: 6f30324f85ed3f86c359a96b6877affff52a75c0

cpp/scripts/start_server.sh

 #!/bin/bash
 
-../bin/milvus_server -c ../conf/server_config.yaml -l ../conf/log_config.conf
+../bin/milvus_grpc_server -c ../conf/server_config.yaml -l ../conf/log_config.conf
 

cpp/src/db/DBImpl.cpp

@@ -89,7 +89,6 @@ DBImpl::DBImpl(const Options& options)
     meta_ptr_ = DBMetaImplFactory::Build(options.meta, options.mode);
     mem_mgr_ = MemManagerFactory::Build(meta_ptr_, options_);
     if (options.mode != Options::MODE::READ_ONLY) {
-        std::cout << "StartTimerTasks\n";
         ENGINE_LOG_TRACE << "StartTimerTasks";
         StartTimerTasks();
     }

cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp

@@ -23,7 +23,7 @@ namespace {
     constexpr int64_t NQ = 10;
     constexpr int64_t TOP_K = 10;
     constexpr int64_t SEARCH_TARGET = 5000; //change this value, result is different
-    constexpr int64_t ADD_VECTOR_LOOP = 1;
+    constexpr int64_t ADD_VECTOR_LOOP = 5;
     constexpr int64_t SECONDS_EACH_HOUR = 3600;
 
 #define BLOCK_SPLITER std::cout << "===========================================" << std::endl;

cpp/start_server.sh

 #!/bin/bash
 
-./cmake_build/src/milvus_server -c ./conf/server_config.yaml -l ./conf/log_config.conf &
+./cmake_build/src/milvus_grpc_server -c ./conf/server_config.yaml -l ./conf/log_config.conf &