Merge branch 'branch-0.5.0' into 'branch-0.5.0'

fix build error

See merge request megasearch/milvus!606

Former-commit-id: 783ef8d01b5201183a79e74006927d67649c4e79

cpp/unittest/server/rpc_test.cpp

@@ -50,19 +50,19 @@ class RpcHandlerTest : public testing::Test {
     void
     SetUp() override {
 
-        auto res_mgr = engine::ResMgrInst::GetInstance();
+        auto res_mgr = scheduler::ResMgrInst::GetInstance();
         res_mgr->Clear();
-        res_mgr->Add(engine::ResourceFactory::Create("disk", "DISK", 0, true, false));
-        res_mgr->Add(engine::ResourceFactory::Create("cpu", "CPU", 0, true, true));
-        res_mgr->Add(engine::ResourceFactory::Create("gtx1660", "GPU", 0, true, true));
+        res_mgr->Add(scheduler::ResourceFactory::Create("disk", "DISK", 0, true, false));
+        res_mgr->Add(scheduler::ResourceFactory::Create("cpu", "CPU", 0, true, true));
+        res_mgr->Add(scheduler::ResourceFactory::Create("gtx1660", "GPU", 0, true, true));
 
-        auto default_conn = engine::Connection("IO", 500.0);
-        auto PCIE = engine::Connection("IO", 11000.0);
+        auto default_conn = scheduler::Connection("IO", 500.0);
+        auto PCIE = scheduler::Connection("IO", 11000.0);
         res_mgr->Connect("disk", "cpu", default_conn);
         res_mgr->Connect("cpu", "gtx1660", PCIE);
         res_mgr->Start();
-        engine::SchedInst::GetInstance()->Start();
-        engine::JobMgrInst::GetInstance()->Start();
+        scheduler::SchedInst::GetInstance()->Start();
+        scheduler::JobMgrInst::GetInstance()->Start();
 
         engine::DBOptions opt;
 
@@ -106,9 +106,9 @@ class RpcHandlerTest : public testing::Test {
     void
     TearDown() override {
         server::DBWrapper::GetInstance().StopService();
-        engine::JobMgrInst::GetInstance()->Stop();
-        engine::ResMgrInst::GetInstance()->Stop();
-        engine::SchedInst::GetInstance()->Stop();
+        scheduler::JobMgrInst::GetInstance()->Stop();
+        scheduler::ResMgrInst::GetInstance()->Stop();
+        scheduler::SchedInst::GetInstance()->Stop();
         boost::filesystem::remove_all("/tmp/milvus_test");
     }
  protected: