Skip to content

milvus
milvus

BaiXuePrincess / milvus
与 Fork 源项目一致

Fork自 milvus / milvus

通知 7
Star 4
Fork 0
milvus
milvus

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 2a7e116a 编写于 作者: A AzAz 提交者： GitHub
浏览文件
操作

remove uint64_t j from parameters (#2147) 

Signed-off-by: NtalentAN <adam_an02@163.com>
上级 b3028bae
隐藏空白更改
内联 并排
Showing with 7 addition and 8 deletion
core/src/db/engine/ExecutionEngineImpl.cpp
浏览文件 @ 2a7e116a
...@@ -717,8 +717,7 @@ MapAndCopyResult(const knowhere::DatasetPtr& dataset, const std::vector<milvus:: ...@@ -717,8 +717,7 @@ MapAndCopyResult(const knowhere::DatasetPtr& dataset, const std::vector<milvus::
template <typename T> template <typename T>
void void
ProcessRangeQuery(std::vector<T> data, T value, query::CompareOperator type, uint64_t j, ProcessRangeQuery(std::vector<T> data, T value, query::CompareOperator type, faiss::ConcurrentBitsetPtr& bitset) {
faiss::ConcurrentBitsetPtr& bitset) {
switch (type) { switch (type) {
case query::CompareOperator::LT: { case query::CompareOperator::LT: {
for (uint64_t i = 0; i < data.size(); ++i) { for (uint64_t i = 0; i < data.size(); ++i) {
...@@ -989,7 +988,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer ...@@ -989,7 +988,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer
data.resize(size / sizeof(int8_t)); data.resize(size / sizeof(int8_t));
memcpy(data.data(), attr_data_.at(field_name).data(), size); memcpy(data.data(), attr_data_.at(field_name).data(), size);
int8_t value = atoi(operand.c_str()); int8_t value = atoi(operand.c_str());
ProcessRangeQuery<int8_t>(data, value, com_expr[j].compare_operator, j, bitset); ProcessRangeQuery<int8_t>(data, value, com_expr[j].compare_operator, bitset);
break; break;
} }
case DataType::INT16: { case DataType::INT16: {
...@@ -997,7 +996,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer ...@@ -997,7 +996,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer
data.resize(size / sizeof(int16_t)); data.resize(size / sizeof(int16_t));
memcpy(data.data(), attr_data_.at(field_name).data(), size); memcpy(data.data(), attr_data_.at(field_name).data(), size);
int16_t value = atoi(operand.c_str()); int16_t value = atoi(operand.c_str());
ProcessRangeQuery<int16_t>(data, value, com_expr[j].compare_operator, j, bitset); ProcessRangeQuery<int16_t>(data, value, com_expr[j].compare_operator, bitset);
break; break;
} }
case DataType::INT32: { case DataType::INT32: {
...@@ -1005,7 +1004,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer ...@@ -1005,7 +1004,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer
data.resize(size / sizeof(int32_t)); data.resize(size / sizeof(int32_t));
memcpy(data.data(), attr_data_.at(field_name).data(), size); memcpy(data.data(), attr_data_.at(field_name).data(), size);
int32_t value = atoi(operand.c_str()); int32_t value = atoi(operand.c_str());
ProcessRangeQuery<int32_t>(data, value, com_expr[j].compare_operator, j, bitset); ProcessRangeQuery<int32_t>(data, value, com_expr[j].compare_operator, bitset);
break; break;
} }
case DataType::INT64: { case DataType::INT64: {
...@@ -1013,7 +1012,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer ...@@ -1013,7 +1012,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer
data.resize(size / sizeof(int64_t)); data.resize(size / sizeof(int64_t));
memcpy(data.data(), attr_data_.at(field_name).data(), size); memcpy(data.data(), attr_data_.at(field_name).data(), size);
int64_t value = atoi(operand.c_str()); int64_t value = atoi(operand.c_str());
ProcessRangeQuery<int64_t>(data, value, com_expr[j].compare_operator, j, bitset); ProcessRangeQuery<int64_t>(data, value, com_expr[j].compare_operator, bitset);
break; break;
} }
case DataType::FLOAT: { case DataType::FLOAT: {
...@@ -1023,7 +1022,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer ...@@ -1023,7 +1022,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer
std::istringstream iss(operand); std::istringstream iss(operand);
double value; double value;
iss >> value; iss >> value;
ProcessRangeQuery<float>(data, value, com_expr[j].compare_operator, j, bitset); ProcessRangeQuery<float>(data, value, com_expr[j].compare_operator, bitset);
break; break;
} }
case DataType::DOUBLE: { case DataType::DOUBLE: {
...@@ -1033,7 +1032,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer ...@@ -1033,7 +1032,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer
std::istringstream iss(operand); std::istringstream iss(operand);
double value; double value;
iss >> value; iss >> value;
ProcessRangeQuery<double>(data, value, com_expr[j].compare_operator, j, bitset); ProcessRangeQuery<double>(data, value, com_expr[j].compare_operator, bitset);
break; break;
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或