admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Update lockguard

See merge request megasearch/milvus!565

Former-commit-id: cbb039c1da725a1c8ce0c8d06150749a6157ded7
This commit is contained in:
jinhai 2019-09-12 17:59:32 +08:00
commit 06433d879e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpp/src/scheduler/task/SearchTask.cpp
View File

@ -271,7 +271,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src,
return Status::OK();
}
merge_mutex_.lock();
std::unique_lock<std::mutex> lock(merge_mutex_);
if (distance_target.empty()) {
distance_target.swap(distance_src);
return Status::OK();
@ -331,7 +331,6 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src,
}
distance_target.swap(distance_merged);
merge_mutex_.unlock();
return Status::OK();
}