rename 'implicitParameters' to 'implicitArgs'

Signed-off-by: Lonng <heng@lonng.org>

Author: lonng

expression/builtin.go

@@ -41,10 +41,10 @@ func (b *baseBuiltinFunc) PbCode() tipb.ScalarFuncSig {
 	return b.pbCode
 }
 
-// implicitParameters returns the implicit parameters of this function.
-// implicit parameters means some functions contain extra inner fields which will not
+// implicitArgs returns the implicit arguments of this function.
+// implicit arguments means some functions contain extra inner fields which will not
 // contain in `tipb.Expr.children` but must be pushed down to coprocessor
-func (b *baseBuiltinFunc) implicitParameters() []types.Datum {
+func (b *baseBuiltinFunc) implicitArgs() []types.Datum {
 	// We will not use a field to store them because of only
 	// a few functions contain implicit parameters
 	return nil
@@ -253,15 +253,15 @@ type baseBuiltinCastFunc struct {
 	inUnion bool
 }
 
-// implicitParameters returns the implicit parameters of cast functions
-func (b *baseBuiltinCastFunc) implicitParameters() []types.Datum {
-	params := b.baseBuiltinFunc.implicitParameters()
+// implicitArgs returns the implicit arguments of cast functions
+func (b *baseBuiltinCastFunc) implicitArgs() []types.Datum {
+	args := b.baseBuiltinFunc.implicitArgs()
 	if b.inUnion {
-		params = append(params, types.NewIntDatum(1))
+		args = append(args, types.NewIntDatum(1))
 	} else {
-		params = append(params, types.NewIntDatum(0))
+		args = append(args, types.NewIntDatum(0))
 	}
-	return params
+	return args
 }
 
 func (b *baseBuiltinCastFunc) cloneFrom(from *baseBuiltinCastFunc) {
@@ -304,10 +304,10 @@ type builtinFunc interface {
 	setPbCode(tipb.ScalarFuncSig)
 	// PbCode returns PbCode of this signature.
 	PbCode() tipb.ScalarFuncSig
-	// implicitParameters returns the implicit parameters of a function.
-	// implicit parameters means some functions contain extra inner fields which will not
+	// implicitArgs returns the implicit parameters of a function.
+	// implicit arguments means some functions contain extra inner fields which will not
 	// contain in `tipb.Expr.children` but must be pushed down to coprocessor
-	implicitParameters() []types.Datum
+	implicitArgs() []types.Datum
 	// Clone returns a copy of itself.
 	Clone() builtinFunc
 }

expression/expr_to_pb.go

@@ -243,20 +243,20 @@ func (pc PbConverter) scalarFuncToPBExpr(expr *ScalarFunction) *tipb.Expr {
 		children = append(children, pbArg)
 	}
 
-	var implicitParameters []byte
-	if params := expr.Function.implicitParameters(); len(params) > 0 {
-		encoded, err := codec.EncodeValue(pc.sc, nil, params...)
+	var implicitArgs []byte
+	if args := expr.Function.implicitArgs(); len(args) > 0 {
+		encoded, err := codec.EncodeValue(pc.sc, nil, args...)
 		if err != nil {
 			logutil.Logger(context.Background()).Error("encode implicit parameters", zap.Any("datums", params), zap.Error(err))
 			return nil
 		}
-		implicitParameters = encoded
+		implicitArgs = encoded
 	}
 
 	// construct expression ProtoBuf.
 	return &tipb.Expr{
 		Tp:        tipb.ExprType_ScalarFunc,
-		Val:       implicitParameters,
+		Val:       implicitArgs,
 		Sig:       pbCode,
 		Children:  children,
 		FieldType: ToPBFieldType(expr.RetType),

expression/expr_to_pb_test.go

@@ -595,7 +595,7 @@ func (s *testEvaluatorSuite) TestSortByItem2Pb(c *C) {
 	c.Assert(string(js), Equals, "{\"expr\":{\"tp\":201,\"val\":\"gAAAAAAAAAE=\",\"sig\":0,\"field_type\":{\"tp\":5,\"flag\":0,\"flen\":-1,\"decimal\":-1,\"collate\":46,\"charset\":\"\"}},\"desc\":true}")
 }
 
-func (s *testEvaluatorSuite) TestImplicitParameters(c *C) {
+func (s *testEvaluatorSuite) TestImplicitArgs(c *C) {
 	sc := new(stmtctx.StatementContext)
 	client := new(mock.Client)
 	dg := new(dataGen4Expr2PbTest)
@@ -607,7 +607,7 @@ func (s *testEvaluatorSuite) TestImplicitParameters(c *C) {
 
 	// InUnion flag is false in `BuildCastFunction` when `ScalarFuncSig_CastStringAsInt`
 	cast := BuildCastFunction(mock.NewContext(), dg.genColumn(mysql.TypeString, 1), types.NewFieldType(mysql.TypeLonglong))
-	c.Assert(cast.(*ScalarFunction).Function.implicitParameters(), DeepEquals, []types.Datum{types.NewIntDatum(0)})
+	c.Assert(cast.(*ScalarFunction).Function.implicitArgs(), DeepEquals, []types.Datum{types.NewIntDatum(0)})
 	expr := pc.ExprToPB(cast)
 	c.Assert(expr.Sig, Equals, tipb.ScalarFuncSig_CastStringAsInt)
 	c.Assert(len(expr.Val), Greater, 0)
@@ -617,14 +617,14 @@ func (s *testEvaluatorSuite) TestImplicitParameters(c *C) {
 
 	// InUnion flag is nil in `BuildCastFunction4Union` when `ScalarFuncSig_CastIntAsString`
 	castInUnion := BuildCastFunction4Union(mock.NewContext(), dg.genColumn(mysql.TypeLonglong, 1), types.NewFieldType(mysql.TypeString))
-	c.Assert(castInUnion.(*ScalarFunction).Function.implicitParameters(), IsNil)
+	c.Assert(castInUnion.(*ScalarFunction).Function.implicitArgs(), IsNil)
 	expr = pc.ExprToPB(castInUnion)
 	c.Assert(expr.Sig, Equals, tipb.ScalarFuncSig_CastIntAsString)
 	c.Assert(len(expr.Val), Equals, 0)
 
 	// InUnion flag is true in `BuildCastFunction4Union` when `ScalarFuncSig_CastStringAsInt`
 	castInUnion = BuildCastFunction4Union(mock.NewContext(), dg.genColumn(mysql.TypeString, 1), types.NewFieldType(mysql.TypeLonglong))
-	c.Assert(castInUnion.(*ScalarFunction).Function.implicitParameters(), DeepEquals, []types.Datum{types.NewIntDatum(1)})
+	c.Assert(castInUnion.(*ScalarFunction).Function.implicitArgs(), DeepEquals, []types.Datum{types.NewIntDatum(1)})
 	expr = pc.ExprToPB(castInUnion)
 	c.Assert(expr.Sig, Equals, tipb.ScalarFuncSig_CastStringAsInt)
 	c.Assert(len(expr.Val), Greater, 0)