Commit 0c09eb9e authored by groot's avatar groot
Browse files

Merge remote-tracking branch 'source/master'

parents 9203bdf8 929a976b

CHANGELOG.md

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#977 Server crash when create tables concurrently

-   \#990 Check gpu resources setting when assign repeated value

-   \#995 table count set to 0 if no tables found

-   \#1010 improve error message when offset or page_size is equal 0

-   \#1010 Improve error message when offset or page_size is equal 0

-   \#1022 check if partition name is legal

-   \#1028 check if table exists when show partitions

-   \#1029 check if table exists when try to delete partition
@@ -43,6 +43,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#1530 Set table file with correct engine type in meta

-   \#1532 Search with ivf_flat failed with open-dataset: sift-256-hamming

-   \#1535 Degradation searching performance with metric_type: binary_idmap

-   \#1556 Index file not created after table and index created



## Feature

-   \#216 Add CLI to get server info

core/src/db/meta/MySQLMetaImpl.cpp

+1 −10
Original line number Diff line number Diff line
@@ -674,16 +674,7 @@ MySQLMetaImpl::CreateTableFile(TableFileSchema& file_schema) { 
        file_schema.updated_time_ = file_schema.created_on_;

        file_schema.index_file_size_ = table_schema.index_file_size_;

        file_schema.index_params_ = table_schema.index_params_;



        if (file_schema.file_type_ == TableFileSchema::FILE_TYPE::NEW ||

            file_schema.file_type_ == TableFileSchema::FILE_TYPE::NEW_MERGE) {

            file_schema.engine_type_ = server::ValidationUtil::IsBinaryMetricType(table_schema.metric_type_)

                                           ? (int32_t)EngineType::FAISS_BIN_IDMAP

                                           : (int32_t)EngineType::FAISS_IDMAP;

        } else {

        file_schema.engine_type_ = table_schema.engine_type_;

        }



        file_schema.metric_type_ = table_schema.metric_type_;



        std::string id = "NULL";  // auto-increment

core/src/db/meta/SqliteMetaImpl.cpp

+1 −10
Original line number Diff line number Diff line
@@ -375,16 +375,7 @@ SqliteMetaImpl::CreateTableFile(TableFileSchema& file_schema) { 
        file_schema.updated_time_ = file_schema.created_on_;

        file_schema.index_file_size_ = table_schema.index_file_size_;

        file_schema.index_params_ = table_schema.index_params_;



        if (file_schema.file_type_ == TableFileSchema::FILE_TYPE::NEW ||

            file_schema.file_type_ == TableFileSchema::FILE_TYPE::NEW_MERGE) {

            file_schema.engine_type_ = server::ValidationUtil::IsBinaryMetricType(table_schema.metric_type_)

                                           ? (int32_t)EngineType::FAISS_BIN_IDMAP

                                           : (int32_t)EngineType::FAISS_IDMAP;

        } else {

        file_schema.engine_type_ = table_schema.engine_type_;

        }



        file_schema.metric_type_ = table_schema.metric_type_;



        // multi-threads call sqlite update may get exception('bad logic', etc), so we add a lock here