From 3e542bdcf5c72515ffa461514f1f71da34bb7295 Mon Sep 17 00:00:00 2001 From: XuanYang-cn <51370125+XuanYang-cn@users.noreply.github.com> Date: Sat, 12 Sep 2020 09:46:36 +0800 Subject: [PATCH] fix3626 (#3699) Signed-off-by: yangxuan Co-authored-by: yangxuan --- CHANGELOG.md | 1 + core/src/scheduler/job/SearchJob.h | 5 +++++ core/src/scheduler/task/SearchTask.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069f06e5de..dc4d87f98f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,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 diff --git a/core/src/scheduler/job/SearchJob.h b/core/src/scheduler/job/SearchJob.h index 4658ddb70d..2e628b5695 100644 --- a/core/src/scheduler/job/SearchJob.h +++ b/core/src/scheduler/job/SearchJob.h @@ -72,6 +72,11 @@ class SearchJob : public Job { return segment_ids_; } + std::mutex& + mutex() { + return mutex_; + } + protected: void OnCreateTasks(JobTasks& tasks) override; diff --git a/core/src/scheduler/task/SearchTask.cpp b/core/src/scheduler/task/SearchTask.cpp index c3da801512..2b5ded51ab 100644 --- a/core/src/scheduler/task/SearchTask.cpp +++ b/core/src/scheduler/task/SearchTask.cpp @@ -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 lock(search_job->mutex()); + std::unique_lock lock(search_job->mutex()); if (!search_job->query_result()) { search_job->query_result() = std::make_shared(); search_job->query_result()->row_num_ = nq;