Merge branch 'branch-0.3.1' into 'branch-0.3.1'

parallel reduce default false

See merge request megasearch/milvus!282

Former-commit-id: 0726e6bdbc3af658d4757aacb96fe2668f7c0bc0
This commit is contained in:
jinhai 2019-07-28 09:55:32 +08:00
commit 3715ccb6a6

View File

@ -22,7 +22,7 @@ static constexpr size_t PARALLEL_REDUCE_BATCH = 1000;
bool NeedParallelReduce(uint64_t nq, uint64_t topk) {
server::ServerConfig &config = server::ServerConfig::GetInstance();
server::ConfigNode& db_config = config.GetConfig(server::CONFIG_DB);
bool need_parallel = db_config.GetBoolValue(server::CONFIG_DB_PARALLEL_REDUCE, true);
bool need_parallel = db_config.GetBoolValue(server::CONFIG_DB_PARALLEL_REDUCE, false);
if(!need_parallel) {
return false;
}