Commit 4fb544df authored by 余昆's avatar 余昆
Browse files

Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk 


Former-commit-id: 3c32883ab26c23b381b95a5aeec405c6cff2ac11
parents 38716e75 c3509e9e

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-622 - Delete vectors should be failed if date range is invalid

- MS-620 - Get table row counts display wrong error code

- MS-637 - out of memory when load too many tasks

- MS-640 - Cache object size calculate incorrect



## Improvement

- MS-552 - Add and change the easylogging library

cpp/src/wrapper/VecIndex.cpp

+11 −2
Original line number Diff line number Diff line
@@ -37,9 +37,17 @@ namespace engine { 


int64_t

VecIndex::Size() {

    if (size_ != 0) {

        return size_;

    }

    return Count() * Dimension() * sizeof(float);

}



void

VecIndex::set_size(int64_t size) {

    size_ = size;

}



struct FileIOReader {

    std::fstream fs;

    std::string name;
@@ -159,12 +167,13 @@ GetVecIndexFactory(const IndexType& type, const Config& cfg) { 
}



VecIndexPtr

LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary) {

LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary, int64_t size) {

    auto index = GetVecIndexFactory(index_type);

    if (index == nullptr)

        return nullptr;

    // else

    index->Load(index_binary);

    index->set_size(size);

    return index;

}
@@ -210,7 +219,7 @@ read_index(const std::string& location) { 
        delete[] meta;

    }



    return LoadVecIndex(current_type, load_data_list);

    return LoadVecIndex(current_type, load_data_list, length);

}



Status

cpp/src/wrapper/VecIndex.h

+6 −1
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ class VecIndex : public cache::DataObj { 
    int64_t

    Size() override;



    void

    set_size(int64_t size);



    virtual knowhere::BinarySet

    Serialize() = 0;
@@ -115,6 +118,8 @@ class VecIndex : public cache::DataObj { 
        return Status::OK();

    }

    ////////////////

 private:

    int64_t size_ = 0;

};



extern Status
@@ -127,7 +132,7 @@ extern VecIndexPtr 
GetVecIndexFactory(const IndexType& type, const Config& cfg = Config());



extern VecIndexPtr

LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary);

LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary, int64_t size);



extern IndexType

ConvertToCpuIndexType(const IndexType& type);