Commit a07ff1bd authored by jinhai's avatar jinhai
Browse files

Update lockguard 


Former-commit-id: 1d64ce5d75fbc5132e363cd67784e7320a9c73e6
parent 75c3532a

cpp/src/scheduler/task/SearchTask.cpp

+1 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ Status XSearchTask::MergeResult(SearchContext::Id2DistanceMap &distance_src, 
        return Status::OK();

    }



    merge_mutex_.lock();

    std::unique_lock<std::mutex> 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();

}