merge upstream/branch-0.4.0

Former-commit-id: 6f30324f85ed3f86c359a96b6877affff52a75c0
This commit is contained in:
Yu Kun 2019-08-13 15:42:41 +08:00
parent 1a06e7e944
commit 18f82c0676
4 changed files with 3 additions and 4 deletions

View File

@ -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

View File

@ -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();
}

View File

@ -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;

View File

@ -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 &