Commit 160e08b4 authored by jinhai's avatar jinhai
Browse files

Merge branch '0.5.0' into '0.5.0' 

update

See merge request megasearch/milvus!774

Former-commit-id: e0cc5fcb9b94db5369d30d28c20bfcc5f208f94d
parents e5fd7bd9 ac20f4f9

core/src/db/engine/ExecutionEngineImpl.cpp

+8 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ ExecutionEngineImpl::HybridLoad() const { 
        return;

    }



    if (index_->GetType() == IndexType::FAISS_IDMAP) {

        ENGINE_LOG_WARNING << "HybridLoad with type FAISS_IDMAP, ignore";

        return;

    }



    const std::string key = location_ + ".quantizer";

    std::vector<uint64_t> gpus = scheduler::get_gpu_pool();
@@ -178,6 +183,9 @@ ExecutionEngineImpl::HybridUnset() const { 
    if (index_type_ != EngineType::FAISS_IVFSQ8H) {

        return;

    }

    if (index_->GetType() == IndexType::FAISS_IDMAP) {

        return;

    }

    index_->UnsetQuantizer();

}