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

add compile macro to use old scheduler

See merge request megasearch/milvus!423

Former-commit-id: 519d2381d0e5c1e7236d053a2afb5a2c3f70d054

cpp/CMakeLists.txt

@@ -34,6 +34,8 @@ else()
 endif()
 message(STATUS "Build type = ${BUILD_TYPE}")
 
+#add_definitions(-DNEW_SCHEDULER)
+
 project(milvus VERSION "${MILVUS_VERSION}")
 project(milvus_engine LANGUAGES CUDA CXX)
 

cpp/src/db/scheduler/TaskScheduler.cpp

@@ -89,7 +89,7 @@ TaskScheduler::TaskDispatchWorker() {
             return true;
         }
 
-#if 1
+#ifdef NEW_SCHEDULER
         // TODO: Put task into Disk-TaskTable
         auto task = TaskConvert(task_ptr);
         auto disk_list = ResMgrInst::GetInstance()->GetDiskResources();

cpp/src/db/scheduler/context/DeleteContext.cpp

@@ -20,9 +20,11 @@ DeleteContext::DeleteContext(const std::string &table_id, meta::Meta::Ptr &meta_
 }
 
 void DeleteContext::WaitAndDelete() {
+#ifdef NEW_SCHEDULER
     std::unique_lock<std::mutex> lock(mutex_);
     cv_.wait(lock, [&] { return done_resource == num_resource_; });
     meta_ptr_->DeleteTableFiles(table_id_);
+#endif
 }
 
 void DeleteContext::ResourceDone() {

cpp/src/server/grpc_impl/GrpcRequestTask.cpp

@@ -616,23 +616,20 @@ SearchTask::OnExecute() {
         auto record_array_size = search_param_.query_record_array_size();
         std::vector<float> vec_f(record_array_size * table_info.dimension_, 0);
         for (size_t i = 0; i < record_array_size; i++) {
-            for (size_t j = 0; j < table_info.dimension_; j++) {
             if (search_param_.query_record_array(i).vector_data().empty()) {
-                    return SetError(SERVER_INVALID_ROWRECORD_ARRAY,
-                                    "Query record float array is empty");
+                return SetError(SERVER_INVALID_ROWRECORD_ARRAY, "Query record float array is empty");
             }
-                uint64_t query_vec_dim = search_param_.query_record_array(
-                        i).vector_data().size();
+            uint64_t query_vec_dim = search_param_.query_record_array(i).vector_data().size();
             if (query_vec_dim != table_info.dimension_) {
                 ServerError error_code = SERVER_INVALID_VECTOR_DIMENSION;
-                    std::string error_msg =
-                            "Invalid rowrecord dimension: " + std::to_string(query_vec_dim)
+                std::string error_msg = "Invalid rowrecord dimension: " + std::to_string(query_vec_dim)
                                         + " vs. table dimension:" + std::to_string(table_info.dimension_);
                 return SetError(error_code, error_msg);
             }
-                vec_f[i * table_info.dimension_ + j] = search_param_.query_record_array(
-                        i).vector_data(j);
-            }
+
+            memcpy(&vec_f[i * table_info.dimension_],
+                   search_param_.query_record_array(i).vector_data().data(),
+                   table_info.dimension_ * sizeof(float));
         }
         rc.ElapseFromBegin("prepare vector data");