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

Add merge mutex

Browse Source 
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
This commit is contained in:
jinhai 2019-09-12 17:11:02 +08:00
parent 221a3134a1
commit ca53a98c55
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src,
return Status::OK();
}
merge_mutex_.lock();
if (distance_target.empty()) {
distance_target.swap(distance_src);
return Status::OK();
@ -328,6 +329,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src,
}
distance_target.swap(distance_merged);
merge_mutex_.unlock();
return Status::OK();
}

2
cpp/src/scheduler/task/SearchTask.h
View File

@ -48,6 +48,8 @@ public:
int index_type_ = 0;
ExecutionEnginePtr index_engine_ = nullptr;
bool metric_l2 = true;
static std::mutex merge_mutex_;
};
}