提交 ca53a98c 编写于 作者: J jinhai

Add merge mutex


Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
上级 221a3134
...@@ -269,6 +269,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src, ...@@ -269,6 +269,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src,
return Status::OK(); return Status::OK();
} }
merge_mutex_.lock();
if (distance_target.empty()) { if (distance_target.empty()) {
distance_target.swap(distance_src); distance_target.swap(distance_src);
return Status::OK(); return Status::OK();
...@@ -328,6 +329,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src, ...@@ -328,6 +329,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src,
} }
distance_target.swap(distance_merged); distance_target.swap(distance_merged);
merge_mutex_.unlock();
return Status::OK(); return Status::OK();
} }
......
...@@ -48,6 +48,8 @@ public: ...@@ -48,6 +48,8 @@ public:
int index_type_ = 0; int index_type_ = 0;
ExecutionEnginePtr index_engine_ = nullptr; ExecutionEnginePtr index_engine_ = nullptr;
bool metric_l2 = true; bool metric_l2 = true;
static std::mutex merge_mutex_;
}; };
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册