Commit 56e734df authored by 王翔宇's avatar 王翔宇
Browse files

Add unique id for Job 


Former-commit-id: 44b42e9f015d53c184e39dc730d68508bbec62b2
parent fb50fa18

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#92 - Speed up CMake build process

- \#96 - Remove .a file in milvus/lib for docker-version

- \#118 - Using shared_ptr instead of weak_ptr to avoid performance loss

- \#122 - Add unique id for Job



## Feature

- \#115 - Using new structure for tasktable

core/src/db/DBImpl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ DBImpl::DeleteTable(const std::string& table_id, const meta::DatesT& dates) { 


        // scheduler will determine when to delete table files

        auto nres = scheduler::ResMgrInst::GetInstance()->GetNumOfComputeResource();

        scheduler::DeleteJobPtr job = std::make_shared<scheduler::DeleteJob>(0, table_id, meta_ptr_, nres);

        scheduler::DeleteJobPtr job = std::make_shared<scheduler::DeleteJob>(table_id, meta_ptr_, nres);

        scheduler::JobMgrInst::GetInstance()->Put(job);

        job->WaitAndDelete();

    } else {
@@ -439,7 +439,7 @@ DBImpl::QueryAsync(const std::string& table_id, const meta::TableFilesSchema& fi 


    // step 1: get files to search

    ENGINE_LOG_DEBUG << "Engine query begin, index file count: " << files.size();

    scheduler::SearchJobPtr job = std::make_shared<scheduler::SearchJob>(0, k, nq, nprobe, vectors);

    scheduler::SearchJobPtr job = std::make_shared<scheduler::SearchJob>(k, nq, nprobe, vectors);

    for (auto& file : files) {

        scheduler::TableFileSchemaPtr file_ptr = std::make_shared<meta::TableFileSchema>(file);

        job->AddIndexFile(file_ptr);
@@ -754,7 +754,7 @@ DBImpl::BackgroundBuildIndex() { 
    Status status;



    if (!to_index_files.empty()) {

        scheduler::BuildIndexJobPtr job = std::make_shared<scheduler::BuildIndexJob>(0, meta_ptr_, options_);

        scheduler::BuildIndexJobPtr job = std::make_shared<scheduler::BuildIndexJob>(meta_ptr_, options_);



        // step 2: put build index task to scheduler

        for (auto& file : to_index_files) {

core/src/scheduler/ResourceMgr.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ class ResourceMgr : public interface::dumpable { 
        return gpu_resources_;

    }



    // TODO(wxyu): why return shared pointer

    inline std::vector<ResourcePtr>

    GetAllResources() {

        return resources_;

core/src/scheduler/job/BuildIndexJob.cpp

+4 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
namespace milvus {

namespace scheduler {



BuildIndexJob::BuildIndexJob(JobId id, engine::meta::MetaPtr meta_ptr, engine::DBOptions options)

    : Job(id, JobType::BUILD), meta_ptr_(std::move(meta_ptr)), options_(std::move(options)) {

BuildIndexJob::BuildIndexJob(engine::meta::MetaPtr meta_ptr, engine::DBOptions options)

    : Job(JobType::BUILD), meta_ptr_(std::move(meta_ptr)), options_(std::move(options)) {

}



bool
@@ -59,6 +59,8 @@ BuildIndexJob::Dump() const { 
    json ret{

        {"number_of_to_index_file", to_index_files_.size()},

    };

    auto base = Job::Dump();

    ret.insert(base.begin(), base.end());

    return ret;

}

core/src/scheduler/job/BuildIndexJob.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ using Id2ToTableFileMap = std::unordered_map<size_t, TableFileSchema>; 


class BuildIndexJob : public Job {

 public:

    explicit BuildIndexJob(JobId id, engine::meta::MetaPtr meta_ptr, engine::DBOptions options);

    explicit BuildIndexJob(engine::meta::MetaPtr meta_ptr, engine::DBOptions options);



 public:

    bool