diff --git a/CHANGELOG.md b/CHANGELOG.md index 9262ae01aa..0e3284f9f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Please mark all change in change log and use the ticket from JIRA. - \#602 - Optimizer specify wrong gpu_id - \#606 - No log generated during building index with CPU - \#631 - FAISS isn't compiled with O3 option +- \#649 - Typo "partiton" should be "partition" ## Feature - \#12 - Pure CPU version for Milvus diff --git a/core/src/db/DB.h b/core/src/db/DB.h index 09bbd4af45..154686be60 100644 --- a/core/src/db/DB.h +++ b/core/src/db/DB.h @@ -80,7 +80,7 @@ class DB { DropPartitionByTag(const std::string& table_id, const std::string& partition_tag) = 0; virtual Status - ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) = 0; + ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) = 0; virtual Status InsertVectors(const std::string& table_id, const std::string& partition_tag, uint64_t n, const float* vectors, diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp index 8f8516770f..88689857ca 100644 --- a/core/src/db/DBImpl.cpp +++ b/core/src/db/DBImpl.cpp @@ -190,9 +190,9 @@ DBImpl::PreloadTable(const std::string& table_id) { } // step 2: get files from partition tables - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { status = GetFilesToSearch(schema.table_id_, ids, dates, files_array); } @@ -296,12 +296,12 @@ DBImpl::DropPartitionByTag(const std::string& table_id, const std::string& parti } Status -DBImpl::ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) { +DBImpl::ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) { if (shutting_down_.load(std::memory_order_acquire)) { return SHUTDOWN_ERROR; } - return meta_ptr_->ShowPartitions(table_id, partiton_schema_array); + return meta_ptr_->ShowPartitions(table_id, partition_schema_array); } Status @@ -427,9 +427,9 @@ DBImpl::Query(const std::string& table_id, const std::vector& parti return status; } - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { status = GetFilesToSearch(schema.table_id_, ids, dates, files_array); } } else { @@ -917,15 +917,15 @@ DBImpl::GetFilesToSearch(const std::string& table_id, const std::vector& Status DBImpl::GetPartitionsByTags(const std::string& table_id, const std::vector& partition_tags, std::set& partition_name_array) { - std::vector partiton_array; - auto status = meta_ptr_->ShowPartitions(table_id, partiton_array); + std::vector partition_array; + auto status = meta_ptr_->ShowPartitions(table_id, partition_array); for (auto& tag : partition_tags) { // trim side-blank of tag, only compare valid characters // for example: " ab cd " is treated as "ab cd" std::string valid_tag = tag; server::StringHelpFunctions::TrimStringBlank(valid_tag); - for (auto& schema : partiton_array) { + for (auto& schema : partition_array) { if (server::StringHelpFunctions::IsRegexMatch(schema.partition_tag_, valid_tag)) { partition_name_array.insert(schema.table_id_); } @@ -955,9 +955,9 @@ DBImpl::DropTableRecursively(const std::string& table_id, const meta::DatesT& da status = meta_ptr_->DropDataByDate(table_id, dates); } - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { status = DropTableRecursively(schema.table_id_, dates); if (!status.ok()) { return status; @@ -977,9 +977,9 @@ DBImpl::UpdateTableIndexRecursively(const std::string& table_id, const TableInde return status; } - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { status = UpdateTableIndexRecursively(schema.table_id_, index); if (!status.ok()) { return status; @@ -1028,9 +1028,9 @@ DBImpl::BuildTableIndexRecursively(const std::string& table_id, const TableIndex } // build index for partition - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { status = BuildTableIndexRecursively(schema.table_id_, index); if (!status.ok()) { return status; @@ -1060,9 +1060,9 @@ DBImpl::DropTableIndexRecursively(const std::string& table_id) { } // drop partition index - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { status = DropTableIndexRecursively(schema.table_id_); if (!status.ok()) { return status; @@ -1081,9 +1081,9 @@ DBImpl::GetTableRowCountRecursively(const std::string& table_id, uint64_t& row_c } // get partition row count - std::vector partiton_array; - status = meta_ptr_->ShowPartitions(table_id, partiton_array); - for (auto& schema : partiton_array) { + std::vector partition_array; + status = meta_ptr_->ShowPartitions(table_id, partition_array); + for (auto& schema : partition_array) { uint64_t partition_row_count = 0; status = GetTableRowCountRecursively(schema.table_id_, partition_row_count); if (!status.ok()) { diff --git a/core/src/db/DBImpl.h b/core/src/db/DBImpl.h index 5091160d63..a79f26f844 100644 --- a/core/src/db/DBImpl.h +++ b/core/src/db/DBImpl.h @@ -89,7 +89,7 @@ class DBImpl : public DB { DropPartitionByTag(const std::string& table_id, const std::string& partition_tag) override; Status - ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) override; + ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) override; Status InsertVectors(const std::string& table_id, const std::string& partition_tag, uint64_t n, const float* vectors, diff --git a/core/src/db/meta/Meta.h b/core/src/db/meta/Meta.h index 1929414fdc..da438a2546 100644 --- a/core/src/db/meta/Meta.h +++ b/core/src/db/meta/Meta.h @@ -100,7 +100,7 @@ class Meta { DropPartition(const std::string& partition_name) = 0; virtual Status - ShowPartitions(const std::string& table_name, std::vector& partiton_schema_array) = 0; + ShowPartitions(const std::string& table_name, std::vector& partition_schema_array) = 0; virtual Status GetPartitionName(const std::string& table_name, const std::string& tag, std::string& partition_name) = 0; diff --git a/core/src/db/meta/MySQLMetaImpl.cpp b/core/src/db/meta/MySQLMetaImpl.cpp index da91585b92..d4b5eee442 100644 --- a/core/src/db/meta/MySQLMetaImpl.cpp +++ b/core/src/db/meta/MySQLMetaImpl.cpp @@ -1212,7 +1212,7 @@ MySQLMetaImpl::DropPartition(const std::string& partition_name) { } Status -MySQLMetaImpl::ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) { +MySQLMetaImpl::ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) { try { server::MetricCollector metric; mysqlpp::StoreQueryResult res; @@ -1236,7 +1236,7 @@ MySQLMetaImpl::ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) override; + ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) override; Status GetPartitionName(const std::string& table_id, const std::string& tag, std::string& partition_name) override; diff --git a/core/src/db/meta/SqliteMetaImpl.cpp b/core/src/db/meta/SqliteMetaImpl.cpp index 9e323a4fac..cb6797ae47 100644 --- a/core/src/db/meta/SqliteMetaImpl.cpp +++ b/core/src/db/meta/SqliteMetaImpl.cpp @@ -804,7 +804,7 @@ SqliteMetaImpl::DropPartition(const std::string& partition_name) { } Status -SqliteMetaImpl::ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) { +SqliteMetaImpl::ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) { try { server::MetricCollector metric; @@ -816,7 +816,7 @@ SqliteMetaImpl::ShowPartitions(const std::string& table_id, std::vector& partiton_schema_array) override; + ShowPartitions(const std::string& table_id, std::vector& partition_schema_array) override; Status GetPartitionName(const std::string& table_id, const std::string& tag, std::string& partition_name) override; diff --git a/core/src/sdk/examples/partition/src/ClientTest.cpp b/core/src/sdk/examples/partition/src/ClientTest.cpp index ecbf0a80e7..7a4bd43cb0 100644 --- a/core/src/sdk/examples/partition/src/ClientTest.cpp +++ b/core/src/sdk/examples/partition/src/ClientTest.cpp @@ -141,18 +141,18 @@ ClientTest::Test(const std::string& address, const std::string& port) { { // search vectors std::cout << "Search in correct partition" << std::endl; - std::vector partiton_tags = {std::to_string(TARGET_PARTITION)}; + std::vector partition_tags = {std::to_string(TARGET_PARTITION)}; milvus::TopKQueryResult topk_query_result; - milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partiton_tags, TOP_K, NPROBE, search_record_array, + milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partition_tags, TOP_K, NPROBE, search_record_array, topk_query_result); std::cout << "Search in wrong partition" << std::endl; - partiton_tags = {"0"}; - milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partiton_tags, TOP_K, NPROBE, search_record_array, + partition_tags = {"0"}; + milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partition_tags, TOP_K, NPROBE, search_record_array, topk_query_result); std::cout << "Search by regex matched partition tag" << std::endl; - partiton_tags = {"\\d"}; - milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partiton_tags, TOP_K, NPROBE, search_record_array, + partition_tags = {"\\d"}; + milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partition_tags, TOP_K, NPROBE, search_record_array, topk_query_result); } @@ -191,9 +191,9 @@ ClientTest::Test(const std::string& address, const std::string& port) { { // search vectors std::cout << "Search in whole table" << std::endl; - std::vector partiton_tags; + std::vector partition_tags; milvus::TopKQueryResult topk_query_result; - milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partiton_tags, TOP_K, NPROBE, search_record_array, + milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partition_tags, TOP_K, NPROBE, search_record_array, topk_query_result); } diff --git a/core/src/sdk/examples/simple/src/ClientTest.cpp b/core/src/sdk/examples/simple/src/ClientTest.cpp index 016c9eceac..14bd059f93 100644 --- a/core/src/sdk/examples/simple/src/ClientTest.cpp +++ b/core/src/sdk/examples/simple/src/ClientTest.cpp @@ -143,9 +143,9 @@ ClientTest::Test(const std::string& address, const std::string& port) { milvus_sdk::Utils::Sleep(3); { // search vectors - std::vector partiton_tags; + std::vector partition_tags; milvus::TopKQueryResult topk_query_result; - milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partiton_tags, TOP_K, NPROBE, search_record_array, + milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partition_tags, TOP_K, NPROBE, search_record_array, topk_query_result); } @@ -169,9 +169,9 @@ ClientTest::Test(const std::string& address, const std::string& port) { } { // search vectors - std::vector partiton_tags; + std::vector partition_tags; milvus::TopKQueryResult topk_query_result; - milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partiton_tags, TOP_K, NPROBE, search_record_array, + milvus_sdk::Utils::DoSearch(conn, TABLE_NAME, partition_tags, TOP_K, NPROBE, search_record_array, topk_query_result); } diff --git a/core/src/sdk/examples/utils/Utils.cpp b/core/src/sdk/examples/utils/Utils.cpp index d3bf9eec25..b45ebbea37 100644 --- a/core/src/sdk/examples/utils/Utils.cpp +++ b/core/src/sdk/examples/utils/Utils.cpp @@ -202,7 +202,7 @@ Utils::CheckSearchResult(const std::vector void Utils::DoSearch(std::shared_ptr conn, const std::string& table_name, - const std::vector& partiton_tags, int64_t top_k, int64_t nprobe, + const std::vector& partition_tags, int64_t top_k, int64_t nprobe, const std::vector>& search_record_array, milvus::TopKQueryResult& topk_query_result) { topk_query_result.clear(); @@ -222,7 +222,7 @@ Utils::DoSearch(std::shared_ptr conn, const std::string& tab BLOCK_SPLITER milvus_sdk::TimeRecorder rc("search"); milvus::Status stat = - conn->Search(table_name, partiton_tags, record_array, query_range_array, top_k, nprobe, topk_query_result); + conn->Search(table_name, partition_tags, record_array, query_range_array, top_k, nprobe, topk_query_result); std::cout << "SearchVector function call status: " << stat.message() << std::endl; BLOCK_SPLITER } diff --git a/core/src/sdk/examples/utils/Utils.h b/core/src/sdk/examples/utils/Utils.h index 8066a24ff4..31880d3c41 100644 --- a/core/src/sdk/examples/utils/Utils.h +++ b/core/src/sdk/examples/utils/Utils.h @@ -69,7 +69,7 @@ class Utils { static void DoSearch(std::shared_ptr conn, const std::string& table_name, - const std::vector& partiton_tags, int64_t top_k, int64_t nprobe, + const std::vector& partition_tags, int64_t top_k, int64_t nprobe, const std::vector>& search_record_array, milvus::TopKQueryResult& topk_query_result); }; diff --git a/core/src/sdk/grpc/ClientProxy.cpp b/core/src/sdk/grpc/ClientProxy.cpp index fd19281343..c6a087cfe4 100644 --- a/core/src/sdk/grpc/ClientProxy.cpp +++ b/core/src/sdk/grpc/ClientProxy.cpp @@ -221,7 +221,7 @@ ClientProxy::Insert(const std::string& table_name, const std::string& partition_ } Status -ClientProxy::Search(const std::string& table_name, const std::vector& partiton_tags, +ClientProxy::Search(const std::string& table_name, const std::vector& partition_tags, const std::vector& query_record_array, const std::vector& query_range_array, int64_t topk, int64_t nprobe, TopKQueryResult& topk_query_result) { try { @@ -230,7 +230,7 @@ ClientProxy::Search(const std::string& table_name, const std::vector& id_array) override; Status - Search(const std::string& table_name, const std::vector& partiton_tags, + Search(const std::string& table_name, const std::vector& partition_tags, const std::vector& query_record_array, const std::vector& query_range_array, int64_t topk, int64_t nprobe, TopKQueryResult& topk_query_result) override; diff --git a/core/src/sdk/include/MilvusApi.h b/core/src/sdk/include/MilvusApi.h index 0937ce2f8e..e631be36be 100644 --- a/core/src/sdk/include/MilvusApi.h +++ b/core/src/sdk/include/MilvusApi.h @@ -273,7 +273,7 @@ class Connection { * @return Indicate if query is successful. */ virtual Status - Search(const std::string& table_name, const std::vector& partiton_tags, + Search(const std::string& table_name, const std::vector& partition_tags, const std::vector& query_record_array, const std::vector& query_range_array, int64_t topk, int64_t nprobe, TopKQueryResult& topk_query_result) = 0; diff --git a/core/src/sdk/interface/ConnectionImpl.cpp b/core/src/sdk/interface/ConnectionImpl.cpp index 448c011c1f..3b544c00c0 100644 --- a/core/src/sdk/interface/ConnectionImpl.cpp +++ b/core/src/sdk/interface/ConnectionImpl.cpp @@ -89,10 +89,10 @@ ConnectionImpl::Insert(const std::string& table_name, const std::string& partiti } Status -ConnectionImpl::Search(const std::string& table_name, const std::vector& partiton_tags, +ConnectionImpl::Search(const std::string& table_name, const std::vector& partition_tags, const std::vector& query_record_array, const std::vector& query_range_array, int64_t topk, int64_t nprobe, TopKQueryResult& topk_query_result) { - return client_proxy_->Search(table_name, partiton_tags, query_record_array, query_range_array, topk, nprobe, + return client_proxy_->Search(table_name, partition_tags, query_record_array, query_range_array, topk, nprobe, topk_query_result); } diff --git a/core/src/sdk/interface/ConnectionImpl.h b/core/src/sdk/interface/ConnectionImpl.h index 126e59c375..e22f8d33d8 100644 --- a/core/src/sdk/interface/ConnectionImpl.h +++ b/core/src/sdk/interface/ConnectionImpl.h @@ -60,7 +60,7 @@ class ConnectionImpl : public Connection { std::vector& id_array) override; Status - Search(const std::string& table_name, const std::vector& partiton_tags, + Search(const std::string& table_name, const std::vector& partition_tags, const std::vector& query_record_array, const std::vector& query_range_array, int64_t topk, int64_t nprobe, TopKQueryResult& topk_query_result) override; diff --git a/core/unittest/db/test_db.cpp b/core/unittest/db/test_db.cpp index 0a47ac1b9b..768687a8a3 100644 --- a/core/unittest/db/test_db.cpp +++ b/core/unittest/db/test_db.cpp @@ -536,12 +536,12 @@ TEST_F(DBTest, PARTITION_TEST) { stat = db_->CreatePartition(table_name, "", "0"); ASSERT_FALSE(stat.ok()); - std::vector partiton_schema_array; - stat = db_->ShowPartitions(table_name, partiton_schema_array); + std::vector partition_schema_array; + stat = db_->ShowPartitions(table_name, partition_schema_array); ASSERT_TRUE(stat.ok()); - ASSERT_EQ(partiton_schema_array.size(), PARTITION_COUNT); + ASSERT_EQ(partition_schema_array.size(), PARTITION_COUNT); for (int64_t i = 0; i < PARTITION_COUNT; i++) { - ASSERT_EQ(partiton_schema_array[i].table_id_, table_name + "_" + std::to_string(i)); + ASSERT_EQ(partition_schema_array[i].table_id_, table_name + "_" + std::to_string(i)); } { // build index diff --git a/core/unittest/db/test_db_mysql.cpp b/core/unittest/db/test_db_mysql.cpp index 93eea2fd27..094e824142 100644 --- a/core/unittest/db/test_db_mysql.cpp +++ b/core/unittest/db/test_db_mysql.cpp @@ -323,12 +323,12 @@ TEST_F(MySqlDBTest, PARTITION_TEST) { stat = db_->CreatePartition(table_name, "", "0"); ASSERT_FALSE(stat.ok()); - std::vector partiton_schema_array; - stat = db_->ShowPartitions(table_name, partiton_schema_array); + std::vector partition_schema_array; + stat = db_->ShowPartitions(table_name, partition_schema_array); ASSERT_TRUE(stat.ok()); - ASSERT_EQ(partiton_schema_array.size(), PARTITION_COUNT); + ASSERT_EQ(partition_schema_array.size(), PARTITION_COUNT); for (int64_t i = 0; i < PARTITION_COUNT; i++) { - ASSERT_EQ(partiton_schema_array[i].table_id_, table_name + "_" + std::to_string(i)); + ASSERT_EQ(partition_schema_array[i].table_id_, table_name + "_" + std::to_string(i)); } { // build index