Signed-off-by: yangxuan <xuan.yang@zilliz.com>

Co-authored-by: yangxuan <xuan.yang@zilliz.com>
Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
pull/3745/head
XuanYang-cn 2020-09-12 09:46:36 +08:00 committed by shengjun.li
parent d03a8e4354
commit aba62ad25f
3 changed files with 7 additions and 1 deletions

View File

@ -41,6 +41,7 @@ Please mark all changes in change log and use the issue from GitHub
- \#3514 Search failed with regex tag name
- \#3533 Scheduler/Selector needs to judge the index type
- \#3621 Fix crash where getting octets information
- \#3626 Server crashed during search with index pq on dataset: sift-50m
- \#3652 Proto of C++ sdk is different from milvus server
- \#3668 Docker exit without any logs
- \#3672 0.11.0 docker image is 200M larger due to the un-expected installation of openblas

View File

@ -72,6 +72,11 @@ class SearchJob : public Job {
return segment_ids_;
}
std::mutex&
mutex() {
return mutex_;
}
protected:
void
OnCreateTasks(JobTasks& tasks) override;

View File

@ -130,7 +130,7 @@ SearchTask::OnExecute() {
LOG_ENGINE_WARNING_ << LogOut("[%s][%ld] Searching in an empty segment. segment id = %d", "search", 0,
segment_ptr->GetID());
} else {
// std::unique_lock<std::mutex> lock(search_job->mutex());
std::unique_lock<std::mutex> lock(search_job->mutex());
if (!search_job->query_result()) {
search_job->query_result() = std::make_shared<engine::QueryResult>();
search_job->query_result()->row_num_ = nq;