Commit 33762b47 authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.4.0' into 'branch-0.4.0' 

Update lockguard

See merge request megasearch/milvus!565

Former-commit-id: ce3a72a14f79562e6b9adf7bb13a6ded7fc90184
parents 6e96c2f8 a07ff1bd

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();

}