milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename CreateQueryExprPlan to CreateExprPlan (#8438) 

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
pull/8450/head
Cai Yudong 2021-09-24 10:27:54 +08:00 committed by GitHub
parent 74d5bb3eef
commit ee3eaa2966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/proxy/plan_parser.go
View File

@ -23,14 +23,6 @@ import (
"github.com/milvus-io/milvus/internal/util/typeutil" "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 { type ParserContext struct {
schema *typeutil.SchemaHelper 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) ast, err := ant_parser.Parse(exprStr)
if err != nil { if err != nil {
return nil, err return nil, err
@ -181,7 +176,6 @@ func parseQueryExprAdvanced(schema *typeutil.SchemaHelper, exprStr string) (*pla
} }
context := ParserContext{schema} context := ParserContext{schema}
expr, err := context.handleExpr(&ast.Node) expr, err := context.handleExpr(&ast.Node)
if err != nil { if err != nil {
return nil, err return nil, err
@ -199,8 +193,8 @@ func (context *ParserContext) createColumnInfo(field *schemapb.FieldSchema) *pla
} }
func isSameOrder(opStr1, opStr2 string) bool { func isSameOrder(opStr1, opStr2 string) bool {
isLess1 := opStr1 == "<" || opStr1 == "<=" isLess1 := (opStr1 == "<") || (opStr1 == "<=")
isLess2 := opStr2 == "<" || opStr2 == "<=" isLess2 := (opStr2 == "<") || (opStr2 == "<=")
return isLess1 == isLess2 return isLess1 == isLess2
} }
@ -643,7 +637,7 @@ func CreateQueryPlan(schemaPb *schemapb.CollectionSchema, exprStr string, vector
return nil, err return nil, err
} }
expr, err := parseQueryExpr(schema, exprStr) expr, err := parseExpr(schema, exprStr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -672,13 +666,13 @@ func CreateQueryPlan(schemaPb *schemapb.CollectionSchema, exprStr string, vector
return planNode, nil 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) schema, err := typeutil.CreateSchemaHelper(schemaPb)
if err != nil { if err != nil {
return nil, err return nil, err
} }
expr, err := parseQueryExpr(schema, exprStr) expr, err := parseExpr(schema, exprStr)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
internal/proxy/plan_parser_test.go
View File

@ -55,7 +55,7 @@ func TestParseQueryExpr_Naive(t *testing.T) {
schemaPb := newTestSchema() schemaPb := newTestSchema()
schema, err := typeutil.CreateSchemaHelper(schemaPb) schema, err := typeutil.CreateSchemaHelper(schemaPb)
assert.Nil(t, err) assert.Nil(t, err)
exprProto, err := parseQueryExpr(schema, exprStr) exprProto, err := parseExpr(schema, exprStr)
assert.Nil(t, err) assert.Nil(t, err)
str := proto.MarshalTextString(exprProto) str := proto.MarshalTextString(exprProto)
println(str) println(str)

2
internal/proxy/task.go
View File

@ -2226,7 +2226,7 @@ func (qt *queryTask) PreExecute(ctx context.Context) error {
return fmt.Errorf(errMsg) return fmt.Errorf(errMsg)
} }
plan, err := CreateExprQueryPlan(schema, qt.query.Expr) plan, err := CreateExprPlan(schema, qt.query.Expr)
if err != nil { if err != nil {
return err return err
} }