From ee3eaa2966cab0a2e75d1aa77baac521553a5588 Mon Sep 17 00:00:00 2001
From: Cai Yudong <yudong.cai@zilliz.com>
Date: Fri, 24 Sep 2021 10:27:54 +0800
Subject: [PATCH] Rename CreateQueryExprPlan to CreateExprPlan (#8438)

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
---
 internal/proxy/plan_parser.go      | 24 +++++++++---------------
 internal/proxy/plan_parser_test.go |  2 +-
 internal/proxy/task.go             |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/internal/proxy/plan_parser.go b/internal/proxy/plan_parser.go
index 68a91db1bc..a65408fb7b 100644
--- a/internal/proxy/plan_parser.go
+++ b/internal/proxy/plan_parser.go
@@ -23,14 +23,6 @@ import (
 	"github.com/milvus-io/milvus/internal/util/typeutil"
 )
 
-func parseQueryExpr(schema *typeutil.SchemaHelper, exprStr string) (*planpb.Expr, error) {
-	if exprStr == "" {
-		return nil, nil
-	}
-
-	return parseQueryExprAdvanced(schema, exprStr)
-}
-
 type ParserContext struct {
 	schema *typeutil.SchemaHelper
 }
@@ -168,7 +160,10 @@ func (optimizer *optimizer) Exit(node *ant_ast.Node) {
 	}
 }
 
-func parseQueryExprAdvanced(schema *typeutil.SchemaHelper, exprStr string) (*planpb.Expr, error) {
+func parseExpr(schema *typeutil.SchemaHelper, exprStr string) (*planpb.Expr, error) {
+	if exprStr == "" {
+		return nil, nil
+	}
 	ast, err := ant_parser.Parse(exprStr)
 	if err != nil {
 		return nil, err
@@ -181,7 +176,6 @@ func parseQueryExprAdvanced(schema *typeutil.SchemaHelper, exprStr string) (*pla
 	}
 
 	context := ParserContext{schema}
-
 	expr, err := context.handleExpr(&ast.Node)
 	if err != nil {
 		return nil, err
@@ -199,8 +193,8 @@ func (context *ParserContext) createColumnInfo(field *schemapb.FieldSchema) *pla
 }
 
 func isSameOrder(opStr1, opStr2 string) bool {
-	isLess1 := opStr1 == "<" || opStr1 == "<="
-	isLess2 := opStr2 == "<" || opStr2 == "<="
+	isLess1 := (opStr1 == "<") || (opStr1 == "<=")
+	isLess2 := (opStr2 == "<") || (opStr2 == "<=")
 	return isLess1 == isLess2
 }
 
@@ -643,7 +637,7 @@ func CreateQueryPlan(schemaPb *schemapb.CollectionSchema, exprStr string, vector
 		return nil, err
 	}
 
-	expr, err := parseQueryExpr(schema, exprStr)
+	expr, err := parseExpr(schema, exprStr)
 	if err != nil {
 		return nil, err
 	}
@@ -672,13 +666,13 @@ func CreateQueryPlan(schemaPb *schemapb.CollectionSchema, exprStr string, vector
 	return planNode, nil
 }
 
-func CreateExprQueryPlan(schemaPb *schemapb.CollectionSchema, exprStr string) (*planpb.PlanNode, error) {
+func CreateExprPlan(schemaPb *schemapb.CollectionSchema, exprStr string) (*planpb.PlanNode, error) {
 	schema, err := typeutil.CreateSchemaHelper(schemaPb)
 	if err != nil {
 		return nil, err
 	}
 
-	expr, err := parseQueryExpr(schema, exprStr)
+	expr, err := parseExpr(schema, exprStr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/proxy/plan_parser_test.go b/internal/proxy/plan_parser_test.go
index ed2bc26f2a..406f3ef82b 100644
--- a/internal/proxy/plan_parser_test.go
+++ b/internal/proxy/plan_parser_test.go
@@ -55,7 +55,7 @@ func TestParseQueryExpr_Naive(t *testing.T) {
 	schemaPb := newTestSchema()
 	schema, err := typeutil.CreateSchemaHelper(schemaPb)
 	assert.Nil(t, err)
-	exprProto, err := parseQueryExpr(schema, exprStr)
+	exprProto, err := parseExpr(schema, exprStr)
 	assert.Nil(t, err)
 	str := proto.MarshalTextString(exprProto)
 	println(str)
diff --git a/internal/proxy/task.go b/internal/proxy/task.go
index 90b1e26d5b..fe2c8df79a 100644
--- a/internal/proxy/task.go
+++ b/internal/proxy/task.go
@@ -2226,7 +2226,7 @@ func (qt *queryTask) PreExecute(ctx context.Context) error {
 		return fmt.Errorf(errMsg)
 	}
 
-	plan, err := CreateExprQueryPlan(schema, qt.query.Expr)
+	plan, err := CreateExprPlan(schema, qt.query.Expr)
 	if err != nil {
 		return err
 	}