From 73ee2e0a7b90cc0f585f88d2e4983cccded51d51 Mon Sep 17 00:00:00 2001 From: jinhai Date: Thu, 12 Sep 2019 17:58:18 +0800 Subject: [PATCH] Update lockguard Former-commit-id: 1bdcd84679433929e582689661730f1359077c98 --- cpp/src/scheduler/task/SearchTask.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpp/src/scheduler/task/SearchTask.cpp b/cpp/src/scheduler/task/SearchTask.cpp index b32c547022..46d429ab56 100644 --- a/cpp/src/scheduler/task/SearchTask.cpp +++ b/cpp/src/scheduler/task/SearchTask.cpp @@ -271,7 +271,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src, return Status::OK(); } - merge_mutex_.lock(); + std::unique_lock 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(); }