*: remove errors.Trace in main handle path (#10033)

Author: lysu

distsql/distsql.go

@@ -43,7 +43,7 @@ func Select(ctx context.Context, sctx sessionctx.Context, kvReq *kv.Request, fie
 	resp := sctx.GetClient().Send(ctx, kvReq, sctx.GetSessionVars().KVVars)
 	if resp == nil {
 		err := errors.New("client returns nil response")
-		return nil, errors.Trace(err)
+		return nil, err
 	}
 
 	if kvReq.Streaming {

distsql/distsql_test.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/cznic/mathutil"
 	. "github.com/pingcap/check"
-	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/charset"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/tidb/kv"
@@ -369,7 +368,7 @@ func mockReadRowsData(buffer []byte, colTypes []*types.FieldType, chk *chunk.Chu
 		for colOrdinal := 0; colOrdinal < numCols; colOrdinal++ {
 			buffer, err = decoder.DecodeOne(buffer, colOrdinal, colTypes[colOrdinal])
 			if err != nil {
-				return errors.Trace(err)
+				return err
 			}
 		}
 	}

distsql/request_builder.go

@@ -16,7 +16,6 @@ package distsql
 import (
 	"math"
 
-	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
@@ -38,7 +37,7 @@ type RequestBuilder struct {
 
 // Build builds a "kv.Request".
 func (builder *RequestBuilder) Build() (*kv.Request, error) {
-	return &builder.Request, errors.Trace(builder.err)
+	return &builder.Request, builder.err
 }
 
 // SetTableRanges sets "KeyRanges" for "kv.Request" by converting "tableRanges"
@@ -254,7 +253,7 @@ func IndexRangesToKVRanges(sc *stmtctx.StatementContext, tid, idxID int64, range
 	for _, ran := range ranges {
 		low, high, err := encodeIndexKey(sc, ran)
 		if err != nil {
-			return nil, errors.Trace(err)
+			return nil, err
 		}
 		feedbackRanges = append(feedbackRanges, &ranger.Range{LowVal: []types.Datum{types.NewBytesDatum(low)},
 			HighVal: []types.Datum{types.NewBytesDatum(high)}, LowExclude: false, HighExclude: true})
@@ -287,7 +286,7 @@ func indexRangesToKVWithoutSplit(sc *stmtctx.StatementContext, tid, idxID int64,
 	for _, ran := range ranges {
 		low, high, err := encodeIndexKey(sc, ran)
 		if err != nil {
-			return nil, errors.Trace(err)
+			return nil, err
 		}
 		startKey := tablecodec.EncodeIndexSeekKey(tid, idxID, low)
 		endKey := tablecodec.EncodeIndexSeekKey(tid, idxID, high)
@@ -299,14 +298,14 @@ func indexRangesToKVWithoutSplit(sc *stmtctx.StatementContext, tid, idxID int64,
 func encodeIndexKey(sc *stmtctx.StatementContext, ran *ranger.Range) ([]byte, []byte, error) {
 	low, err := codec.EncodeKey(sc, nil, ran.LowVal...)
 	if err != nil {
-		return nil, nil, errors.Trace(err)
+		return nil, nil, err
 	}
 	if ran.LowExclude {
 		low = []byte(kv.Key(low).PrefixNext())
 	}
 	high, err := codec.EncodeKey(sc, nil, ran.HighVal...)
 	if err != nil {
-		return nil, nil, errors.Trace(err)
+		return nil, nil, err
 	}
 
 	if !ran.HighExclude {

distsql/select_result.go

@@ -90,7 +90,7 @@ func (r *selectResult) fetch(ctx context.Context) {
 	for {
 		resultSubset, err := r.resp.Next(ctx)
 		if err != nil {
-			r.results <- resultWithErr{err: errors.Trace(err)}
+			r.results <- resultWithErr{err: err}
 			return
 		}
 		if resultSubset == nil {
@@ -126,12 +126,12 @@ func (r *selectResult) Next(ctx context.Context, chk *chunk.Chunk) error {
 		if r.selectResp == nil || r.respChkIdx == len(r.selectResp.Chunks) {
 			err := r.getSelectResp()
 			if err != nil || r.selectResp == nil {
-				return errors.Trace(err)
+				return err
 			}
 		}
 		err := r.readRowsData(chk)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		if len(r.selectResp.Chunks[r.respChkIdx].RowsData) == 0 {
 			r.respChkIdx++
@@ -203,7 +203,7 @@ func (r *selectResult) readRowsData(chk *chunk.Chunk) (err error) {
 		for i := 0; i < r.rowLen; i++ {
 			rowsData, err = decoder.DecodeOne(rowsData, i, r.fieldTypes[i])
 			if err != nil {
-				return errors.Trace(err)
+				return err
 			}
 		}
 	}

distsql/stream.go

@@ -48,15 +48,15 @@ func (r *streamResult) Next(ctx context.Context, chk *chunk.Chunk) error {
 	for !chk.IsFull() {
 		err := r.readDataIfNecessary(ctx)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 		if r.curr == nil {
 			return nil
 		}
 
 		err = r.flushToChunk(chk)
 		if err != nil {
-			return errors.Trace(err)
+			return err
 		}
 	}
 	return nil
@@ -66,7 +66,7 @@ func (r *streamResult) Next(ctx context.Context, chk *chunk.Chunk) error {
 func (r *streamResult) readDataFromResponse(ctx context.Context, resp kv.Response, result *tipb.Chunk) (bool, error) {
 	resultSubset, err := resp.Next(ctx)
 	if err != nil {
-		return false, errors.Trace(err)
+		return false, err
 	}
 	if resultSubset == nil {
 		return true, nil
@@ -102,7 +102,7 @@ func (r *streamResult) readDataIfNecessary(ctx context.Context) error {
 	tmp := new(tipb.Chunk)
 	finish, err := r.readDataFromResponse(ctx, r.resp, tmp)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	if finish {
 		r.curr = nil
@@ -119,7 +119,7 @@ func (r *streamResult) flushToChunk(chk *chunk.Chunk) (err error) {
 		for i := 0; i < r.rowLen; i++ {
 			remainRowsData, err = decoder.DecodeOne(remainRowsData, i, r.fieldTypes[i])
 			if err != nil {
-				return errors.Trace(err)
+				return err
 			}
 		}
 	}
@@ -136,9 +136,9 @@ func (r *streamResult) NextRaw(ctx context.Context) ([]byte, error) {
 	r.feedback.Invalidate()
 	resultSubset, err := r.resp.Next(ctx)
 	if resultSubset == nil || err != nil {
-		return nil, errors.Trace(err)
+		return nil, err
 	}
-	return resultSubset.GetData(), errors.Trace(err)
+	return resultSubset.GetData(), err
 }
 
 func (r *streamResult) Close() error {

domain/domain.go

@@ -81,12 +81,12 @@ func (do *Domain) loadInfoSchema(handle *infoschema.Handle, usedSchemaVersion in
 	var fullLoad bool
 	snapshot, err := do.store.GetSnapshot(kv.NewVersion(startTS))
 	if err != nil {
-		return 0, nil, fullLoad, errors.Trace(err)
+		return 0, nil, fullLoad, err
 	}
 	m := meta.NewSnapshotMeta(snapshot)
 	latestSchemaVersion, err := m.GetSchemaVersion()
 	if err != nil {
-		return 0, nil, fullLoad, errors.Trace(err)
+		return 0, nil, fullLoad, err
 	}
 	if usedSchemaVersion != 0 && usedSchemaVersion == latestSchemaVersion {
 		return latestSchemaVersion, nil, fullLoad, nil
@@ -123,12 +123,12 @@ func (do *Domain) loadInfoSchema(handle *infoschema.Handle, usedSchemaVersion in
 	fullLoad = true
 	schemas, err := do.fetchAllSchemasWithTables(m)
 	if err != nil {
-		return 0, nil, fullLoad, errors.Trace(err)
+		return 0, nil, fullLoad, err
 	}
 
 	newISBuilder, err := infoschema.NewBuilder(handle).InitWithDBInfos(schemas, latestSchemaVersion)
 	if err != nil {
-		return 0, nil, fullLoad, errors.Trace(err)
+		return 0, nil, fullLoad, err
 	}
 	logutil.Logger(context.Background()).Info("full load InfoSchema success", zap.Int64("usedSchemaVersion", usedSchemaVersion),
 		zap.Int64("latestSchemaVersion", latestSchemaVersion), zap.Duration("start time", time.Since(startTime)))
@@ -139,7 +139,7 @@ func (do *Domain) loadInfoSchema(handle *infoschema.Handle, usedSchemaVersion in
 func (do *Domain) fetchAllSchemasWithTables(m *meta.Meta) ([]*model.DBInfo, error) {
 	allSchemas, err := m.ListDatabases()
 	if err != nil {
-		return nil, errors.Trace(err)
+		return nil, err
 	}
 	splittedSchemas := do.splitForConcurrentFetch(allSchemas)
 	doneCh := make(chan error, len(splittedSchemas))
@@ -149,7 +149,7 @@ func (do *Domain) fetchAllSchemasWithTables(m *meta.Meta) ([]*model.DBInfo, erro
 	for range splittedSchemas {
 		err = <-doneCh
 		if err != nil {
-			return nil, errors.Trace(err)
+			return nil, err
 		}
 	}
 	return allSchemas, nil
@@ -231,7 +231,7 @@ func (do *Domain) tryLoadSchemaDiffs(m *meta.Meta, usedVersion, newVersion int64
 		usedVersion++
 		diff, err := m.GetSchemaDiff(usedVersion)
 		if err != nil {
-			return false, nil, errors.Trace(err)
+			return false, nil, err
 		}
 		if diff == nil {
 			// If diff is missing for any version between used and new version, we fall back to full reload.
@@ -244,7 +244,7 @@ func (do *Domain) tryLoadSchemaDiffs(m *meta.Meta, usedVersion, newVersion int64
 	for _, diff := range diffs {
 		ids, err := builder.ApplyDiff(m, diff)
 		if err != nil {
-			return false, nil, errors.Trace(err)
+			return false, nil, err
 		}
 		tblIDs = append(tblIDs, ids...)
 	}
@@ -262,7 +262,7 @@ func (do *Domain) GetSnapshotInfoSchema(snapshotTS uint64) (infoschema.InfoSchem
 	snapHandle := do.infoHandle.EmptyClone()
 	_, _, _, err := do.loadInfoSchema(snapHandle, do.infoHandle.Get().SchemaMetaVersion(), snapshotTS)
 	if err != nil {
-		return nil, errors.Trace(err)
+		return nil, err
 	}
 	return snapHandle.Get(), nil
 }
@@ -271,7 +271,7 @@ func (do *Domain) GetSnapshotInfoSchema(snapshotTS uint64) (infoschema.InfoSchem
 func (do *Domain) GetSnapshotMeta(startTS uint64) (*meta.Meta, error) {
 	snapshot, err := do.store.GetSnapshot(kv.NewVersion(startTS))
 	if err != nil {
-		return nil, errors.Trace(err)
+		return nil, err
 	}
 	return meta.NewSnapshotMeta(snapshot), nil
 }
@@ -316,7 +316,7 @@ func (do *Domain) Reload() error {
 
 	ver, err := do.store.CurrentVersion()
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 
 	schemaVersion := int64(0)
@@ -333,7 +333,7 @@ func (do *Domain) Reload() error {
 	metrics.LoadSchemaDuration.Observe(time.Since(startTime).Seconds())
 	if err != nil {
 		metrics.LoadSchemaCounter.WithLabelValues("failed").Inc()
-		return errors.Trace(err)
+		return err
 	}
 	metrics.LoadSchemaCounter.WithLabelValues("succ").Inc()
 
@@ -495,7 +495,7 @@ func (do *Domain) mustRestartSyncer() error {
 		// If the domain has stopped, we return an error immediately.
 		select {
 		case <-do.exit:
-			return errors.Trace(err)
+			return err
 		default:
 		}
 		time.Sleep(time.Second)
@@ -529,7 +529,7 @@ func (do *Domain) mustReload() (exitLoop bool) {
 // Close closes the Domain and release its resource.
 func (do *Domain) Close() {
 	if do.ddl != nil {
-		terror.Log(errors.Trace(do.ddl.Stop()))
+		terror.Log(do.ddl.Stop())
 	}
 	if do.info != nil {
 		do.info.RemoveServerInfo()
@@ -631,16 +631,16 @@ func (do *Domain) Init(ddlLease time.Duration, sysFactory func(*Domain) (pools.R
 
 	err := do.ddl.SchemaSyncer().Init(ctx)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	do.info = NewInfoSyncer(do.ddl.GetID(), do.etcdClient)
 	err = do.info.Init(ctx)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	err = do.Reload()
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 
 	// Only when the store is local that the lease value is 0.
@@ -733,7 +733,7 @@ func (do *Domain) LoadPrivilegeLoop(ctx sessionctx.Context) error {
 	do.privHandle = privileges.NewHandle()
 	err := do.privHandle.Update(ctx)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 
 	var watchCh clientv3.WatchChan
@@ -798,7 +798,7 @@ func (do *Domain) LoadBindInfoLoop(ctx sessionctx.Context, parser *parser.Parser
 	bindCacheUpdater := bindinfo.NewBindCacheUpdater(ctx, do.BindHandle(), parser)
 	err := bindCacheUpdater.Update(true)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 
 	duration := 3 * time.Second

domain/info.go

@@ -80,7 +80,7 @@ func NewInfoSyncer(id string, etcdCli *clientv3.Client) *InfoSyncer {
 
 // Init creates a new etcd session and stores server info to etcd.
 func (is *InfoSyncer) Init(ctx context.Context) error {
-	return errors.Trace(is.newSessionAndStoreServerInfo(ctx, owner.NewSessionDefaultRetryCnt))
+	return is.newSessionAndStoreServerInfo(ctx, owner.NewSessionDefaultRetryCnt)
 }
 
 // GetServerInfo gets self server static information.
@@ -96,7 +96,7 @@ func (is *InfoSyncer) GetServerInfoByID(ctx context.Context, id string) (*Server
 	key := fmt.Sprintf("%s/%s", ServerInformationPath, id)
 	infoMap, err := getInfo(ctx, is.etcdCli, key, keyOpDefaultRetryCnt, keyOpDefaultTimeout)
 	if err != nil {
-		return nil, errors.Trace(err)
+		return nil, err
 	}
 	info, ok := infoMap[id]
 	if !ok {
@@ -114,7 +114,7 @@ func (is *InfoSyncer) GetAllServerInfo(ctx context.Context) (map[string]*ServerI
 	}
 	allInfo, err := getInfo(ctx, is.etcdCli, ServerInformationPath, keyOpDefaultRetryCnt, keyOpDefaultTimeout, clientv3.WithPrefix())
 	if err != nil {
-		return nil, errors.Trace(err)
+		return nil, err
 	}
 	return allInfo, nil
 }
@@ -130,7 +130,7 @@ func (is *InfoSyncer) storeServerInfo(ctx context.Context) error {
 	}
 	str := string(hack.String(infoBuf))
 	err = ddl.PutKVToEtcd(ctx, is.etcdCli, keyOpDefaultRetryCnt, is.serverInfoPath, str, clientv3.WithLease(is.session.Lease()))
-	return errors.Trace(err)
+	return err
 }
 
 // RemoveServerInfo remove self server static information from etcd.
@@ -154,7 +154,7 @@ func (is InfoSyncer) Done() <-chan struct{} {
 
 // Restart restart the info syncer with new session leaseID and store server info to etcd again.
 func (is *InfoSyncer) Restart(ctx context.Context) error {
-	return errors.Trace(is.newSessionAndStoreServerInfo(ctx, owner.NewSessionDefaultRetryCnt))
+	return is.newSessionAndStoreServerInfo(ctx, owner.NewSessionDefaultRetryCnt)
 }
 
 // newSessionAndStoreServerInfo creates a new etcd session and stores server info to etcd.
@@ -165,12 +165,12 @@ func (is *InfoSyncer) newSessionAndStoreServerInfo(ctx context.Context, retryCnt
 	logPrefix := fmt.Sprintf("[Info-syncer] %s", is.serverInfoPath)
 	session, err := owner.NewSession(ctx, logPrefix, is.etcdCli, retryCnt, InfoSessionTTL)
 	if err != nil {
-		return errors.Trace(err)
+		return err
 	}
 	is.session = session
 
 	err = is.storeServerInfo(ctx)
-	return errors.Trace(err)
+	return err
 }
 
 // getInfo gets server information from etcd according to the key and opts.