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

optimize debug log

See merge request megasearch/milvus!550

Former-commit-id: 242a51f50863d23ffdb0a53dd0ca8bbb99e8fb30

cpp/src/db/scheduler/context/SearchContext.cpp

@@ -50,6 +50,7 @@ void
 SearchContext::WaitResult() {
     std::unique_lock <std::mutex> lock(mtx_);
     done_cond_.wait(lock, [this] { return map_index_files_.empty(); });
+    SERVER_LOG_DEBUG << "SearchContext " << identity_ << " all done";
 }
 
 }

cpp/src/scheduler/task/SearchTask.cpp

@@ -152,10 +152,10 @@ XSearchTask::Execute() {
         return;
     }
 
-    ENGINE_LOG_DEBUG << "Searching in file id:" << index_id_ << " with "
+    ENGINE_LOG_DEBUG << "Searching in file id " << index_id_ << " with "
                      << search_contexts_.size() << " tasks";
 
-    server::TimeRecorder rc("DoSearch file id:" + std::to_string(index_id_));
+    server::TimeRecorder rc("DoSearch file id " + std::to_string(index_id_));
 
     server::CollectDurationMetrics metrics(index_type_);
 
@@ -163,32 +163,37 @@ XSearchTask::Execute() {
     std::vector<float> output_distance;
     for (auto &context : search_contexts_) {
         //step 1: allocate memory
-        auto inner_k = context->topk();
+        auto nq = context->nq();
+        auto topk = context->topk();
         auto nprobe = context->nprobe();
-        output_ids.resize(inner_k * context->nq());
-        output_distance.resize(inner_k * context->nq());
+        auto vectors = context->vectors();
+
+        output_ids.resize(topk * nq);
+        output_distance.resize(topk * nq);
+        std::string hdr = "context " + context->Identity() +
+                          " nq " + std::to_string(nq) +
+                          " topk " + std::to_string(topk);
 
         try {
             //step 2: search
-            index_engine_->Search(context->nq(), context->vectors(), inner_k, nprobe, output_distance.data(),
-                                  output_ids.data());
+            index_engine_->Search(nq, vectors, topk, nprobe, output_distance.data(), output_ids.data());
 
-            double span = rc.RecordSection("do search for context:" + context->Identity());
+            double span = rc.RecordSection(hdr + ", do search");
             context->AccumSearchCost(span);
 
 
             //step 3: cluster result
             SearchContext::ResultSet result_set;
-            auto spec_k = index_engine_->Count() < context->topk() ? index_engine_->Count() : context->topk();
-            XSearchTask::ClusterResult(output_ids, output_distance, context->nq(), spec_k, result_set);
+            auto spec_k = index_engine_->Count() < topk ? index_engine_->Count() : topk;
+            XSearchTask::ClusterResult(output_ids, output_distance, nq, spec_k, result_set);
 
-            span = rc.RecordSection("cluster result for context:" + context->Identity());
+            span = rc.RecordSection(hdr + ", cluster result");
             context->AccumReduceCost(span);
 
             // step 4: pick up topk result
-            XSearchTask::TopkResult(result_set, inner_k, metric_l2, context->GetResult());
+            XSearchTask::TopkResult(result_set, topk, metric_l2, context->GetResult());
 
-            span = rc.RecordSection("reduce topk for context:" + context->Identity());
+            span = rc.RecordSection(hdr + ", reduce topk");
             context->AccumReduceCost(span);
         } catch (std::exception &ex) {
             ENGINE_LOG_ERROR << "SearchTask encounter exception: " << ex.what();

cpp/src/server/grpc_impl/GrpcRequestTask.cpp

@@ -572,7 +572,11 @@ SearchTask::Create(const ::milvus::grpc::SearchParam *search_vector_infos,
 ErrorCode
 SearchTask::OnExecute() {
     try {
-        TimeRecorder rc("SearchTask");
+        int64_t top_k = search_param_->topk();
+        int64_t nprobe = search_param_->nprobe();
+
+        std::string hdr = "SearchTask(k=" + std::to_string(top_k) + ", nprob=" + std::to_string(nprobe) + ")";
+        TimeRecorder rc(hdr);
 
         //step 1: check table name
         std::string table_name_ = search_param_->table_name();
@@ -594,13 +598,11 @@ SearchTask::OnExecute() {
         }
 
         //step 3: check search parameter
-        int64_t top_k = search_param_->topk();
         res = ValidationUtil::ValidateSearchTopk(top_k, table_info);
         if (res != SERVER_SUCCESS) {
             return SetError(res, "Invalid topk: " + std::to_string(top_k));
         }
 
-        int64_t nprobe = search_param_->nprobe();
         res = ValidationUtil::ValidateSearchNprobe(nprobe, table_info);
         if (res != SERVER_SUCCESS) {
             return SetError(res, "Invalid nprobe: " + std::to_string(nprobe));