From 2a7e116a670fff7c3e6e35bd0394b240b5824b3b Mon Sep 17 00:00:00 2001 From: AzAz Date: Mon, 27 Apr 2020 16:15:49 +0800 Subject: [PATCH] remove uint64_t j from parameters (#2147) Signed-off-by: talentAN --- core/src/db/engine/ExecutionEngineImpl.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/core/src/db/engine/ExecutionEngineImpl.cpp b/core/src/db/engine/ExecutionEngineImpl.cpp index d7cab77359..0fcd9e2fde 100644 --- a/core/src/db/engine/ExecutionEngineImpl.cpp +++ b/core/src/db/engine/ExecutionEngineImpl.cpp @@ -717,8 +717,7 @@ MapAndCopyResult(const knowhere::DatasetPtr& dataset, const std::vector void -ProcessRangeQuery(std::vector data, T value, query::CompareOperator type, uint64_t j, - faiss::ConcurrentBitsetPtr& bitset) { +ProcessRangeQuery(std::vector data, T value, query::CompareOperator type, faiss::ConcurrentBitsetPtr& bitset) { switch (type) { case query::CompareOperator::LT: { for (uint64_t i = 0; i < data.size(); ++i) { @@ -989,7 +988,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer data.resize(size / sizeof(int8_t)); memcpy(data.data(), attr_data_.at(field_name).data(), size); int8_t value = atoi(operand.c_str()); - ProcessRangeQuery(data, value, com_expr[j].compare_operator, j, bitset); + ProcessRangeQuery(data, value, com_expr[j].compare_operator, bitset); break; } case DataType::INT16: { @@ -997,7 +996,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer data.resize(size / sizeof(int16_t)); memcpy(data.data(), attr_data_.at(field_name).data(), size); int16_t value = atoi(operand.c_str()); - ProcessRangeQuery(data, value, com_expr[j].compare_operator, j, bitset); + ProcessRangeQuery(data, value, com_expr[j].compare_operator, bitset); break; } case DataType::INT32: { @@ -1005,7 +1004,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer data.resize(size / sizeof(int32_t)); memcpy(data.data(), attr_data_.at(field_name).data(), size); int32_t value = atoi(operand.c_str()); - ProcessRangeQuery(data, value, com_expr[j].compare_operator, j, bitset); + ProcessRangeQuery(data, value, com_expr[j].compare_operator, bitset); break; } case DataType::INT64: { @@ -1013,7 +1012,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer data.resize(size / sizeof(int64_t)); memcpy(data.data(), attr_data_.at(field_name).data(), size); int64_t value = atoi(operand.c_str()); - ProcessRangeQuery(data, value, com_expr[j].compare_operator, j, bitset); + ProcessRangeQuery(data, value, com_expr[j].compare_operator, bitset); break; } case DataType::FLOAT: { @@ -1023,7 +1022,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer std::istringstream iss(operand); double value; iss >> value; - ProcessRangeQuery(data, value, com_expr[j].compare_operator, j, bitset); + ProcessRangeQuery(data, value, com_expr[j].compare_operator, bitset); break; } case DataType::DOUBLE: { @@ -1033,7 +1032,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer std::istringstream iss(operand); double value; iss >> value; - ProcessRangeQuery(data, value, com_expr[j].compare_operator, j, bitset); + ProcessRangeQuery(data, value, com_expr[j].compare_operator, bitset); break; } }