Commit 1d0c35f0 authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.5.1' into 'branch-0.5.0' 

Format code

See merge request megasearch/milvus!736

Former-commit-id: 3f65d552a1045151501f46bb354f65d19918386f
parents 7af36cdb 33aebc06

core/src/db/DBImpl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -292,7 +292,8 @@ DBImpl::CreateIndex(const std::string& table_id, const TableIndex& index) { 
    std::vector<int> file_types;

    if (index.engine_type_ == static_cast<int32_t>(EngineType::FAISS_IDMAP)) {

        file_types = {

            static_cast<int32_t>(meta::TableFileSchema::NEW), static_cast<int32_t>(meta::TableFileSchema::NEW_MERGE),

            static_cast<int32_t>(meta::TableFileSchema::NEW),

            static_cast<int32_t>(meta::TableFileSchema::NEW_MERGE),

        };

    } else {

        file_types = {

core/src/db/insert/MemTableFile.cpp

+3 −3
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ MemTableFile::CreateTableFile() { 
Status

MemTableFile::Add(const VectorSourcePtr& source, IDNumbers& vector_ids) {

    if (table_file_schema_.dimension_ <= 0) {

        std::string err_msg = "MemTableFile::Add: table_file_schema dimension = " +

                              std::to_string(table_file_schema_.dimension_) + ", table_id = " +

                              table_file_schema_.table_id_;

        std::string err_msg =

            "MemTableFile::Add: table_file_schema dimension = " + std::to_string(table_file_schema_.dimension_) +

            ", table_id = " + table_file_schema_.table_id_;

        ENGINE_LOG_ERROR << err_msg;

        return Status(DB_ERROR, "Not able to create table file");

    }

core/src/db/meta/MySQLMetaImpl.cpp

+12 −9
Original line number Diff line number Diff line
@@ -148,14 +148,17 @@ static const MetaSchema TABLES_SCHEMA(META_TABLES, { 
                                                   });



// TableFiles schema

static const MetaSchema TABLEFILES_SCHEMA(

    META_TABLEFILES,

    {

        MetaField("id", "BIGINT", "PRIMARY KEY AUTO_INCREMENT"), MetaField("table_id", "VARCHAR(255)", "NOT NULL"),

        MetaField("engine_type", "INT", "DEFAULT 1 NOT NULL"), MetaField("file_id", "VARCHAR(255)", "NOT NULL"),

        MetaField("file_type", "INT", "DEFAULT 0 NOT NULL"), MetaField("file_size", "BIGINT", "DEFAULT 0 NOT NULL"),

        MetaField("row_count", "BIGINT", "DEFAULT 0 NOT NULL"), MetaField("updated_time", "BIGINT", "NOT NULL"),

        MetaField("created_on", "BIGINT", "NOT NULL"), MetaField("date", "INT", "DEFAULT -1 NOT NULL"),

static const MetaSchema TABLEFILES_SCHEMA(META_TABLEFILES, {

                                                               MetaField("id", "BIGINT", "PRIMARY KEY AUTO_INCREMENT"),

                                                               MetaField("table_id", "VARCHAR(255)", "NOT NULL"),

                                                               MetaField("engine_type", "INT", "DEFAULT 1 NOT NULL"),

                                                               MetaField("file_id", "VARCHAR(255)", "NOT NULL"),

                                                               MetaField("file_type", "INT", "DEFAULT 0 NOT NULL"),

                                                               MetaField("file_size", "BIGINT", "DEFAULT 0 NOT NULL"),

                                                               MetaField("row_count", "BIGINT", "DEFAULT 0 NOT NULL"),

                                                               MetaField("updated_time", "BIGINT", "NOT NULL"),

                                                               MetaField("created_on", "BIGINT", "NOT NULL"),

                                                               MetaField("date", "INT", "DEFAULT -1 NOT NULL"),

                                                           });



}  // namespace

core/src/index/unittest/test_ivf.cpp

+8 −7
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ class IVFTest : public DataGen, public TestWithParam<::std::tuple<std::string, P 
    knowhere::IVFIndexPtr index_ = nullptr;

};



INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest, Values(std::make_tuple("IVF", ParameterType::ivf),

INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest,

                        Values(std::make_tuple("IVF", ParameterType::ivf),

                               std::make_tuple("GPUIVF", ParameterType::ivf),

                               std::make_tuple("IVFPQ", ParameterType::ivfpq),

                               std::make_tuple("GPUIVFPQ", ParameterType::ivfpq),

core/src/scheduler/task/BuildIndexTask.cpp

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ XBuildIndexTask::Load(milvus::scheduler::LoadType type, uint8_t device_id) { 


        size_t file_size = to_index_engine_->PhysicalSize();



        std::string info = "Load file id:" + std::to_string(file_->id_) + " file type:" +

                           std::to_string(file_->file_type_) + " size:" + std::to_string(file_size) +

        std::string info = "Load file id:" + std::to_string(file_->id_) +

                           " file type:" + std::to_string(file_->file_type_) + " size:" + std::to_string(file_size) +

                           " bytes from location: " + file_->location_ + " totally cost";

        double span = rc.ElapseFromBegin(info);