Commit 355d4a08 authored by groot's avatar groot
Browse files

Merge remote-tracking branch 'source/0.5.0' into branch-0.5.0 


Former-commit-id: 38c52d993cb597d8fb1db2f08ae9fd98cb00da34
parents f58dcc08 5bbe05b3

core/coverage.sh

+9 −9
Original line number Diff line number Diff line
@@ -114,15 +114,15 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ 
    "/usr/*" \

    "*/boost/*" \

    "*/cmake_build/*_ep-prefix/*" \

    "src/index/cmake_build*" \

    "src/index/thirdparty*" \

    "src/grpc*"\

    "src/metrics/MetricBase.h"\

    "src/server/Server.cpp"\

    "src/server/DBWrapper.cpp"\

    "src/server/grpc_impl/GrpcServer.cpp"\

    "src/utils/easylogging++.h"\

    "src/utils/easylogging++.cc"\

    "*/src/index/cmake_build*" \

    "*/src/index/thirdparty*" \

    "*/src/grpc*" \

    "*/src/metrics/MetricBase.h" \

    "*/src/server/Server.cpp" \

    "*/src/server/DBWrapper.cpp" \

    "*/src/server/grpc_impl/GrpcServer.cpp" \

    "*/src/utils/easylogging++.h" \

    "*/src/utils/easylogging++.cc"



# gen html report

${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

core/src/db/engine/ExecutionEngineImpl.cpp

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ ExecutionEngineImpl::HybridLoad() const { 
        quantizer_conf->mode = 1;

        quantizer_conf->gpu_id = best_device_id;

        auto quantizer = index_->LoadQuantizer(quantizer_conf);

        if (quantizer == nullptr) {

            ENGINE_LOG_ERROR << "quantizer is nullptr";

        }

        index_->SetQuantizer(quantizer);

        auto cache_quantizer = std::make_shared<CachedQuantizer>(quantizer);

        cache::GpuCacheMgr::GetInstance(best_device_id)->InsertItem(key, cache_quantizer);

core/src/wrapper/VecIndex.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "knowhere/common/BinarySet.h"

#include "knowhere/common/Config.h"

#include "knowhere/index/vector_index/Quantizer.h"

#include "utils/Log.h"

#include "utils/Status.h"



namespace milvus {
@@ -101,6 +102,7 @@ class VecIndex : public cache::DataObj { 
    ////////////////

    virtual knowhere::QuantizerPtr

    LoadQuantizer(const Config& conf) {

        ENGINE_LOG_ERROR << "LoadQuantizer virtual funciton called.";

        return nullptr;

    }