Unverified Commit 140a7a59 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #347 from yhmo/0.6.0 

#340 Test cases run failed on 0.6.0
parents 49ec7e1a d93182a2

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#246 - Exclude src/external folder from code coverage for jenkin ci

- \#248 - Reside src/external in thirdparty

- \#316 - Some files not merged after vectors added

- \#340 - Test cases run failed on 0.6.0



## Feature

- \#12 - Pure CPU version for Milvus

core/src/db/DBImpl.cpp

+12 −8
Original line number Diff line number Diff line
@@ -179,9 +179,10 @@ DBImpl::PreloadTable(const std::string& table_id) { 
    }



    // get all table files from parent table

    meta::DatesT dates;

    std::vector<size_t> ids;

    meta::TableFilesSchema files_array;

    auto status = GetFilesToSearch(table_id, ids, files_array);

    auto status = GetFilesToSearch(table_id, ids, dates, files_array);

    if (!status.ok()) {

        return status;

    }
@@ -190,7 +191,7 @@ DBImpl::PreloadTable(const std::string& table_id) { 
    std::vector<meta::TableSchema> partiton_array;

    status = meta_ptr_->ShowPartitions(table_id, partiton_array);

    for (auto& schema : partiton_array) {

        status = GetFilesToSearch(schema.table_id_, ids, files_array);

        status = GetFilesToSearch(schema.table_id_, ids, dates, files_array);

    }



    int64_t size = 0;
@@ -304,6 +305,10 @@ DBImpl::InsertVectors(const std::string& table_id, const std::string& partition_ 
    if (!partition_tag.empty()) {

        std::string partition_name;

        status = meta_ptr_->GetPartitionName(table_id, partition_tag, target_table_name);

        if (!status.ok()) {

            ENGINE_LOG_ERROR << status.message();

            return status;

        }

    }



    // insert vectors into target table
@@ -400,7 +405,7 @@ DBImpl::Query(const std::string& table_id, const std::vector<std::string>& parti 
    if (partition_tags.empty()) {

        // no partition tag specified, means search in whole table

        // get all table files from parent table

        status = GetFilesToSearch(table_id, ids, files_array);

        status = GetFilesToSearch(table_id, ids, dates, files_array);

        if (!status.ok()) {

            return status;

        }
@@ -408,7 +413,7 @@ DBImpl::Query(const std::string& table_id, const std::vector<std::string>& parti 
        std::vector<meta::TableSchema> partiton_array;

        status = meta_ptr_->ShowPartitions(table_id, partiton_array);

        for (auto& schema : partiton_array) {

            status = GetFilesToSearch(schema.table_id_, ids, files_array);

            status = GetFilesToSearch(schema.table_id_, ids, dates, files_array);

        }

    } else {

        // get files from specified partitions
@@ -416,7 +421,7 @@ DBImpl::Query(const std::string& table_id, const std::vector<std::string>& parti 
        GetPartitionsByTags(table_id, partition_tags, partition_name_array);



        for (auto& partition_name : partition_name_array) {

            status = GetFilesToSearch(partition_name, ids, files_array);

            status = GetFilesToSearch(partition_name, ids, dates, files_array);

        }

    }
@@ -446,7 +451,7 @@ DBImpl::QueryByFileID(const std::string& table_id, const std::vector<std::string 
    }



    meta::TableFilesSchema files_array;

    auto status = GetFilesToSearch(table_id, ids, files_array);

    auto status = GetFilesToSearch(table_id, ids, dates, files_array);

    if (!status.ok()) {

        return status;

    }
@@ -829,9 +834,8 @@ DBImpl::BackgroundBuildIndex() { 
}



Status

DBImpl::GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids,

DBImpl::GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, const meta::DatesT& dates,

                         meta::TableFilesSchema& files) {

    meta::DatesT dates;

    meta::DatePartionedTableFilesSchema date_files;

    auto status = meta_ptr_->FilesToSearch(table_id, file_ids, dates, date_files);

    if (!status.ok()) {

core/src/db/DBImpl.h

+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ class DBImpl : public DB { 
    MemSerialize();



    Status

    GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, meta::TableFilesSchema& files);

    GetFilesToSearch(const std::string& table_id, const std::vector<size_t>& file_ids, const meta::DatesT& dates,

                     meta::TableFilesSchema& files);



    Status

    GetPartitionsByTags(const std::string& table_id, const std::vector<std::string>& partition_tags,