Commit 965ca2c9 authored by starlord's avatar starlord
Browse files

format scheduler code 


Former-commit-id: c2ff1ac702af62b4968a192d12b258bc90dd0b50
parent a4f1a639

cpp/src/scheduler/Algorithm.cpp

+9 −7
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ 
// under the License.





#include "Algorithm.h"

#include "scheduler/Algorithm.h"



#include <limits>

#include <unordered_map>

#include <utility>



namespace zilliz {

namespace milvus {
@@ -29,7 +33,6 @@ ShortestPath(const ResourcePtr &src, 
             const ResourcePtr &dest,

             const ResourceMgrPtr &res_mgr,

             std::vector<std::string> &path) {



    std::vector<std::vector<std::string>> paths;



    uint64_t num_of_resources = res_mgr->GetAllResources().size();
@@ -53,7 +56,6 @@ ShortestPath(const ResourcePtr &src, 
    std::vector<bool> vis(num_of_resources, false);

    std::vector<uint64_t> dis(num_of_resources, MAXINT);

    for (auto &res : res_mgr->GetAllResources()) {



        auto cur_node = std::static_pointer_cast<Node>(res);

        auto cur_neighbours = cur_node->GetNeighbours();
@@ -105,6 +107,6 @@ ShortestPath(const ResourcePtr &src, 
    return dis[name_id_map.at(dest->name())];

}



}

}

}
 
 No newline at end of file
 
} // namespace scheduler

} // namespace milvus

} // namespace zilliz

cpp/src/scheduler/Algorithm.h

+4 −4
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ ShortestPath(const ResourcePtr &src, 
             const ResourceMgrPtr &res_mgr,

             std::vector<std::string> &path);



}

}

}
 
 No newline at end of file
 
} // namespace scheduler

} // namespace milvus

} // namespace zilliz

cpp/src/scheduler/Definition.h

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "db/engine/EngineFactory.h"

#include "db/engine/ExecutionEngine.h"





namespace zilliz {

namespace milvus {

namespace scheduler {
@@ -43,6 +42,6 @@ using EngineFactory = engine::EngineFactory; 
using EngineType = engine::EngineType;

using MetricType = engine::MetricType;



}

}

}
 
} // namespace scheduler

} // namespace milvus

} // namespace zilliz

cpp/src/scheduler/JobMgr.cpp

+10 −8
Original line number Diff line number Diff line
@@ -15,19 +15,19 @@ 
// specific language governing permissions and limitations

// under the License.



#include "JobMgr.h"

#include "scheduler/JobMgr.h"

#include "task/Task.h"

#include "TaskCreator.h"



#include <utility>



namespace zilliz {

namespace milvus {

namespace scheduler {



using namespace engine;



JobMgr::JobMgr(ResourceMgrPtr res_mgr)

    : res_mgr_(std::move(res_mgr)) {}

    : res_mgr_(std::move(res_mgr)) {

}



void

JobMgr::Start() {
@@ -59,7 +59,9 @@ void 
JobMgr::worker_function() {

    while (running_) {

        std::unique_lock<std::mutex> lock(mutex_);

        cv_.wait(lock, [this] { return !queue_.empty(); });

        cv_.wait(lock, [this] {

            return !queue_.empty();

        });

        auto job = queue_.front();

        queue_.pop();

        lock.unlock();
@@ -84,6 +86,6 @@ JobMgr::build_task(const JobPtr &job) { 
    return TaskCreator::Create(job);

}



}

}

}
 
} // namespace scheduler

} // namespace milvus

} // namespace zilliz

cpp/src/scheduler/JobMgr.h

+8 −10
Original line number Diff line number Diff line
@@ -31,15 +31,13 @@ 
#include "task/Task.h"

#include "ResourceMgr.h"





namespace zilliz {

namespace milvus {

namespace scheduler {



class JobMgr {

 public:

    explicit

    JobMgr(ResourceMgrPtr res_mgr);

    explicit JobMgr(ResourceMgrPtr res_mgr);



    void

    Start();
@@ -72,6 +70,6 @@ private: 


using JobMgrPtr = std::shared_ptr<JobMgr>;



}

}

}
 
} // namespace scheduler

} // namespace milvus

} // namespace zilliz