Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0

Former-commit-id: d1b9d0877742427d050cac21bbe4da88126f0a6c

cpp/CHANGELOG.md

@@ -101,6 +101,13 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-511 - Update resource_test in scheduler
 - MS-517 - Update resource_mgr_test in scheduler
 - MS-518 - Add schedinst_test in scheduler
+- MS-519 - Add event_test in scheduler
+- MS-520 - Update resource_test in scheduler
+- MS-524 - Add some unittest in event_test and resource_test
+- MS-525 - Disable parallel reduce in SearchTask
+- MS-527 - Update scheduler_test and enable it
+- MS-528 - Hide some config used future
+- MS-530 - Add unittest for SearchTask->Load
 
 ## New Feature
 - MS-343 - Implement ResourceMgr

cpp/conf/server_config.template

@@ -48,51 +48,38 @@ resource_config:
   # example:
   # resource_name:               # resource name, just using in connections below
   #   type: DISK                 # resource type, optional: DISK/CPU/GPU
-  #   memory: 256                # memory size, unit: GB
   #   device_id: 0
-  #   enable_loader: true        # if is enable loader, optional: true, false
   #   enable_executor: false     # if is enable executor, optional: true, false
 
   resources:
     ssda:
       type: DISK
-      memory: 2048
       device_id: 0
-      enable_loader: true
       enable_executor: false
 
     cpu:
       type: CPU
-      memory: 64
       device_id: 0
-      enable_loader: true
       enable_executor: false
 
     gpu0:
       type: GPU
-      memory: 6
       device_id: 0
-      enable_loader: true
       enable_executor: true
       gpu_resource_num: 2
       pinned_memory: 300
       temp_memory: 300
 
-#    gtx1660:
-#      type: GPU
-#      memory: 6
-#      device_id: 1
-#      enable_loader: true
-#      enable_executor: true
-
   # connection list, length: 0~N
-      # format: -${resource_name}===${resource_name}
+  # example:
+  # connection_name:
+  #   speed: 100                                        # unit: MS/s
+  #   endpoint: ${resource_name}===${resource_name}
   connections:
     io:
       speed: 500
       endpoint: ssda===cpu
-    pcie:
+    pcie0:
       speed: 11000
       endpoint: cpu===gpu0
-#    - cpu===gtx1660
 

cpp/src/core/include/knowhere/index/vector_index/nsg/nsg.h

@@ -138,8 +138,8 @@ class NsgIndex {
 
     void FindUnconnectedNode(boost::dynamic_bitset<> &flags, int64_t &root);
 
- private:
-    void GetKnnGraphFromFile();
+ //private:
+ //   void GetKnnGraphFromFile();
 };
 
 }

cpp/src/core/src/knowhere/index/vector_index/nsg/nsg.cpp

@@ -722,30 +722,30 @@ void NsgIndex::SetKnnGraph(Graph &g) {
     knng = std::move(g);
 }
 
-void NsgIndex::GetKnnGraphFromFile() {
-    //std::string filename = "/home/zilliz/opt/workspace/wook/efanna_graph/tests/sift.1M.50NN.graph";
-    std::string filename = "/home/zilliz/opt/workspace/wook/efanna_graph/tests/sift.50NN.graph";
-
-    std::ifstream in(filename, std::ios::binary);
-    unsigned k;
-    in.read((char *) &k, sizeof(unsigned));
-    in.seekg(0, std::ios::end);
-    std::ios::pos_type ss = in.tellg();
-    size_t fsize = (size_t) ss;
-    size_t num = (unsigned) (fsize / (k + 1) / 4);
-    in.seekg(0, std::ios::beg);
-
-    knng.resize(num);
-    knng.reserve(num);
-    unsigned kk = (k + 3) / 4 * 4;
-    for (size_t i = 0; i < num; i++) {
-        in.seekg(4, std::ios::cur);
-        knng[i].resize(k);
-        knng[i].reserve(kk);
-        in.read((char *) knng[i].data(), k * sizeof(unsigned));
-    }
-    in.close();
-}
+//void NsgIndex::GetKnnGraphFromFile() {
+//    //std::string filename = "/home/zilliz/opt/workspace/wook/efanna_graph/tests/sift.1M.50NN.graph";
+//    std::string filename = "/home/zilliz/opt/workspace/wook/efanna_graph/tests/sift.50NN.graph";
+//
+//    std::ifstream in(filename, std::ios::binary);
+//    unsigned k;
+//    in.read((char *) &k, sizeof(unsigned));
+//    in.seekg(0, std::ios::end);
+//    std::ios::pos_type ss = in.tellg();
+//    size_t fsize = (size_t) ss;
+//    size_t num = (unsigned) (fsize / (k + 1) / 4);
+//    in.seekg(0, std::ios::beg);
+//
+//    knng.resize(num);
+//    knng.reserve(num);
+//    unsigned kk = (k + 3) / 4 * 4;
+//    for (size_t i = 0; i < num; i++) {
+//        in.seekg(4, std::ios::cur);
+//        knng[i].resize(k);
+//        knng[i].reserve(kk);
+//        in.read((char *) knng[i].data(), k * sizeof(unsigned));
+//    }
+//    in.close();
+//}
 
 }
 }

cpp/src/core/test/CMakeLists.txt

@@ -78,6 +78,6 @@ install(TARGETS test_ivf DESTINATION unittest)
 install(TARGETS test_idmap DESTINATION unittest)
 install(TARGETS test_kdt DESTINATION unittest)
 
