Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/core/src/exec/expression/JsonContainsExpr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ PhyJsonContainsFilterExpr::Eval(EvalCtx& context, VectorPtr& result) {

VectorPtr
PhyJsonContainsFilterExpr::EvalJsonContainsForDataSegment(EvalCtx& context) {
if (expr_->vals_.empty() || expr_->vals_[0].val_case() == proto::plan::GenericValue::VAL_NOT_SET) {
throw milvus::SegcoreError(DataTypeInvalid, "Empty values are not allowed in JsonContains expression.");
}

auto data_type = expr_->column_.data_type_;
switch (expr_->op_) {
case proto::plan::JSONContainsExpr_JSONOp_Contains:
Expand Down
46 changes: 46 additions & 0 deletions internal/core/unittest/test_array_expr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,52 @@ TEST(Expr, TestArrayContains) {
}
}

TEST(Expr, TestArrayContainsEmptyValuesPanic) {
auto schema = std::make_shared<Schema>();
auto int_array_fid =
schema->AddDebugField("int_array", DataType::ARRAY, DataType::INT8);
auto long_array_fid =
schema->AddDebugField("long_array", DataType::ARRAY, DataType::INT64);
auto bool_array_fid =
schema->AddDebugField("bool_array", DataType::ARRAY, DataType::BOOL);
auto float_array_fid =
schema->AddDebugField("float_array", DataType::ARRAY, DataType::FLOAT);
auto double_array_fid =
schema->AddDebugField("double_array", DataType::ARRAY, DataType::DOUBLE);
auto string_array_fid =
schema->AddDebugField("string_array", DataType::ARRAY, DataType::VARCHAR);
schema->set_primary_field_id(schema->AddDebugField("id", DataType::INT64));

std::vector<FieldId> fields = {
int_array_fid,
long_array_fid,
bool_array_fid,
float_array_fid,
double_array_fid,
string_array_fid,
};

std::vector<proto::plan::GenericValue> empty_values;

for (auto field_id : fields) {
auto expr = std::make_shared<milvus::expr::JsonContainsExpr>(
expr::ColumnInfo(field_id, DataType::ARRAY),
proto::plan::JSONContainsExpr_JSONOp_Contains,
true,
empty_values);

auto dummy_seg = CreateGrowingSegment(schema, empty_index_meta);
auto seg_promote = dynamic_cast<SegmentGrowingImpl*>(dummy_seg.get());
auto plan = std::make_shared<plan::FilterBitsNode>(DEFAULT_PLANNODE_ID, expr);
EXPECT_THROW(
{
ExecuteQueryExpr(plan, seg_promote, 0, MAX_TIMESTAMP);
},
milvus::SegcoreError
);
}
}

TEST(Expr, TestArrayBinaryArith) {
auto schema = std::make_shared<Schema>();
auto i64_fid = schema->AddDebugField("id", DataType::INT64);
Expand Down
Loading