remove some nouse changes

Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099

cpp/conf/server_config.template

@@ -56,12 +56,12 @@ resource_config:
     cpu:
       type: CPU
       device_id: 0
-      enable_executor: true
+      enable_executor: false
 
     gpu0:
       type: GPU
       device_id: 0
-      enable_executor: false
+      enable_executor: true
       gpu_resource_num: 2
       pinned_memory: 300
       temp_memory: 300

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,37 +163,32 @@ XSearchTask::Execute() {
     std::vector<float> output_distance;
     for (auto &context : search_contexts_) {
         //step 1: allocate memory
-        auto nq = context->nq();
-        auto topk = context->topk();
+        auto inner_k = context->topk();
         auto nprobe = context->nprobe();
-        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);
+        output_ids.resize(inner_k * context->nq());
+        output_distance.resize(inner_k * context->nq());
 
         try {
             //step 2: search
-            index_engine_->Search(nq, vectors, topk, nprobe, output_distance.data(), output_ids.data());
+            index_engine_->Search(context->nq(), context->vectors(), inner_k, nprobe, output_distance.data(),
+                                  output_ids.data());
 
-            double span = rc.RecordSection(hdr + ", do search");
+            double span = rc.RecordSection("do search for context:" + context->Identity());
             context->AccumSearchCost(span);
 
 
             //step 3: cluster result
             SearchContext::ResultSet result_set;
-            auto spec_k = index_engine_->Count() < topk ? index_engine_->Count() : topk;
-            XSearchTask::ClusterResult(output_ids, output_distance, nq, spec_k, 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);
 
-            span = rc.RecordSection(hdr + ", cluster result");
+            span = rc.RecordSection("cluster result for context:" + context->Identity());
             context->AccumReduceCost(span);
 
             // step 4: pick up topk result
-            XSearchTask::TopkResult(result_set, topk, metric_l2, context->GetResult());
+            XSearchTask::TopkResult(result_set, inner_k, metric_l2, context->GetResult());
 
-            span = rc.RecordSection(hdr + ", reduce topk");
+            span = rc.RecordSection("reduce topk for context:" + context->Identity());
             context->AccumReduceCost(span);
         } catch (std::exception &ex) {
             ENGINE_LOG_ERROR << "SearchTask encounter exception: " << ex.what();

cpp/src/sdk/grpc/ClientProxy.cpp

@@ -240,7 +240,6 @@ ClientProxy::Search(const std::string &table_name,
 
         //step 3: search vectors
         ::milvus::grpc::TopKQueryResultList topk_query_result_list;
-
         Status status = client_ptr_->Search(topk_query_result_list, search_param);
 
         //step 4: convert result array
@@ -255,7 +254,6 @@ ClientProxy::Search(const std::string &table_name,
 
             topk_query_result_array.emplace_back(result);
         }
-
         return status;
 
     } catch (std::exception &ex) {

cpp/src/server/grpc_impl/GrpcMilvusServer.cpp

@@ -78,7 +78,6 @@ GrpcMilvusServer::StartService() {
     builder.RegisterService(&service);
 
     server = builder.BuildAndStart();
-//    builder.addTransportFilter();
     server->Wait();
 
 }