expression: remove redundant "errors.Trace()" in "expression" package (…

…pingcap#8609)

expression/aggregation/aggregation.go

@@ -16,6 +16,7 @@ package aggregation
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/ast"
 	"github.com/pingcap/parser/charset"
@@ -63,7 +64,7 @@ func NewDistAggFunc(expr *tipb.Expr, fieldTps []*types.FieldType, sc *stmtctx.St
 	for _, child := range expr.Children {
 		arg, err := expression.PBToExpr(child, fieldTps, sc)
 		if err != nil {
-			return nil, errors.Trace(err)
+			return nil, err
 		}
 		args = append(args, arg)
 	}
@@ -152,23 +153,23 @@ func (af *aggFunction) updateSum(sc *stmtctx.StatementContext, evalCtx *AggEvalu
 	a := af.Args[0]
 	value, err := a.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if value.IsNull() {
 		return nil
 	}
 	if af.HasDistinct {
 		d, err1 := evalCtx.DistinctChecker.Check([]types.Datum{value})
 		if err1 != nil {
-			return errors.Trace(err1)
+			return err1
 		}
 		if !d {
 			return nil
 		}
 	}
 	evalCtx.Value, err = calculateSum(sc, evalCtx.Value, value)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	evalCtx.Count++
 	return nil

expression/aggregation/avg.go

@@ -15,7 +15,6 @@ package aggregation
 
 import (
 	"github.com/cznic/mathutil"
-	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
@@ -31,18 +30,18 @@ func (af *avgFunction) updateAvg(sc *stmtctx.StatementContext, evalCtx *AggEvalu
 	a := af.Args[1]
 	value, err := a.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if value.IsNull() {
 		return nil
 	}
 	evalCtx.Value, err = calculateSum(sc, evalCtx.Value, value)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	count, err := af.Args[0].Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	evalCtx.Count += count.GetInt64()
 	return nil
@@ -66,7 +65,7 @@ func (af *avgFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Statement
 	case DedupMode:
 		panic("DedupMode is not supported now.")
 	}
-	return errors.Trace(err)
+	return err
 }
 
 // GetResult implements Aggregation interface.
@@ -81,13 +80,13 @@ func (af *avgFunction) GetResult(evalCtx *AggEvaluateContext) (d types.Datum) {
 		y := types.NewDecFromInt(evalCtx.Count)
 		to := new(types.MyDecimal)
 		err := types.DecimalDiv(x, y, to, types.DivFracIncr)
-		terror.Log(errors.Trace(err))
+		terror.Log(err)
 		frac := af.RetTp.Decimal
 		if frac == -1 {
 			frac = mysql.MaxDecimalScale
 		}
 		err = to.Round(to, mathutil.Min(frac, mysql.MaxDecimalScale), types.ModeHalfEven)
-		terror.Log(errors.Trace(err))
+		terror.Log(err)
 		d.SetMysqlDecimal(to)
 	}
 	return

expression/aggregation/bit_and.go

@@ -16,7 +16,6 @@ package aggregation
 import (
 	"math"
 
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
@@ -41,15 +40,15 @@ func (bf *bitAndFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Statem
 	a := bf.Args[0]
 	value, err := a.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if !value.IsNull() {
 		if value.Kind() == types.KindUint64 {
 			evalCtx.Value.SetUint64(evalCtx.Value.GetUint64() & value.GetUint64())
 		} else {
 			int64Value, err := value.ToInt64(sc)
 			if err != nil {
-				return errors.Trace(err)
+				return err
 			}
 			evalCtx.Value.SetUint64(evalCtx.Value.GetUint64() & uint64(int64Value))
 		}

expression/aggregation/bit_or.go

@@ -14,7 +14,6 @@
 package aggregation
 
 import (
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
@@ -39,15 +38,15 @@ func (bf *bitOrFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Stateme
 	a := bf.Args[0]
 	value, err := a.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if !value.IsNull() {
 		if value.Kind() == types.KindUint64 {
 			evalCtx.Value.SetUint64(evalCtx.Value.GetUint64() | value.GetUint64())
 		} else {
 			int64Value, err := value.ToInt64(sc)
 			if err != nil {
-				return errors.Trace(err)
+				return err
 			}
 			evalCtx.Value.SetUint64(evalCtx.Value.GetUint64() | uint64(int64Value))
 		}

expression/aggregation/bit_xor.go

@@ -14,7 +14,6 @@
 package aggregation
 
 import (
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
@@ -39,15 +38,15 @@ func (bf *bitXorFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Statem
 	a := bf.Args[0]
 	value, err := a.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if !value.IsNull() {
 		if value.Kind() == types.KindUint64 {
 			evalCtx.Value.SetUint64(evalCtx.Value.GetUint64() ^ value.GetUint64())
 		} else {
 			int64Value, err := value.ToInt64(sc)
 			if err != nil {
-				return errors.Trace(err)
+				return err
 			}
 			evalCtx.Value.SetUint64(evalCtx.Value.GetUint64() ^ uint64(int64Value))
 		}

expression/aggregation/concat.go

@@ -48,13 +48,13 @@ func (cf *concatFunction) initSeparator(sc *stmtctx.StatementContext, row chunk.
 	sepArg := cf.Args[len(cf.Args)-1]
 	sepDatum, err := sepArg.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if sepDatum.IsNull() {
 		return errors.Errorf("Invalid separator argument.")
 	}
 	cf.separator, err = sepDatum.ToString()
-	return errors.Trace(err)
+	return err
 }
 
 // Update implements Aggregation interface.
@@ -63,7 +63,7 @@ func (cf *concatFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Statem
 	if !cf.sepInited {
 		err := cf.initSeparator(sc, row)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		cf.sepInited = true
 	}
@@ -72,7 +72,7 @@ func (cf *concatFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Statem
 	for i, length := 0, len(cf.Args)-1; i < length; i++ {
 		value, err := cf.Args[i].Eval(row)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		if value.IsNull() {
 			return nil
@@ -82,7 +82,7 @@ func (cf *concatFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Statem
 	if cf.HasDistinct {
 		d, err := evalCtx.DistinctChecker.Check(datumBuf)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		if !d {
 			return nil

expression/aggregation/count.go

@@ -14,7 +14,6 @@
 package aggregation
 
 import (
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
@@ -33,7 +32,7 @@ func (cf *countFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Stateme
 	for _, a := range cf.Args {
 		value, err := a.Eval(row)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		if value.IsNull() {
 			return nil
@@ -48,7 +47,7 @@ func (cf *countFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Stateme
 	if cf.HasDistinct {
 		d, err := evalCtx.DistinctChecker.Check(datumBuf)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		if !d {
 			return nil

expression/aggregation/first_row.go

@@ -34,7 +34,7 @@ func (ff *firstRowFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.Stat
 	}
 	value, err := ff.Args[0].Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	evalCtx.Value = types.CopyDatum(value)
 	evalCtx.GotFirstRow = true

expression/aggregation/max_min.go

@@ -14,7 +14,6 @@
 package aggregation
 
 import (
-	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
@@ -40,7 +39,7 @@ func (mmf *maxMinFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.State
 	a := mmf.Args[0]
 	value, err := a.Eval(row)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if evalCtx.Value.IsNull() {
 		evalCtx.Value = *(&value).Copy()
@@ -51,7 +50,7 @@ func (mmf *maxMinFunction) Update(evalCtx *AggEvaluateContext, sc *stmtctx.State
 	var c int
 	c, err = evalCtx.Value.CompareDatum(sc, &value)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if (mmf.isMax && c == -1) || (!mmf.isMax && c == 1) {
 		evalCtx.Value = *(&value).Copy()

expression/aggregation/util.go

@@ -43,7 +43,7 @@ func (d *distinctChecker) Check(values []types.Datum) (bool, error) {
 	var err error
 	d.key, err = codec.EncodeValue(d.sc, d.key, values...)
 	if err != nil {
-		return false, errors.Trace(err)
+		return false, err
 	}
 	d.vals = d.existingKeys.Get(d.key, d.vals[:0])
 	if len(d.vals) > 0 {
@@ -78,7 +78,7 @@ func calculateSum(sc *stmtctx.StatementContext, sum, v types.Datum) (data types.
 	}
 
 	if err != nil {
-		return data, errors.Trace(err)
+		return data, err
 	}
 	if data.IsNull() {
 		return sum, nil