-add_subdirectory(faiss_ori)
+#add_subdirectory(faiss_ori)
 add_subdirectory(test_nsg)
 

cpp/src/core/test/test_idmap.cpp

@@ -148,10 +148,6 @@ TEST_F(IDMAPTest, copy_test) {
 
     {
         // cpu to gpu
-        static int64_t device_id = 0;
-        FaissGpuResourceMgr::GetInstance().InitDevice(0);
-        FaissGpuResourceMgr::GetInstance().InitDevice(1);
-
         auto clone_index = CopyCpuToGpu(index_, device_id, Config());
         auto clone_result = clone_index->Search(query_dataset, Config::object{{"k", k}});
         AssertAnns(clone_result, nq, k);
@@ -169,7 +165,7 @@ TEST_F(IDMAPTest, copy_test) {
         assert(std::static_pointer_cast<IDMAP>(host_index)->GetRawIds() != nullptr);
 
         // gpu to gpu
-        auto device_index = CopyCpuToGpu(index_, 1, Config());
+        auto device_index = CopyCpuToGpu(index_, device_id, Config());
         auto device_result = device_index->Search(query_dataset, Config::object{{"k", k}});
         AssertAnns(device_result, nq, k);
         //assert(std::static_pointer_cast<GPUIDMAP>(device_index)->GetRawVectors() != nullptr);

cpp/src/core/test/test_ivf.cpp

@@ -52,9 +52,9 @@ class IVFTest
     void SetUp() override {
         std::tie(index_type, preprocess_cfg, train_cfg, add_cfg, search_cfg) = GetParam();
         //Init_with_default();
-        Generate(128, 1000000/5, 10);
+        Generate(128, 1000000/100, 10);
         index_ = IndexFactory(index_type);
-        FaissGpuResourceMgr::GetInstance().InitDevice(device_id, 1024*1024*200, 1024*1024*300, 2);
+        FaissGpuResourceMgr::GetInstance().InitDevice(device_id, 1024*1024*200, 1024*1024*600, 2);
     }
     void TearDown() override {
         FaissGpuResourceMgr::GetInstance().Free();
@@ -77,21 +77,21 @@ INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest,
                                             Config::object{{"nlist", 100}, {"metric_type", "L2"}},
                                             Config(),
                                             Config::object{{"k", 10}}),
-                            //std::make_tuple("IVFPQ",
-                            //                Config(),
-                            //                Config::object{{"nlist", 100}, {"M", 8}, {"nbits", 8}, {"metric_type", "L2"}},
-                            //                Config(),
-                            //                Config::object{{"k", 10}}),
+                            std::make_tuple("IVFPQ",
+                                            Config(),
+                                            Config::object{{"nlist", 100}, {"M", 8}, {"nbits", 8}, {"metric_type", "L2"}},
+                                            Config(),
+                                            Config::object{{"k", 10}}),
                             std::make_tuple("GPUIVF",
                                             Config(),
-                                            Config::object{{"nlist", 1638}, {"gpu_id", device_id}, {"metric_type", "L2"}},
+                                            Config::object{{"nlist", 100}, {"gpu_id", device_id}, {"metric_type", "L2"}},
+                                            Config(),
+                                            Config::object{{"k", 10}}),
+                            std::make_tuple("GPUIVFPQ",
+                                            Config(),
+                                            Config::object{{"gpu_id", device_id}, {"nlist", 100}, {"M", 8}, {"nbits", 8}, {"metric_type", "L2"}},
                                             Config(),
                                             Config::object{{"k", 10}}),
-                            //std::make_tuple("GPUIVFPQ",
-                            //                Config(),
-                            //                Config::object{{"gpu_id", device_id}, {"nlist", 100}, {"M", 8}, {"nbits", 8}, {"metric_type", "L2"}},
-                            //                Config(),
-                            //                Config::object{{"k", 10}}),
                             std::make_tuple("IVFSQ",
                                             Config(),
                                             Config::object{{"nlist", 100}, {"nbits", 8}, {"metric_type", "L2"}},
@@ -99,7 +99,7 @@ INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest,
                                             Config::object{{"k", 10}}),
                             std::make_tuple("GPUIVFSQ",
                                             Config(),
-                                            Config::object{{"gpu_id", device_id}, {"nlist", 1638}, {"nbits", 8}, {"metric_type", "L2"}},
+                                            Config::object{{"gpu_id", device_id}, {"nlist", 100}, {"nbits", 8}, {"metric_type", "L2"}},
                                             Config(),
                                             Config::object{{"k", 10}})
                         )
@@ -386,8 +386,8 @@ class GPURESTEST
     int64_t elems = 0;
 };
 
-const int search_count = 100;
-const int load_count = 30;
+const int search_count = 10;
+const int load_count = 3;
 
 TEST_F(GPURESTEST, gpu_ivf_resource_test) {
     assert(!xb.empty());

cpp/src/core/test/test_nsg/test_nsg.cpp

@@ -7,6 +7,7 @@
 #include <gtest/gtest.h>
 #include <memory>
 
+#include "knowhere/index/vector_index/gpu_ivf.h"
 #include "knowhere/index/vector_index/nsg_index.h"
 #include "knowhere/index/vector_index/nsg/nsg_io.h"
 
@@ -18,15 +19,22 @@ using ::testing::TestWithParam;
 using ::testing::Values;
 using ::testing::Combine;
 
+constexpr int64_t DEVICE_ID = 0;
+
 class NSGInterfaceTest : public DataGen, public TestWithParam<::std::tuple<Config, Config>> {
  protected:
     void SetUp() override {
         //Init_with_default();
+        FaissGpuResourceMgr::GetInstance().InitDevice(DEVICE_ID, 1024*1024*200, 1024*1024*600, 2);
         Generate(256, 1000000, 1);
         index_ = std::make_shared<NSG>();
         std::tie(train_cfg, search_cfg) = GetParam();
     }
 
+    void TearDown() override {
+        FaissGpuResourceMgr::GetInstance().Free();
+    }
+
  protected:
     std::shared_ptr<NSG> index_;
     Config train_cfg;

cpp/src/scheduler/SchedInst.cpp

@@ -36,7 +36,8 @@ StartSchedulerService() {
             auto type = resconf.GetValue(server::CONFIG_RESOURCE_TYPE);
 //        auto memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_MEMORY);
             auto device_id = resconf.GetInt64Value(server::CONFIG_RESOURCE_DEVICE_ID);
-            auto enable_loader = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_LOADER);
+//            auto enable_loader = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_LOADER);
+            auto enable_loader = true;
             auto enable_executor = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_EXECUTOR);
             auto pinned_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_PIN_MEMORY);
             auto temp_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_TEMP_MEMORY);

