Fix err msg of invalid expression (milvus-io#17296)

Signed-off-by: longjiquan <[email protected]>
sunby · Jun 1, 2022 · b4f7975 · b4f7975
1 parent 04011a7
commit b4f7975
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 2 deletions.
diff --git a/internal/parser/planparserv2/parser_visitor.go b/internal/parser/planparserv2/parser_visitor.go
@@ -396,7 +396,7 @@ func (v *ParserVisitor) VisitLike(ctx *parser.LikeContext) interface{} {
 	}
 
 	if !typeutil.IsStringType(leftExpr.dataType) {
-		return fmt.Errorf("like operation on non-text field is unsupported")
+		return fmt.Errorf("like operation on non-string field is unsupported")
 	}
 
 	column := toColumnInfo(leftExpr)

diff --git a/internal/parser/planparserv2/plan_parser_v2_test.go b/internal/parser/planparserv2/plan_parser_v2_test.go
@@ -384,11 +384,15 @@ func TestExpr_Invalid(t *testing.T) {
 		`1 == not_in_schema`,
 		`true == "str"`,
 		`"str" != false`,
+		`VarCharField != FloatField`,
+		`FloatField == VarCharField`,
 		// ---------------------- relational --------------------
 		`not_in_schema < 1`,
 		`1 <= not_in_schema`,
 		`true <= "str"`,
 		`"str" >= false`,
+		`VarCharField < FloatField`,
+		`FloatField > VarCharField`,
 		// ------------------------ like ------------------------
 		`(VarCharField % 2) like "prefix%"`,
 		`FloatField like "prefix%"`,

diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go
@@ -306,7 +306,17 @@ func handleCompare(op planpb.OpType, left *ExprWithType, right *ExprWithType) (*
 	}
 }
 
+func relationalCompatible(t1, t2 schemapb.DataType) bool {
+	both := typeutil.IsStringType(t1) && typeutil.IsStringType(t2)
+	neither := !typeutil.IsStringType(t1) && !typeutil.IsStringType(t2)
+	return both || neither
+}
+
 func HandleCompare(op int, left, right *ExprWithType) (*planpb.Expr, error) {
+	if !relationalCompatible(left.dataType, right.dataType) {
+		return nil, fmt.Errorf("comparisons between string and non-string are not supported")
+	}
+
 	cmpOp := cmpOpMap[op]
 	if valueExpr := left.expr.GetValueExpr(); valueExpr != nil {
 		op, err := reverseOrder(cmpOp)

diff --git a/internal/parser/planparserv2/utils_test.go b/internal/parser/planparserv2/utils_test.go
@@ -0,0 +1,59 @@
+package planparserv2
+
+import (
+	"testing"
+
+	"github.com/milvus-io/milvus/internal/proto/schemapb"
+)
+
+func Test_relationalCompatible(t *testing.T) {
+	type args struct {
+		t1 schemapb.DataType
+		t2 schemapb.DataType
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			// both.
+			args: args{
+				t1: schemapb.DataType_VarChar,
+				t2: schemapb.DataType_VarChar,
+			},
+			want: true,
+		},
+		{
+			// neither.
+			args: args{
+				t1: schemapb.DataType_Float,
+				t2: schemapb.DataType_Float,
+			},
+			want: true,
+		},
+		{
+			// in-compatible.
+			args: args{
+				t1: schemapb.DataType_Float,
+				t2: schemapb.DataType_VarChar,
+			},
+			want: false,
+		},
+		{
+			// in-compatible.
+			args: args{
+				t1: schemapb.DataType_VarChar,
+				t2: schemapb.DataType_Float,
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := relationalCompatible(tt.args.t1, tt.args.t2); got != tt.want {
+				t.Errorf("relationalCompatible() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/tests/python_client/testcases/test_query.py b/tests/python_client/testcases/test_query.py
@@ -1302,5 +1302,5 @@ def test_query_string_with_invaild_prefix_expr(self):
         collection_w = self.init_collection_general(prefix, insert_data=True)[0]
         expression = 'float like "0%"'
         collection_w.query(expression, check_task=CheckTasks.err_res,
-                           check_items={ct.err_code: 1, ct.err_msg: "like operation on non-text field is unsupported"}
+                           check_items={ct.err_code: 1, ct.err_msg: "like operation on non-string field is unsupported"}
                            )