Commit bd073849 authored by jinhai's avatar jinhai
Browse files

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

Add ToIndexData for CopyToIndexFileToGpu

See merge request megasearch/milvus!684

Former-commit-id: a49de6224bf254c6029fa5e896365db2b6ed1e64
parents 88e5f77a 33402b87

cpp/src/cache/DataObj.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#pragma once





#include <memory>



namespace milvus {

cpp/src/db/engine/ExecutionEngineImpl.cpp

+53 −56
Original line number Diff line number Diff line
@@ -243,12 +243,9 @@ ExecutionEngineImpl::CopyToGpu(uint64_t device_id) { 


Status

ExecutionEngineImpl::CopyToIndexFileToGpu(uint64_t device_id) {

    auto index = cache::GpuCacheMgr::GetInstance(device_id)->GetIndex(location_);

    bool already_in_cache = (index != nullptr);

    if (!already_in_cache) {

        cache::DataObjPtr obj = std::make_shared<cache::DataObj>(nullptr, PhysicalSize());

    auto to_index_data = std::make_shared<ToIndexData>(PhysicalSize());

    cache::DataObjPtr obj = std::static_pointer_cast<cache::DataObj>(to_index_data);

    milvus::cache::GpuCacheMgr::GetInstance(device_id)->InsertItem(location_, obj);

    }

    return Status::OK();

}

cpp/src/wrapper/VecImpl.h

+14 −0
Original line number Diff line number Diff line
@@ -126,5 +126,19 @@ class BFIndex : public VecIndexImpl { 
    GetRawIds();

};



class ToIndexData : public cache::DataObj {

 public:

    explicit ToIndexData(int64_t size) : size_(size) {

    }



    int64_t

    Size() override {

        return size_;

    }



 private:

    int64_t size_;

};



}  // namespace engine

}  // namespace milvus