cpp/src/scheduler/event/Event.h

@@ -32,10 +32,8 @@ public:
         return type_;
     }
 
-    inline virtual std::string
-    Dump() const {
-        return "<Event>";
-    }
+    virtual std::string
+    Dump() const = 0;
 
     friend std::ostream &operator<<(std::ostream &out, const Event &event);
 

cpp/src/scheduler/task/SearchTask.cpp

@@ -20,47 +20,47 @@ namespace engine {
 static constexpr size_t PARALLEL_REDUCE_THRESHOLD = 10000;
 static constexpr size_t PARALLEL_REDUCE_BATCH = 1000;
 
-bool
-NeedParallelReduce(uint64_t nq, uint64_t topk) {
-    server::ServerConfig &config = server::ServerConfig::GetInstance();
-    server::ConfigNode &db_config = config.GetConfig(server::CONFIG_DB);
-    bool need_parallel = db_config.GetBoolValue(server::CONFIG_DB_PARALLEL_REDUCE, false);
-    if (!need_parallel) {
-        return false;
-    }
-
-    return nq * topk >= PARALLEL_REDUCE_THRESHOLD;
-}
-
-void
-ParallelReduce(std::function<void(size_t, size_t)> &reduce_function, size_t max_index) {
-    size_t reduce_batch = PARALLEL_REDUCE_BATCH;
-
-    auto thread_count = std::thread::hardware_concurrency() - 1; //not all core do this work
-    if (thread_count > 0) {
-        reduce_batch = max_index / thread_count + 1;
-    }
-    ENGINE_LOG_DEBUG << "use " << thread_count <<
-                     " thread parallelly do reduce, each thread process " << reduce_batch << " vectors";
-
-    std::vector<std::shared_ptr<std::thread> > thread_array;
-    size_t from_index = 0;
-    while (from_index < max_index) {
-        size_t to_index = from_index + reduce_batch;
-        if (to_index > max_index) {
-            to_index = max_index;
-        }
-
-        auto reduce_thread = std::make_shared<std::thread>(reduce_function, from_index, to_index);
-        thread_array.push_back(reduce_thread);
-
-        from_index = to_index;
-    }
-
-    for (auto &thread_ptr : thread_array) {
-        thread_ptr->join();
-    }
-}
+//bool
+//NeedParallelReduce(uint64_t nq, uint64_t topk) {
+//    server::ServerConfig &config = server::ServerConfig::GetInstance();
+//    server::ConfigNode &db_config = config.GetConfig(server::CONFIG_DB);
+//    bool need_parallel = db_config.GetBoolValue(server::CONFIG_DB_PARALLEL_REDUCE, false);
+//    if (!need_parallel) {
+//        return false;
+//    }
+//
+//    return nq * topk >= PARALLEL_REDUCE_THRESHOLD;
+//}
+//
+//void
+//ParallelReduce(std::function<void(size_t, size_t)> &reduce_function, size_t max_index) {
+//    size_t reduce_batch = PARALLEL_REDUCE_BATCH;
+//
+//    auto thread_count = std::thread::hardware_concurrency() - 1; //not all core do this work
+//    if (thread_count > 0) {
+//        reduce_batch = max_index / thread_count + 1;
+//    }
+//    ENGINE_LOG_DEBUG << "use " << thread_count <<
+//                     " thread parallelly do reduce, each thread process " << reduce_batch << " vectors";
+//
+//    std::vector<std::shared_ptr<std::thread> > thread_array;
+//    size_t from_index = 0;
+//    while (from_index < max_index) {
+//        size_t to_index = from_index + reduce_batch;
+//        if (to_index > max_index) {
+//            to_index = max_index;
+//        }
+//
+//        auto reduce_thread = std::make_shared<std::thread>(reduce_function, from_index, to_index);
+//        thread_array.push_back(reduce_thread);
+//
+//        from_index = to_index;
+//    }
+//
+//    for (auto &thread_ptr : thread_array) {
+//        thread_ptr->join();
+//    }
+//}
 
 void
 CollectFileMetrics(int file_type, size_t file_size) {
@@ -96,33 +96,31 @@ XSearchTask::XSearchTask(TableFileSchemaPtr file)
 void
 XSearchTask::Load(LoadType type, uint8_t device_id) {
     server::TimeRecorder rc("");
+    Status stat = Status::OK();
+    std::string error_msg;
 
     try {
         if (type == LoadType::DISK2CPU) {
-            auto stat = index_engine_->Load();
-            if(!stat.ok()) {
-                //typical error: file not available
-                ENGINE_LOG_ERROR << "Failed to load index file: file not available";
-
-                for(auto& context : search_contexts_) {
-                    context->IndexSearchDone(file_->id_);//mark as done avoid dead lock, even failed
-                }
-
-                return;
-            }
+            stat = index_engine_->Load();
         } else if (type == LoadType::CPU2GPU) {
-            index_engine_->CopyToGpu(device_id);
+            stat = index_engine_->CopyToGpu(device_id);
         } else if (type == LoadType::GPU2CPU) {
-            index_engine_->CopyToCpu();
+            stat = index_engine_->CopyToCpu();
         } else {
-            // TODO: exception
-            std::string msg = "Wrong load type";
-            ENGINE_LOG_ERROR << msg;
+            error_msg = "Wrong load type";
+            stat = Status(SERVER_UNEXPECTED_ERROR, error_msg);
         }
     } catch (std::exception &ex) {
         //typical error: out of disk space or permition denied
-        std::string msg = "Failed to load index file: " + std::string(ex.what());
-        ENGINE_LOG_ERROR << msg;
+        error_msg = "Failed to load index file: " + std::string(ex.what());
+        stat = Status(SERVER_UNEXPECTED_ERROR, error_msg);
+    }
+
+    if (!stat.ok()) {
+        if (error_msg.empty())
+            error_msg = std::string("Failed to load index file: file not available");
+        //typical error: file not available
+        ENGINE_LOG_ERROR << error_msg;
 
         for (auto &context : search_contexts_) {
             context->IndexSearchDone(file_->id_);//mark as done avoid dead lock, even failed
@@ -238,11 +236,11 @@ Status XSearchTask::ClusterResult(const std::vector<long> &output_ids,
         }
     };
 
-    if (NeedParallelReduce(nq, topk)) {
-        ParallelReduce(reduce_worker, nq);
-    } else {
-        reduce_worker(0, nq);
-    }
+//    if (NeedParallelReduce(nq, topk)) {
+//        ParallelReduce(reduce_worker, nq);
+//    } else {
+    reduce_worker(0, nq);
+//    }
 
     return Status::OK();
 }
@@ -343,11 +341,11 @@ Status XSearchTask::TopkResult(SearchContext::ResultSet &result_src,
         }
     };
 
-    if (NeedParallelReduce(result_src.size(), topk)) {
-        ParallelReduce(ReduceWorker, result_src.size());
-    } else {
-        ReduceWorker(0, result_src.size());
-    }
+//    if (NeedParallelReduce(result_src.size(), topk)) {
+//        ParallelReduce(ReduceWorker, result_src.size());
+//    } else {
+    ReduceWorker(0, result_src.size());
+//    }
 
     return Status::OK();
 }

cpp/unittest/scheduler/event_test.cpp

+/*******************************************************************************
+ * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+ * Unauthorized copying of this file, via any medium is strictly prohibited.
+ * Proprietary and confidential.
+ ******************************************************************************/
+
+
+#include <gtest/gtest.h>
+#include "scheduler/resource/Resource.h"
+#include "scheduler/event/Event.h"
+#include "scheduler/event/StartUpEvent.h"
+
+
+namespace zilliz {
+namespace milvus {
+namespace engine {
+
+TEST(EventTest, start_up_event) {
+    ResourceWPtr res(ResourcePtr(nullptr));
+    auto event = std::make_shared<StartUpEvent>(res);
+    ASSERT_FALSE(event->Dump().empty());
+    std::cout << *event;
+    std::cout << *EventPtr(event);
+}
+
+TEST(EventTest, load_completed_event) {
+    ResourceWPtr res(ResourcePtr(nullptr));
+    auto event = std::make_shared<LoadCompletedEvent>(res, nullptr);
+    ASSERT_FALSE(event->Dump().empty());
+    std::cout << *event;
+    std::cout << *EventPtr(event);
+}
+
+TEST(EventTest, finish_task_event) {
+    ResourceWPtr res(ResourcePtr(nullptr));
+    auto event = std::make_shared<FinishTaskEvent>(res, nullptr);
+    ASSERT_FALSE(event->Dump().empty());
+    std::cout << *event;
+    std::cout << *EventPtr(event);
+}
+
+
+TEST(EventTest, tasktable_updated_event) {
+    ResourceWPtr res(ResourcePtr(nullptr));
+    auto event = std::make_shared<TaskTableUpdatedEvent>(res);
+    ASSERT_FALSE(event->Dump().empty());
+    std::cout << *event;
+    std::cout << *EventPtr(event);
+}
+
+}
+}
+}
+

cpp/unittest/scheduler/normal_test.cpp

@@ -11,7 +11,7 @@
 using namespace zilliz::milvus::engine;
 
 
-TEST(normal_test, DISABLED_inst_test) {
+TEST(normal_test, inst_test) {
     // ResourceMgr only compose resources, provide unified event
     auto res_mgr = ResMgrInst::GetInstance();
 

cpp/unittest/scheduler/resource_test.cpp

@@ -81,6 +81,16 @@ TEST_F(ResourceBaseTest, has_executor) {
     ASSERT_FALSE(both_disable_->HasExecutor());
 }
 
+TEST_F(ResourceBaseTest, dump) {
+    ASSERT_FALSE(only_loader_->Dump().empty());
+    ASSERT_FALSE(only_executor_->Dump().empty());
+    ASSERT_FALSE(both_enable_->Dump().empty());
+    ASSERT_FALSE(both_disable_->Dump().empty());
+    std::stringstream ss;
+    ss << only_loader_ << only_executor_ << both_enable_ << both_disable_;
+    ASSERT_FALSE(ss.str().empty());
+}
+
 /************ ResourceAdvanceTest ************/
 
 class ResourceAdvanceTest : public testing::Test {
@@ -90,9 +100,11 @@ protected:
         disk_resource_ = ResourceFactory::Create("ssd", "DISK", 0);
         cpu_resource_ = ResourceFactory::Create("cpu", "CPU", 0);
         gpu_resource_ = ResourceFactory::Create("gpu", "GPU", 0);
+        test_resource_ = std::make_shared<TestResource>("test", 0, true, true);
         resources_.push_back(disk_resource_);
         resources_.push_back(cpu_resource_);
         resources_.push_back(gpu_resource_);
+        resources_.push_back(test_resource_);
 
         auto subscriber = [&](EventPtr event) {
             if (event->Type() == EventType::LOAD_COMPLETED) {
@@ -115,10 +127,12 @@ protected:
         disk_resource_->RegisterSubscriber(subscriber);
         cpu_resource_->RegisterSubscriber(subscriber);
         gpu_resource_->RegisterSubscriber(subscriber);
+        test_resource_->RegisterSubscriber(subscriber);
 
         disk_resource_->Start();
         cpu_resource_->Start();
         gpu_resource_->Start();
+        test_resource_->Start();
     }
 
     void
@@ -126,6 +140,7 @@ protected:
         disk_resource_->Stop();
         cpu_resource_->Stop();
         gpu_resource_->Stop();
+        test_resource_->Stop();
     }
 
     void
@@ -143,6 +158,7 @@ protected:
     ResourcePtr disk_resource_;
     ResourcePtr cpu_resource_;
     ResourcePtr gpu_resource_;
+    ResourcePtr test_resource_;
     std::vector<ResourcePtr> resources_;
     uint64_t load_count_ = 0;
     uint64_t exec_count_ = 0;
@@ -226,6 +242,30 @@ TEST_F(ResourceAdvanceTest, gpu_resource_test) {
     }
 }
 
+TEST_F(ResourceAdvanceTest, test_resource_test) {
+    const uint64_t NUM = 100;
+    std::vector<std::shared_ptr<TestTask>> tasks;
+    TableFileSchemaPtr dummy = nullptr;
+    for (uint64_t i = 0; i < NUM; ++i) {
+        auto task = std::make_shared<TestTask>(dummy);
+        tasks.push_back(task);
+        test_resource_->task_table().Put(task);
+    }
+
+    test_resource_->WakeupLoader();
+    WaitLoader(NUM);
+
+    for (uint64_t i = 0; i < NUM; ++i) {
+        ASSERT_EQ(tasks[i]->load_count_, 1);
+    }
+
+    test_resource_->WakeupExecutor();
+    WaitExecutor(NUM);
+
+    for (uint64_t i = 0; i < NUM; ++i) {
+        ASSERT_EQ(tasks[i]->exec_count_, 1);
+    }
+}
 
 }
 }

cpp/unittest/scheduler/scheduler_test.cpp

@@ -6,6 +6,7 @@
 #include "scheduler/Scheduler.h"
 #include <gtest/gtest.h>
 #include <src/scheduler/tasklabel/DefaultLabel.h>
+#include <src/server/ServerConfig.h>
 #include "cache/DataObj.h"
 #include "cache/GpuCacheMgr.h"
 #include "scheduler/task/TestTask.h"
@@ -15,233 +16,238 @@
 #include "wrapper/knowhere/vec_index.h"
 #include "scheduler/tasklabel/SpecResLabel.h"
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {
 
-//class MockVecIndex : public engine::VecIndex {
-//public:
-//    virtual server::KnowhereError BuildAll(const long &nb,
-//                                           const float *xb,
-//                                           const long *ids,
-//                                           const engine::Config &cfg,
-//                                           const long &nt = 0,
-//                                           const float *xt = nullptr) {
-//
-//    }
-//
-//    engine::VecIndexPtr Clone() override {
-//        return zilliz::milvus::engine::VecIndexPtr();
-//    }
-//
-//    int64_t GetDeviceId() override {
-//        return 0;
-//    }
-//
-//    engine::IndexType GetType() override {
-//        return engine::IndexType::INVALID;
-//    }
-//
-//    virtual server::KnowhereError Add(const long &nb,
-//                                      const float *xb,
-//                                      const long *ids,
-//                                      const engine::Config &cfg = engine::Config()) {
-//
-//    }
-//
-//    virtual server::KnowhereError Search(const long &nq,
-//                                         const float *xq,
-//                                         float *dist,
-//                                         long *ids,
-//                                         const engine::Config &cfg = engine::Config()) {
-//
-//    }
-//
-//    engine::VecIndexPtr CopyToGpu(const int64_t &device_id, const engine::Config &cfg) override {
-//
-//    }
-//
-//    engine::VecIndexPtr CopyToCpu(const engine::Config &cfg) override {
-//
-//    }
-//
-//    virtual int64_t Dimension() {
-//        return dimension_;
-//    }
-//
-//    virtual int64_t Count() {
-//        return ntotal_;
-//    }
-//
-//    virtual zilliz::knowhere::BinarySet Serialize() {
-//        zilliz::knowhere::BinarySet binset;
-//        return binset;
-//    }
-//
-//    virtual server::KnowhereError Load(const zilliz::knowhere::BinarySet &index_binary) {
-//
-//    }
-//
-//public:
-//    int64_t dimension_ = 512;
-//    int64_t ntotal_ = 0;
-//};
-//
-//
-//class SchedulerTest : public testing::Test {
-//protected:
-//    void
-//    SetUp() override {
-//        ResourcePtr cpu = ResourceFactory::Create("cpu", "CPU", 0, true, false);
-//        ResourcePtr gpu_0 = ResourceFactory::Create("gpu0", "GPU", 0);
-//        ResourcePtr gpu_1 = ResourceFactory::Create("gpu1", "GPU", 1);
-//
-//        res_mgr_ = std::make_shared<ResourceMgr>();
-//        cpu_resource_ = res_mgr_->Add(std::move(cpu));
-//        gpu_resource_0_ = res_mgr_->Add(std::move(gpu_0));
-//        gpu_resource_1_ = res_mgr_->Add(std::move(gpu_1));
-//
-//        auto PCIE = Connection("IO", 11000.0);
-//        res_mgr_->Connect("cpu", "gpu0", PCIE);
-//        res_mgr_->Connect("cpu", "gpu1", PCIE);
-//
-//        scheduler_ = std::make_shared<Scheduler>(res_mgr_);
-//
-//        res_mgr_->Start();
-//        scheduler_->Start();
-//    }
-//
-//    void
-//    TearDown() override {
-//        scheduler_->Stop();
-//        res_mgr_->Stop();
-//    }
-//
-//    ResourceWPtr cpu_resource_;
-//    ResourceWPtr gpu_resource_0_;
-//    ResourceWPtr gpu_resource_1_;
-//
-//    ResourceMgrPtr res_mgr_;
-//    std::shared_ptr<Scheduler> scheduler_;
-//};
-//
-//void
-//insert_dummy_index_into_gpu_cache(uint64_t device_id) {
-//    MockVecIndex* mock_index = new MockVecIndex();
-//    mock_index->ntotal_ = 1000;
-//    engine::VecIndexPtr index(mock_index);
-//
-//    cache::DataObjPtr obj = std::make_shared<cache::DataObj>(index);
-//
-//    cache::GpuCacheMgr::GetInstance(device_id)->InsertItem("location",obj);
-//}
-//
-//TEST_F(SchedulerTest, OnCopyCompleted) {
-//    const uint64_t NUM = 10;
-//    std::vector<std::shared_ptr<TestTask>> tasks;
-//    TableFileSchemaPtr dummy = std::make_shared<meta::TableFileSchema>();
-//    dummy->location_ = "location";
-//
-//    insert_dummy_index_into_gpu_cache(1);
-//
-//    for (uint64_t i = 0; i < NUM; ++i) {
-//        auto task = std::make_shared<TestTask>(dummy);
-//        task->label() = std::make_shared<DefaultLabel>();
-//        tasks.push_back(task);
-//        cpu_resource_.lock()->task_table().Put(task);
-//    }
-//
-//    sleep(3);
+class MockVecIndex : public engine::VecIndex {
+public:
+    virtual ErrorCode BuildAll(const long &nb,
+                               const float *xb,
+                               const long *ids,
+                               const engine::Config &cfg,
+                               const long &nt = 0,
+                               const float *xt = nullptr) {
+
+    }
+
+    engine::VecIndexPtr Clone() override {
+        return zilliz::milvus::engine::VecIndexPtr();
+    }
+
+    int64_t GetDeviceId() override {
+        return 0;
+    }
+
+    engine::IndexType GetType() override {
+        return engine::IndexType::INVALID;
+    }
+
+    virtual ErrorCode Add(const long &nb,
+                          const float *xb,
+                          const long *ids,
+                          const engine::Config &cfg = engine::Config()) {
+
+    }
+
+    virtual ErrorCode Search(const long &nq,
+                             const float *xq,
+                             float *dist,
+                             long *ids,
+                             const engine::Config &cfg = engine::Config()) {
+
+    }
+
+    engine::VecIndexPtr CopyToGpu(const int64_t &device_id, const engine::Config &cfg) override {
+
+    }
+
+    engine::VecIndexPtr CopyToCpu(const engine::Config &cfg) override {
+
+    }
+
+    virtual int64_t Dimension() {
+        return dimension_;
+    }
+
+    virtual int64_t Count() {
+        return ntotal_;
+    }
+
+    virtual zilliz::knowhere::BinarySet Serialize() {
+        zilliz::knowhere::BinarySet binset;
+        return binset;
+    }
+
+    virtual ErrorCode Load(const zilliz::knowhere::BinarySet &index_binary) {
+
+    }
+
+public:
+    int64_t dimension_ = 512;
+    int64_t ntotal_ = 0;
+};
+
+
+class SchedulerTest : public testing::Test {
+protected:
+    void
+    SetUp() override {
+        server::ConfigNode& config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_CACHE);
+        config.AddSequenceItem(server::CONFIG_GPU_IDS, "0");
+        config.AddSequenceItem(server::CONFIG_GPU_IDS, "1");
+
+        ResourcePtr cpu = ResourceFactory::Create("cpu", "CPU", 0, true, false);
+        ResourcePtr gpu_0 = ResourceFactory::Create("gpu0", "GPU", 0);
+        ResourcePtr gpu_1 = ResourceFactory::Create("gpu1", "GPU", 1);
+
+        res_mgr_ = std::make_shared<ResourceMgr>();
+        cpu_resource_ = res_mgr_->Add(std::move(cpu));
+        gpu_resource_0_ = res_mgr_->Add(std::move(gpu_0));
+        gpu_resource_1_ = res_mgr_->Add(std::move(gpu_1));
+
+        auto PCIE = Connection("IO", 11000.0);
+        res_mgr_->Connect("cpu", "gpu0", PCIE);
+        res_mgr_->Connect("cpu", "gpu1", PCIE);
+
+        scheduler_ = std::make_shared<Scheduler>(res_mgr_);
+
+        res_mgr_->Start();
+        scheduler_->Start();
+    }
+
+    void
+    TearDown() override {
+        scheduler_->Stop();
+        res_mgr_->Stop();
+    }
+
+    ResourceWPtr cpu_resource_;
+    ResourceWPtr gpu_resource_0_;
+    ResourceWPtr gpu_resource_1_;
+
+    ResourceMgrPtr res_mgr_;
+    std::shared_ptr<Scheduler> scheduler_;
+};
+
+void
+insert_dummy_index_into_gpu_cache(uint64_t device_id) {
+    MockVecIndex *mock_index = new MockVecIndex();
+    mock_index->ntotal_ = 1000;
+    engine::VecIndexPtr index(mock_index);
+
+    cache::DataObjPtr obj = std::make_shared<cache::DataObj>(index);
+
+    cache::GpuCacheMgr::GetInstance(device_id)->InsertItem("location", obj);
+}
+
+TEST_F(SchedulerTest, OnLoadCompleted) {
+    const uint64_t NUM = 10;
+    std::vector<std::shared_ptr<TestTask>> tasks;
+    TableFileSchemaPtr dummy = std::make_shared<meta::TableFileSchema>();
+    dummy->location_ = "location";
+
+    insert_dummy_index_into_gpu_cache(1);
+
+    for (uint64_t i = 0; i < NUM; ++i) {
+        auto task = std::make_shared<TestTask>(dummy);
+        task->label() = std::make_shared<DefaultLabel>();
+        tasks.push_back(task);
+        cpu_resource_.lock()->task_table().Put(task);
+    }
+
+    sleep(3);
+    ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
+
+}
+
+TEST_F(SchedulerTest, PushTaskToNeighbourRandomlyTest) {
+    const uint64_t NUM = 10;
+    std::vector<std::shared_ptr<TestTask>> tasks;
+    TableFileSchemaPtr dummy1 = std::make_shared<meta::TableFileSchema>();
+    dummy1->location_ = "location";
+
+    tasks.clear();
+
+    for (uint64_t i = 0; i < NUM; ++i) {
+        auto task = std::make_shared<TestTask>(dummy1);
+        task->label() = std::make_shared<DefaultLabel>();
+        tasks.push_back(task);
+        cpu_resource_.lock()->task_table().Put(task);
+    }
+
+    sleep(3);
 //    ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
-//
-//}
-//
-//TEST_F(SchedulerTest, PushTaskToNeighbourRandomlyTest) {
-//    const uint64_t NUM = 10;
-//    std::vector<std::shared_ptr<TestTask>> tasks;
-//    TableFileSchemaPtr dummy1 = std::make_shared<meta::TableFileSchema>();
-//    dummy1->location_ = "location";
-//
-//    tasks.clear();
-//
-//    for (uint64_t i = 0; i < NUM; ++i) {
-//        auto task = std::make_shared<TestTask>(dummy1);
-//        task->label() = std::make_shared<DefaultLabel>();
-//        tasks.push_back(task);
-//        cpu_resource_.lock()->task_table().Put(task);
-//    }
-//
-//    sleep(3);
-////    ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
-//}
-//
-//class SchedulerTest2 : public testing::Test {
-// protected:
-//    void
-//    SetUp() override {
-//        ResourcePtr disk = ResourceFactory::Create("disk", "DISK", 0, true, false);
-//        ResourcePtr cpu0 = ResourceFactory::Create("cpu0", "CPU", 0, true, false);
-//        ResourcePtr cpu1 = ResourceFactory::Create("cpu1", "CPU", 1, true, false);
-//        ResourcePtr cpu2 = ResourceFactory::Create("cpu2", "CPU", 2, true, false);
-//        ResourcePtr gpu0 = ResourceFactory::Create("gpu0", "GPU", 0, true, true);
-//        ResourcePtr gpu1 = ResourceFactory::Create("gpu1", "GPU", 1, true, true);
-//
-//        res_mgr_ = std::make_shared<ResourceMgr>();
-//        disk_ = res_mgr_->Add(std::move(disk));
-//        cpu_0_ = res_mgr_->Add(std::move(cpu0));
-//        cpu_1_ = res_mgr_->Add(std::move(cpu1));
-//        cpu_2_ = res_mgr_->Add(std::move(cpu2));
-//        gpu_0_ = res_mgr_->Add(std::move(gpu0));
-//        gpu_1_ = res_mgr_->Add(std::move(gpu1));
-//        auto IO = Connection("IO", 5.0);
-//        auto PCIE1 = Connection("PCIE", 11.0);
-//        auto PCIE2 = Connection("PCIE", 20.0);
-//        res_mgr_->Connect("disk", "cpu0", IO);
-//        res_mgr_->Connect("cpu0", "cpu1", IO);
-//        res_mgr_->Connect("cpu1", "cpu2", IO);
-//        res_mgr_->Connect("cpu0", "cpu2", IO);
-//        res_mgr_->Connect("cpu1", "gpu0", PCIE1);
-//        res_mgr_->Connect("cpu2", "gpu1", PCIE2);
-//
-//        scheduler_ = std::make_shared<Scheduler>(res_mgr_);
-//
-//        res_mgr_->Start();
-//        scheduler_->Start();
-//    }
-//
-//    void
-//    TearDown() override {
-//        scheduler_->Stop();
-//        res_mgr_->Stop();
-//    }
-//
-//    ResourceWPtr disk_;
-//    ResourceWPtr cpu_0_;
-//    ResourceWPtr cpu_1_;
-//    ResourceWPtr cpu_2_;
-//    ResourceWPtr gpu_0_;
-//    ResourceWPtr gpu_1_;
-//    ResourceMgrPtr res_mgr_;
-//
-//    std::shared_ptr<Scheduler> scheduler_;
-//};
-//
-//
-//TEST_F(SchedulerTest2, SpecifiedResourceTest) {
-//    const uint64_t NUM = 10;
-//    std::vector<std::shared_ptr<TestTask>> tasks;
-//    TableFileSchemaPtr dummy = std::make_shared<meta::TableFileSchema>();
-//    dummy->location_ = "location";
-//
-//    for (uint64_t i = 0; i < NUM; ++i) {
-//        std::shared_ptr<TestTask> task = std::make_shared<TestTask>(dummy);
-//        task->label() = std::make_shared<SpecResLabel>(disk_);
-//        tasks.push_back(task);
-//        disk_.lock()->task_table().Put(task);
-//    }
-//
-////    ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
-//}
+}
+
+class SchedulerTest2 : public testing::Test {
+protected:
+    void
+    SetUp() override {
+        ResourcePtr disk = ResourceFactory::Create("disk", "DISK", 0, true, false);
+        ResourcePtr cpu0 = ResourceFactory::Create("cpu0", "CPU", 0, true, false);
+        ResourcePtr cpu1 = ResourceFactory::Create("cpu1", "CPU", 1, true, false);
+        ResourcePtr cpu2 = ResourceFactory::Create("cpu2", "CPU", 2, true, false);
+        ResourcePtr gpu0 = ResourceFactory::Create("gpu0", "GPU", 0, true, true);
+        ResourcePtr gpu1 = ResourceFactory::Create("gpu1", "GPU", 1, true, true);
+
+        res_mgr_ = std::make_shared<ResourceMgr>();
+        disk_ = res_mgr_->Add(std::move(disk));
+        cpu_0_ = res_mgr_->Add(std::move(cpu0));
+        cpu_1_ = res_mgr_->Add(std::move(cpu1));
+        cpu_2_ = res_mgr_->Add(std::move(cpu2));
+        gpu_0_ = res_mgr_->Add(std::move(gpu0));
+        gpu_1_ = res_mgr_->Add(std::move(gpu1));
+        auto IO = Connection("IO", 5.0);
+        auto PCIE1 = Connection("PCIE", 11.0);
+        auto PCIE2 = Connection("PCIE", 20.0);
+        res_mgr_->Connect("disk", "cpu0", IO);
+        res_mgr_->Connect("cpu0", "cpu1", IO);
+        res_mgr_->Connect("cpu1", "cpu2", IO);
+        res_mgr_->Connect("cpu0", "cpu2", IO);
+        res_mgr_->Connect("cpu1", "gpu0", PCIE1);
+        res_mgr_->Connect("cpu2", "gpu1", PCIE2);
+
+        scheduler_ = std::make_shared<Scheduler>(res_mgr_);
+
+        res_mgr_->Start();
+        scheduler_->Start();
+    }
+
+    void
+    TearDown() override {
+        scheduler_->Stop();
+        res_mgr_->Stop();
+    }
+
+    ResourceWPtr disk_;
+    ResourceWPtr cpu_0_;
+    ResourceWPtr cpu_1_;
+    ResourceWPtr cpu_2_;
+    ResourceWPtr gpu_0_;
+    ResourceWPtr gpu_1_;
+    ResourceMgrPtr res_mgr_;
+
+    std::shared_ptr<Scheduler> scheduler_;
+};
+
+
+TEST_F(SchedulerTest2, SpecifiedResourceTest) {
+    const uint64_t NUM = 10;
+    std::vector<std::shared_ptr<TestTask>> tasks;
+    TableFileSchemaPtr dummy = std::make_shared<meta::TableFileSchema>();
+    dummy->location_ = "location";
+
+    for (uint64_t i = 0; i < NUM; ++i) {
+        std::shared_ptr<TestTask> task = std::make_shared<TestTask>(dummy);
+        task->label() = std::make_shared<SpecResLabel>(disk_);
+        tasks.push_back(task);
+        disk_.lock()->task_table().Put(task);
+    }
+
+//    ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
+}
 
 }
 }

cpp/unittest/scheduler/task_test.cpp

+/*******************************************************************************
+ * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+ * Unauthorized copying of this file, via any medium is strictly prohibited.
+ * Proprietary and confidential.
+ ******************************************************************************/
+
+#include "scheduler/task/SearchTask.h"
+#include <gtest/gtest.h>
+
+
+namespace zilliz {
+namespace milvus {
+namespace engine {
+
+
+TEST(TaskTest, invalid_index) {
+    auto search_task = std::make_shared<XSearchTask>(nullptr);
+    search_task->Load(LoadType::TEST, 10);
+}
+
+}
+}
+}