Commit 9168a322 authored by 王翔宇's avatar 王翔宇
Browse files

MS-609 Update task construct function 


Former-commit-id: cf1118badd5f05d59ca1739993a415c0851326b7
parent 2d43637d

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-578 - Make sure milvus5.0 don't crack 0.3.1 data

- MS-585 - Update namespace in scheduler

- MS-608 - Update TODO names

- MS-609 - Update task construct function



## New Feature

cpp/src/scheduler/TaskCreator.cpp

+4 −4
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ std::vector<TaskPtr> 
TaskCreator::Create(const SearchJobPtr& job) {

    std::vector<TaskPtr> tasks;

    for (auto& index_file : job->index_files()) {

        auto task = std::make_shared<XSearchTask>(index_file.second);

        task->label() = std::make_shared<DefaultLabel>();

        auto label = std::make_shared<DefaultLabel>();

        auto task = std::make_shared<XSearchTask>(index_file.second, label);

        task->job_ = job;

        tasks.emplace_back(task);

    }
@@ -54,8 +54,8 @@ TaskCreator::Create(const SearchJobPtr& job) { 
std::vector<TaskPtr>

TaskCreator::Create(const DeleteJobPtr& job) {

    std::vector<TaskPtr> tasks;

    auto task = std::make_shared<XDeleteTask>(job);

    task->label() = std::make_shared<BroadcastLabel>();

    auto label = std::make_shared<BroadcastLabel>();

    auto task = std::make_shared<XDeleteTask>(job, label);

    task->job_ = job;

    tasks.emplace_back(task);

cpp/src/scheduler/task/DeleteTask.cpp

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

namespace scheduler {



XDeleteTask::XDeleteTask(const scheduler::DeleteJobPtr& delete_job)

    : Task(TaskType::DeleteTask), delete_job_(delete_job) {

XDeleteTask::XDeleteTask(const scheduler::DeleteJobPtr& delete_job, TaskLabelPtr label)

    : Task(TaskType::DeleteTask, std::move(label)), delete_job_(delete_job) {

}



void

cpp/src/scheduler/task/DeleteTask.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace scheduler { 


class XDeleteTask : public Task {

 public:

    explicit XDeleteTask(const scheduler::DeleteJobPtr& delete_job);

    explicit XDeleteTask(const scheduler::DeleteJobPtr& delete_job, TaskLabelPtr label);



    void

    Load(LoadType type, uint8_t device_id) override;

cpp/src/scheduler/task/SearchTask.cpp

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ CollectFileMetrics(int file_type, size_t file_size) { 
    }

}



XSearchTask::XSearchTask(TableFileSchemaPtr file) : Task(TaskType::SearchTask), file_(file) {

XSearchTask::XSearchTask(TableFileSchemaPtr file, TaskLabelPtr label)

    : Task(TaskType::SearchTask, std::move(label)), file_(file) {

    if (file_) {

        if (file_->metric_type_ != static_cast<int>(MetricType::L2)) {

            metric_l2 = false;