admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Check cast type is array for json contains expr (#42184)

Browse Source 
issue: https://github.com/milvus-io/milvus/issues/42181

Signed-off-by: sunby <sunbingyi1992@gmail.com>
This commit is contained in:
Bingyi Sun 2025-06-09 17:04:33 +08:00 committed by GitHub
parent 7202381e3f
commit 6404e02d99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/core/src/exec/expression/Expr.h
View File

@ -139,8 +139,8 @@ class SegmentExpr : public Expr {
int64_t active_count,
int64_t batch_size,
int32_t consistency_level,
bool allow_any_json_cast_type = false)
bool allow_any_json_cast_type = false,
bool is_json_contains = false)
: Expr(DataType::BOOL, std::move(input), name),
segment_(const_cast<segcore::SegmentInternalInterface*>(segment)),
field_id_(field_id),
@ -149,7 +149,8 @@ class SegmentExpr : public Expr {
allow_any_json_cast_type_(allow_any_json_cast_type),
active_count_(active_count),
batch_size_(batch_size),
consistency_level_(consistency_level) {
consistency_level_(consistency_level),
is_json_contains_(is_json_contains) {
size_per_chunk_ = segment_->size_per_chunk();
AssertInfo(
batch_size_ > 0,
@ -173,11 +174,11 @@ class SegmentExpr : public Expr {
if (field_meta.get_data_type() == DataType::JSON) {
auto pointer = milvus::Json::pointer(nested_path_);
if (is_index_mode_ =
segment_->HasIndex(field_id_,
pointer,
value_type_,
allow_any_json_cast_type_)) {
if (is_index_mode_ = segment_->HasIndex(field_id_,
pointer,
value_type_,
allow_any_json_cast_type_,
is_json_contains_)) {
num_index_chunk_ = 1;
}
} else {
@ -1254,6 +1255,7 @@ class SegmentExpr : public Expr {
DataType field_type_;
DataType value_type_;
bool allow_any_json_cast_type_{false};
bool is_json_contains_{false};
bool is_index_mode_{false};
bool is_data_mode_{false};
// sometimes need to skip index and using raw data

4
internal/core/src/exec/expression/JsonContainsExpr.h
View File

@ -48,7 +48,9 @@ class PhyJsonContainsFilterExpr : public SegmentExpr {
: FromValCase(expr->vals_[0].val_case()),
active_count,
batch_size,
consistency_level),
consistency_level,
false,
true),
expr_(expr) {
}

2
internal/core/src/index/Index.h
View File

@ -75,7 +75,7 @@ class IndexBase {
}
virtual bool
IsDataTypeSupported(DataType data_type) const {
IsDataTypeSupported(DataType data_type, bool is_array) const {
return true;
};

10
internal/core/src/index/JsonInvertedIndex.cpp
View File

@ -175,10 +175,14 @@ JsonInvertedIndex<T>::build_index_for_json(
template <typename T>
bool
JsonInvertedIndex<T>::IsDataTypeSupported(DataType data_type) const {
JsonInvertedIndex<T>::IsDataTypeSupported(DataType data_type,
bool is_array) const {
bool cast_type_is_array =
cast_type_.data_type() == JsonCastType::DataType::ARRAY;
auto type = cast_type_.ToMilvusDataType();
return type == data_type ||
(data_type == DataType::INT64 && type == DataType::DOUBLE);
return is_array == cast_type_is_array &&
(type == data_type ||
(data_type == DataType::INT64 && type == DataType::DOUBLE));
}
template class JsonInvertedIndex<bool>;

2
internal/core/src/index/JsonInvertedIndex.h
View File

@ -116,7 +116,7 @@ class JsonInvertedIndex : public index::InvertedIndexTantivy<T> {
}
bool
IsDataTypeSupported(DataType data_type) const override;
IsDataTypeSupported(DataType data_type, bool is_array) const override;
JsonInvertedIndexParseErrorRecorder&
GetErrorRecorder() {

3
internal/core/src/segcore/SegmentGrowingImpl.h
View File

@ -335,7 +335,8 @@ class SegmentGrowingImpl : public SegmentGrowing {
HasIndex(FieldId field_id,
const std::string& nested_path,
DataType data_type,
bool any_type = false) const override {
bool any_type = false,
bool is_array = false) const override {
return false;
};

3
internal/core/src/segcore/SegmentInterface.h
View File

@ -301,7 +301,8 @@ class SegmentInternalInterface : public SegmentInterface {
HasIndex(FieldId field_id,
const std::string& nested_path,
DataType data_type,
bool any_type = false) const = 0;
bool any_type = false,
bool is_array = false) const = 0;
virtual bool
HasFieldData(FieldId field_id) const = 0;

5
internal/core/src/segcore/SegmentSealed.h
View File

@ -92,7 +92,8 @@ class SegmentSealed : public SegmentInternalInterface {
HasIndex(FieldId field_id,
const std::string& path,
DataType data_type,
bool any_type = false) const override {
bool any_type = false,
bool is_json_contain = false) const override {
JSONIndexKey key;
key.field_id = field_id;
key.nested_path = path;
@ -103,7 +104,7 @@ class SegmentSealed : public SegmentInternalInterface {
if (any_type) {
return true;
}
return index->second->IsDataTypeSupported(data_type);
return index->second->IsDataTypeSupported(data_type, is_json_contain);
}
protected:

2
internal/util/indexparamcheck/inverted_checker.go
View File

@ -16,7 +16,7 @@ type INVERTEDChecker struct {
scalarIndexChecker
}
var validJSONCastTypes = []string{"BOOL", "DOUBLE", "VARCHAR"}
var validJSONCastTypes = []string{"BOOL", "DOUBLE", "VARCHAR", "ARRAY_BOOL", "ARRAY_DOUBLE", "ARRAY_VARCHAR"}
var validJSONCastFunctions = []string{"STRING_TO_DOUBLE"}