Refine error message for contains

Signed-off-by: Cai Zhang <[email protected]>
milvus-io · Nov 2, 2024 · 02e5cce · 02e5cce
1 parent b792b19
commit 02e5cce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/internal/parser/planparserv2/plan_parser_v2_test.go b/internal/parser/planparserv2/plan_parser_v2_test.go
@@ -976,7 +976,6 @@ func Test_JSONContains(t *testing.T) {
 		`JSON_contains(JSONField, 5)`,
 		`json_contains(A, [1,2,3])`,
 		`array_contains(A, [1,2,3])`,
-		`array_contains(ArrayField, [1,2,3])`,
 		`array_contains(ArrayField, 1)`,
 		`json_contains(JSONField, 5)`,
 		`json_contains($meta, 1)`,
@@ -1009,6 +1008,8 @@ func Test_InvalidJSONContains(t *testing.T) {
 		`json_contains(A, StringField > 5)`,
 		`json_contains(A)`,
 		`json_contains(A, 5, C)`,
+		`json_contains(ArrayField, "abc")`,
+		`json_contains(ArrayField, [1,2])`,
 	}
 	for _, expr = range exprs {
 		_, err = CreateSearchPlan(schema, expr, "FloatVectorField", &planpb.QueryInfo{
@@ -1114,7 +1115,7 @@ func Test_JSONContainsAll(t *testing.T) {
 		`JSON_CONTAINS_ALL(A, [1,"2",3.0])`,
 		`array_contains_all(ArrayField, [1,2,3])`,
 		`array_contains_all(ArrayField, [1])`,
-		`json_contains_all(ArrayField, [1,2,3])`,
+		`array_contains_all(ArrayField, [1,2,3])`,
 	}
 	for _, expr = range exprs {
 		plan, err = CreateSearchPlan(schema, expr, "FloatVectorField", &planpb.QueryInfo{
@@ -1159,8 +1160,6 @@ func Test_JSONContainsAny(t *testing.T) {
 		`json_contains_any(A, [1,"2",3.0])`,
 		`JSON_CONTAINS_ANY(A, [1,"2",3.0])`,
 		`JSON_CONTAINS_ANY(ArrayField, [1,2,3])`,
-		`JSON_CONTAINS_ANY(ArrayField, [3,4,5])`,
-		`JSON_CONTAINS_ANY(ArrayField, [1,2,3])`,
 	}
 	for _, expr = range exprs {
 		plan, err = CreateSearchPlan(schema, expr, "FloatVectorField", &planpb.QueryInfo{

diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go
@@ -653,7 +653,11 @@ func checkContainsElement(columnExpr *ExprWithType, op planpb.JSONContainsExpr_J
 	if typeutil.IsArrayType(columnExpr.expr.GetColumnExpr().GetInfo().GetDataType()) {
 		var elements []*planpb.GenericValue
 		if op == planpb.JSONContainsExpr_Contains {
-			elements = []*planpb.GenericValue{elementValue}
+			castedValue, err := castValue(columnExpr.expr.GetColumnExpr().GetInfo().GetElementType(), elementValue)
+			if err != nil {
+				return err
+			}
+			elements = []*planpb.GenericValue{castedValue}
 		} else {
 			elements = elementValue.GetArrayVal().GetArray()
 		}