From 29acf6a594888b7b2d695c66ac7677a88dbc24b0 Mon Sep 17 00:00:00 2001 From: anchun Date: Sat, 18 Apr 2020 21:59:26 +0800 Subject: [PATCH] update some variables in validation utils. (#1978) Signed-off-by: anchun --- core/src/utils/ValidationUtil.cpp | 20 ++++++++++---------- core/src/utils/ValidationUtil.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/utils/ValidationUtil.cpp b/core/src/utils/ValidationUtil.cpp index 521c86c4c..42bba87d0 100644 --- a/core/src/utils/ValidationUtil.cpp +++ b/core/src/utils/ValidationUtil.cpp @@ -186,7 +186,7 @@ ValidationUtil::ValidateCollectionIndexType(int32_t index_type) { Status ValidationUtil::ValidateIndexParams(const milvus::json& index_params, - const engine::meta::CollectionSchema& table_schema, int32_t index_type) { + const engine::meta::CollectionSchema& collection_schema, int32_t index_type) { switch (index_type) { case (int32_t)engine::EngineType::FAISS_IDMAP: case (int32_t)engine::EngineType::FAISS_BIN_IDMAP: { @@ -215,7 +215,7 @@ ValidationUtil::ValidateIndexParams(const milvus::json& index_params, // special check for 'm' parameter std::vector resset; - milvus::knowhere::IVFPQConfAdapter::GetValidMList(table_schema.dimension_, resset); + milvus::knowhere::IVFPQConfAdapter::GetValidMList(collection_schema.dimension_, resset); int64_t m_value = index_params[index_params, knowhere::IndexParams::m]; if (resset.empty()) { std::string msg = "Invalid collection dimension, unable to get reasonable values for 'm'"; @@ -283,8 +283,8 @@ ValidationUtil::ValidateIndexParams(const milvus::json& index_params, Status ValidationUtil::ValidateSearchParams(const milvus::json& search_params, - const engine::meta::CollectionSchema& table_schema, int64_t topk) { - switch (table_schema.engine_type_) { + const engine::meta::CollectionSchema& collection_schema, int64_t topk) { + switch (collection_schema.engine_type_) { case (int32_t)engine::EngineType::FAISS_IDMAP: case (int32_t)engine::EngineType::FAISS_BIN_IDMAP: { break; @@ -328,21 +328,21 @@ ValidationUtil::ValidateSearchParams(const milvus::json& search_params, Status ValidationUtil::ValidateVectorData(const engine::VectorsData& vectors, - const engine::meta::CollectionSchema& table_schema) { + const engine::meta::CollectionSchema& collection_schema) { uint64_t vector_count = vectors.vector_count_; if ((vectors.float_data_.empty() && vectors.binary_data_.empty()) || vector_count == 0) { return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector array is empty. Make sure you have entered vector records."); } - if (engine::utils::IsBinaryMetricType(table_schema.metric_type_)) { + if (engine::utils::IsBinaryMetricType(collection_schema.metric_type_)) { // check prepared binary data if (vectors.binary_data_.size() % vector_count != 0) { return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector dimension must be equal to the collection dimension."); } - if (vectors.binary_data_.size() * 8 / vector_count != table_schema.dimension_) { + if (vectors.binary_data_.size() * 8 / vector_count != collection_schema.dimension_) { return Status(SERVER_INVALID_VECTOR_DIMENSION, "The vector dimension must be equal to the collection dimension."); } @@ -353,7 +353,7 @@ ValidationUtil::ValidateVectorData(const engine::VectorsData& vectors, return Status(SERVER_INVALID_ROWRECORD_ARRAY, "The vector dimension must be equal to the collection dimension."); } - if (vectors.float_data_.size() / vector_count != table_schema.dimension_) { + if (vectors.float_data_.size() / vector_count != collection_schema.dimension_) { return Status(SERVER_INVALID_VECTOR_DIMENSION, "The vector dimension must be equal to the collection dimension."); } @@ -364,10 +364,10 @@ ValidationUtil::ValidateVectorData(const engine::VectorsData& vectors, Status ValidationUtil::ValidateVectorDataSize(const engine::VectorsData& vectors, - const engine::meta::CollectionSchema& table_schema) { + const engine::meta::CollectionSchema& collection_schema) { std::string msg = "The amount of data inserted each time cannot exceed " + std::to_string(MAX_INSERT_DATA_SIZE / M_BYTE) + " MB"; - if (engine::utils::IsBinaryMetricType(table_schema.metric_type_)) { + if (engine::utils::IsBinaryMetricType(collection_schema.metric_type_)) { if (vectors.binary_data_.size() > MAX_INSERT_DATA_SIZE) { return Status(SERVER_INVALID_ROWRECORD_ARRAY, msg); } diff --git a/core/src/utils/ValidationUtil.h b/core/src/utils/ValidationUtil.h index 825cec977..3c4a17dee 100644 --- a/core/src/utils/ValidationUtil.h +++ b/core/src/utils/ValidationUtil.h @@ -39,18 +39,18 @@ class ValidationUtil { ValidateCollectionIndexType(int32_t index_type); static Status - ValidateIndexParams(const milvus::json& index_params, const engine::meta::CollectionSchema& table_schema, + ValidateIndexParams(const milvus::json& index_params, const engine::meta::CollectionSchema& collection_schema, int32_t index_type); static Status - ValidateSearchParams(const milvus::json& search_params, const engine::meta::CollectionSchema& table_schema, + ValidateSearchParams(const milvus::json& search_params, const engine::meta::CollectionSchema& collection_schema, int64_t topk); static Status - ValidateVectorData(const engine::VectorsData& vectors, const engine::meta::CollectionSchema& table_schema); + ValidateVectorData(const engine::VectorsData& vectors, const engine::meta::CollectionSchema& collection_schema); static Status - ValidateVectorDataSize(const engine::VectorsData& vectors, const engine::meta::CollectionSchema& table_schema); + ValidateVectorDataSize(const engine::VectorsData& vectors, const engine::meta::CollectionSchema& collection_schema); static Status ValidateCollectionIndexFileSize(int64_t index_file_size); -- GitLab