From 18f82c0676d973667a5eae6923d570ac2b8325a6 Mon Sep 17 00:00:00 2001 From: Yu Kun Date: Tue, 13 Aug 2019 15:42:41 +0800 Subject: [PATCH] merge upstream/branch-0.4.0 Former-commit-id: 6f30324f85ed3f86c359a96b6877affff52a75c0 --- cpp/scripts/start_server.sh | 2 +- cpp/src/db/DBImpl.cpp | 1 - cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp | 2 +- cpp/start_server.sh | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cpp/scripts/start_server.sh b/cpp/scripts/start_server.sh index 312cef86..72e120f2 100755 --- a/cpp/scripts/start_server.sh +++ b/cpp/scripts/start_server.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index 2a1f3653..636efc51 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/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(); } diff --git a/cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp b/cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp index 365f2820..ba009c0d 100644 --- a/cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp +++ b/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; diff --git a/cpp/start_server.sh b/cpp/start_server.sh index 50bf8b84..e2152424 100755 --- a/cpp/start_server.sh +++ b/cpp/start_server.sh @@ -1,4 +1,4 @@ #!/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 & -- GitLab