milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1827 Combine request target vectors exceed max nq (#1847) 

Signed-off-by: groot <yihua.mo@zilliz.com>
pull/1833/head
groot 2020-04-02 14:24:28 +08:00 committed by GitHub
parent 3e03850169
commit f66b43b81b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/server/delivery/request/SearchCombineRequest.cpp
View File

@ -151,6 +151,15 @@ SearchCombineRequest::CanCombine(const SearchRequestPtr& request) {
return false;
}
// sum of nq must less-equal than MAX_NQ
if (vectors_data_.vector_count_ > MAX_NQ || request->VectorsData().vector_count_ > MAX_NQ) {
return false;
}
uint64_t total_nq = vectors_data_.vector_count_ + request->VectorsData().vector_count_;
if (total_nq > MAX_NQ) {
return false;
}
// partition list must be equal for each one
std::set<std::string> partition_list;
GetUniqueList(request->PartitionList(), partition_list);

2
core/src/server/delivery/request/SearchRequest.h
View File

@ -82,7 +82,7 @@ class SearchRequest : public BaseRequest {
private:
const std::string collection_name_;
const engine::VectorsData& vectors_data_;
const engine::VectorsData vectors_data_;
int64_t topk_;
milvus::json extra_params_;
const std::vector<std::string> partition_list_;

4
core/src/utils/ValidationUtil.cpp
View File

@ -325,12 +325,12 @@ ValidationUtil::ValidateSearchParams(const milvus::json& search_params,
Status
ValidationUtil::ValidateVectorData(const engine::VectorsData& vectors,
const engine::meta::CollectionSchema& table_schema) {
if (vectors.float_data_.empty() && vectors.binary_data_.empty()) {
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.");
}
uint64_t vector_count = vectors.vector_count_;
if (engine::utils::IsBinaryMetricType(table_schema.metric_type_)) {
// check prepared binary data
if (vectors.binary_data_.size() % vector_count != 0) {