Commit 51ffa62c authored by 余昆's avatar 余昆
Browse files

MS-650 SQ8H index create issue 


Former-commit-id: c44fa2e78695440dc41f4cf60293a30675ebc090
parent e6f55336

core/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-644 - Search crashed with index-type: flat

- MS-624 - Search vectors failed if time ranges long enough

- MS-652 - IVFSQH quantization double free

- MS-650 - SQ8H index create issue



## Improvement

- MS-552 - Add and change the easylogging library

core/src/scheduler/Scheduler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void 
Scheduler::OnLoadCompleted(const EventPtr& event) {

    auto load_completed_event = std::static_pointer_cast<LoadCompletedEvent>(event);

    if (auto resource = event->resource_.lock()) {

        //        resource->WakeupExecutor();

        resource->WakeupExecutor();



        auto task_table_type = load_completed_event->task_table_item_->task->label()->Type();

        switch (task_table_type) {

core/src/scheduler/resource/Resource.cpp

+15 −14
Original line number Diff line number Diff line
@@ -116,23 +116,23 @@ Resource::pick_task_execute() { 
    auto indexes = task_table_.PickToExecute(std::numeric_limits<uint64_t>::max());

    for (auto index : indexes) {

        // try to set one task executing, then return

        //        if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {

        //            if (task_table_[index]->task->path().Last() != name()) {

        //                continue;

        //            }

        //        }

        //

        //        if (task_table_.Execute(index)) {

        //            return task_table_.Get(index);

        //        }

        if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {

            if (task_table_.Get(index)->task->path().Current() == task_table_.Get(index)->task->path().Last() &&

                task_table_.Get(index)->task->path().Last() == name()) {

                if (task_table_.Execute(index)) {

                    return task_table_.Get(index);

            if (task_table_[index]->task->path().Last() != name()) {

                continue;

            }

        }



        if (task_table_.Execute(index)) {

            return task_table_.Get(index);

        }

//        if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {

//            if (task_table_.Get(index)->task->path().Current() == task_table_.Get(index)->task->path().Last() &&

//                task_table_.Get(index)->task->path().Last() == name()) {

//                if (task_table_.Execute(index)) {

//                    return task_table_.Get(index);

//                }

//            }

//        }

        // else try next

    }

    return nullptr;
@@ -188,6 +188,7 @@ Resource::executor_function() { 
            if (task_item->task->Type() == TaskType::BuildIndexTask) {

                BuildMgrInst::GetInstance()->Put();

                ResMgrInst::GetInstance()->GetResource("cpu")->WakeupLoader();

                ResMgrInst::GetInstance()->GetResource("disk")->WakeupLoader();

            }



            if (subscriber_) {

core/src/scheduler/action/PushTaskToNeighbour.cpp

+3 −3

File changed.

Contains only whitespace changes.