Commit 0466640f authored by jinhai's avatar jinhai
Browse files

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

annotate some unused code to improve code coverage

See merge request megasearch/milvus!758

Former-commit-id: 57c188ee30498f252159a6db44e951f5654f84fe
parents ab47dee4 cce3083a

core/src/db/engine/ExecutionEngineImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ ExecutionEngineImpl::BuildIndex(const std::string& location, EngineType engine_t 
Status

ExecutionEngineImpl::Search(int64_t n, const float* data, int64_t k, int64_t nprobe, float* distances, int64_t* labels,

                            bool hybrid) {

#if 0

    if (index_type_ == EngineType::FAISS_IVFSQ8H) {

        if (!hybrid) {

            const std::string key = location_ + ".quantizer";
@@ -449,6 +450,7 @@ ExecutionEngineImpl::Search(int64_t n, const float* data, int64_t k, int64_t npr 
            }

        }

    }

#endif



    if (index_ == nullptr) {

        ENGINE_LOG_ERROR << "ExecutionEngineImpl: index is null, failed to search";

core/src/scheduler/optimizer/LargeSQ8HPass.cpp

+42 −42
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
namespace milvus {

namespace scheduler {



bool

LargeSQ8HPass::Run(const TaskPtr& task) {

// bool

// LargeSQ8HPass::Run(const TaskPtr& task) {

//    if (task->Type() != TaskType::SearchTask) {

//        return false;

//    }
@@ -67,7 +67,7 @@ LargeSQ8HPass::Run(const TaskPtr& task) { 
//    task->label() = label;

//

//    return true;

}

// }



}  // namespace scheduler

}  // namespace milvus

core/src/scheduler/optimizer/LargeSQ8HPass.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ class LargeSQ8HPass : public Pass { 
    LargeSQ8HPass() = default;



 public:

    bool

    Run(const TaskPtr& task) override;

    //    bool

    //    Run(const TaskPtr& task) override;

};



using LargeSQ8HPassPtr = std::shared_ptr<LargeSQ8HPass>;

core/src/scheduler/optimizer/Optimizer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
namespace milvus {

namespace scheduler {



void

Optimizer::Init() {

// void

// Optimizer::Init() {

//    for (auto& pass : pass_list_) {

//        pass->Init();

//    }

}

// }



bool

Optimizer::Run(const TaskPtr& task) {

core/src/scheduler/optimizer/Optimizer.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ class Optimizer { 
    explicit Optimizer(std::vector<PassPtr> pass_list) : pass_list_(std::move(pass_list)) {

    }



    void

    Init();

    //    void

    //    Init();



    bool

    Run(const TaskPtr& task);