update golangci-lint to 2.2.1

Signed-off-by: Philip Dubé <philip.dube@clickhouse.com>

Author: serprex

.github/workflows/test.yml

@@ -50,7 +50,7 @@ jobs:
           git diff --exit-code
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.61.0
+          version: v2.2.1
           skip-pkg-cache: true

.golangci.yml

@@ -1,21 +1,35 @@
-run:
-  timeout: 5m
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
-    #- depguard
-    - exportloopref
-    - gofmt
-    - goimports
     - goprintffuncname
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - noctx
     - nolintlint
     - staticcheck
-    - typecheck
     - unconvert
     - unused
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

error/error.go

@@ -129,7 +129,7 @@ type ErrDeadlock struct {
 }
 
 func (d *ErrDeadlock) Error() string {
-	return d.Deadlock.String()
+	return d.String()
 }
 
 // PDError wraps *pdpb.Error to implement the error interface.
@@ -152,7 +152,7 @@ type ErrKeyExist struct {
 }
 
 func (k *ErrKeyExist) Error() string {
-	return k.AlreadyExist.String()
+	return k.String()
 }
 
 // IsErrKeyExist returns true if it is ErrKeyExist.
@@ -167,7 +167,7 @@ type ErrWriteConflict struct {
 }
 
 func (k *ErrWriteConflict) Error() string {
-	return fmt.Sprintf("write conflict { %s }", k.WriteConflict.String())
+	return fmt.Sprintf("write conflict { %s }", k.String())
 }
 
 // IsErrWriteConflict returns true if it is ErrWriteConflict.
@@ -310,7 +310,7 @@ type ErrLockOnlyIfExistsNoPrimaryKey struct {
 }
 
 func (e *ErrAssertionFailed) Error() string {
-	return fmt.Sprintf("assertion failed { %s }", e.AssertionFailed.String())
+	return fmt.Sprintf("assertion failed { %s }", e.String())
 }
 
 func (e *ErrLockOnlyIfExistsNoReturnValue) Error() string {

internal/apicodec/codec.go

@@ -92,27 +92,27 @@ func DecodeKey(encoded []byte, version kvrpcpb.APIVersion) ([]byte, []byte, erro
 }
 
 func setAPICtx(c Codec, r *tikvrpc.Request) {
-	r.Context.ApiVersion = c.GetAPIVersion()
-	r.Context.KeyspaceId = uint32(c.GetKeyspaceID())
+	r.ApiVersion = c.GetAPIVersion()
+	r.KeyspaceId = uint32(c.GetKeyspaceID())
 	keyspaceMeta := c.GetKeyspaceMeta()
 	if keyspaceMeta != nil {
-		r.Context.KeyspaceName = keyspaceMeta.Name
+		r.KeyspaceName = keyspaceMeta.Name
 	}
 
 	switch r.Type {
 	case tikvrpc.CmdMPPTask:
 		mpp := *r.DispatchMPPTask()
 		// Shallow copy the meta to avoid concurrent modification.
 		meta := *mpp.Meta
-		meta.KeyspaceId = r.Context.KeyspaceId
-		meta.ApiVersion = r.Context.ApiVersion
+		meta.KeyspaceId = r.KeyspaceId
+		meta.ApiVersion = r.ApiVersion
 		mpp.Meta = &meta
 		r.Req = &mpp
 
 	case tikvrpc.CmdCompact:
 		compact := *r.Compact()
-		compact.KeyspaceId = r.Context.KeyspaceId
-		compact.ApiVersion = r.Context.ApiVersion
+		compact.KeyspaceId = r.KeyspaceId
+		compact.ApiVersion = r.ApiVersion
 		r.Req = &compact
 	}
 }

internal/client/client.go

@@ -310,7 +310,7 @@ func (a *connArray) Init(addr string, security config.Security, idleNotify *uint
 	allowBatch := (cfg.TiKVClient.MaxBatchSize > 0) && enableBatch
 	if allowBatch {
 		a.batchConn = newBatchConn(uint(len(a.v)), cfg.TiKVClient.MaxBatchSize, idleNotify)
-		a.batchConn.initMetrics(a.target)
+		a.initMetrics(a.target)
 	}
 	keepAlive := cfg.TiKVClient.GrpcKeepAliveTime
 	for i := range a.v {
@@ -723,7 +723,7 @@ func (c *RPCClient) getCopStreamResponse(ctx context.Context, client tikvpb.Tikv
 	// Put the lease object to the timeout channel, so it would be checked periodically.
 	copStream := resp.Resp.(*tikvrpc.CopStreamResponse)
 	copStream.Timeout = timeout
-	copStream.Lease.Cancel = cancel
+	copStream.Cancel = cancel
 	connArray.streamTimeout <- &copStream.Lease
 
 	// Read the first streaming response to get CopStreamResponse.
@@ -758,7 +758,7 @@ func (c *RPCClient) getBatchCopStreamResponse(ctx context.Context, client tikvpb
 	// Put the lease object to the timeout channel, so it would be checked periodically.
 	copStream := resp.Resp.(*tikvrpc.BatchCopStreamResponse)
 	copStream.Timeout = timeout
-	copStream.Lease.Cancel = cancel
+	copStream.Cancel = cancel
 	connArray.streamTimeout <- &copStream.Lease
 
 	// Read the first streaming response to get CopStreamResponse.
@@ -792,7 +792,7 @@ func (c *RPCClient) getMPPStreamResponse(ctx context.Context, client tikvpb.Tikv
 	// Put the lease object to the timeout channel, so it would be checked periodically.
 	copStream := resp.Resp.(*tikvrpc.MPPStreamResponse)
 	copStream.Timeout = timeout
-	copStream.Lease.Cancel = cancel
+	copStream.Cancel = cancel
 	connArray.streamTimeout <- &copStream.Lease
 
 	// Read the first streaming response to get CopStreamResponse.

internal/client/client_batch.go

@@ -486,7 +486,8 @@ func (t *turboBatchTrigger) turboWaitTime() time.Duration {
 }
 
 func (t *turboBatchTrigger) needFetchMore(reqArrivalInterval time.Duration) bool {
-	if t.opts.V == turboBatchTimeBased {
+	switch t.opts.V {
+	case turboBatchTimeBased:
 		thisArrivalInterval := reqArrivalInterval.Seconds()
 		if t.maxArrivalInterval == 0 {
 			t.maxArrivalInterval = t.turboWaitSeconds() * float64(t.opts.N)
@@ -500,14 +501,14 @@ func (t *turboBatchTrigger) needFetchMore(reqArrivalInterval time.Duration) bool
 			t.estArrivalInterval = t.opts.W*thisArrivalInterval + (1-t.opts.W)*t.estArrivalInterval
 		}
 		return t.estArrivalInterval < t.turboWaitSeconds()*t.opts.P
-	} else if t.opts.V == turboBatchProbBased {
+	case turboBatchProbBased:
 		thisProb := .0
 		if reqArrivalInterval.Seconds() < t.turboWaitSeconds() {
 			thisProb = 1
 		}
 		t.estFetchMoreProb = t.opts.W*thisProb + (1-t.opts.W)*t.estFetchMoreProb
 		return t.estFetchMoreProb > t.opts.P
-	} else {
+	default:
 		return true
 	}
 }

internal/client/client_collapse.go

@@ -87,7 +87,7 @@ func (r reqCollapse) SendRequestAsync(ctx context.Context, addr string, req *tik
 	}
 	if req.Type == tikvrpc.CmdResolveLock && len(req.ResolveLock().Keys) == 0 && len(req.ResolveLock().TxnInfos) == 0 {
 		// try collapse resolve lock request.
-		key := strconv.FormatUint(req.Context.RegionId, 10) + "-" + strconv.FormatUint(req.ResolveLock().StartVersion, 10)
+		key := strconv.FormatUint(req.RegionId, 10) + "-" + strconv.FormatUint(req.ResolveLock().StartVersion, 10)
 		copyReq := *req
 		rsC := resolveRegionSf.DoChan(key, func() (interface{}, error) {
 			// resolveRegionSf will call this function in a goroutine, thus use SendRequest directly.
@@ -124,7 +124,7 @@ func (r reqCollapse) tryCollapseRequest(ctx context.Context, addr string, req *t
 			return
 		}
 		canCollapse = true
-		key := strconv.FormatUint(req.Context.RegionId, 10) + "-" + strconv.FormatUint(resolveLock.StartVersion, 10)
+		key := strconv.FormatUint(req.RegionId, 10) + "-" + strconv.FormatUint(resolveLock.StartVersion, 10)
 		resp, err = r.collapse(ctx, key, &resolveRegionSf, addr, req, timeout)
 		return
 	default:

internal/client/client_test.go

@@ -142,7 +142,7 @@ func TestSendWhenReconnect(t *testing.T) {
 	assert.Nil(t, err)
 
 	// Suppose all connections are re-establishing.
-	for _, client := range conn.batchConn.batchCommandsClients {
+	for _, client := range conn.batchCommandsClients {
 		client.lockForRecreate()
 	}
 
@@ -707,9 +707,9 @@ func TestBatchClientRecoverAfterServerRestart(t *testing.T) {
 		grpcConn := conn.Get()
 		require.NotNil(t, grpcConn)
 		var cli *batchCommandsClient
-		for i := range conn.batchConn.batchCommandsClients {
+		for i := range conn.batchCommandsClients {
 			if conn.batchConn.batchCommandsClients[i].tryLockForSend() {
-				cli = conn.batchConn.batchCommandsClients[i]
+				cli = conn.batchCommandsClients[i]
 				break
 			}
 		}
@@ -966,7 +966,7 @@ func TestRandomRestartStoreAndForwarding(t *testing.T) {
 	}
 	wg.Wait()
 
-	for _, cli := range conn.batchConn.batchCommandsClients {
+	for _, cli := range conn.batchCommandsClients {
 		require.Equal(t, int64(9223372036854775807), cli.maxConcurrencyRequestLimit.Load())
 		require.True(t, cli.available() > 0, fmt.Sprintf("sent: %d", cli.sent.Load()))
 		require.True(t, cli.sent.Load() >= 0, fmt.Sprintf("sent: %d", cli.sent.Load()))
@@ -1036,7 +1036,7 @@ func TestFastFailWhenNoAvailableConn(t *testing.T) {
 	_, err = sendBatchRequest(context.Background(), addr, "", conn.batchConn, req, time.Second, 0)
 	require.NoError(t, err)
 
-	for _, c := range conn.batchConn.batchCommandsClients {
+	for _, c := range conn.batchCommandsClients {
 		// mock all client a in recreate.
 		c.lockForRecreate()
 	}

internal/latch/scheduler.go

@@ -103,7 +103,7 @@ func (scheduler *LatchesScheduler) wakeup(wakeupList []*Lock) {
 // Close closes LatchesScheduler.
 func (scheduler *LatchesScheduler) Close() {
 	scheduler.RWMutex.Lock()
-	defer scheduler.RWMutex.Unlock()
+	defer scheduler.Unlock()
 	if !scheduler.closed {
 		close(scheduler.unlockCh)
 		scheduler.closed = true

internal/locate/region_request.go

@@ -66,7 +66,6 @@ import (
 	"github.com/tikv/client-go/v2/tikvrpc"
 	"github.com/tikv/client-go/v2/util"
 	"github.com/tikv/client-go/v2/util/async"
-	"github.com/tikv/pd/client/errs"
 	pderr "github.com/tikv/pd/client/errs"
 )
 
@@ -482,8 +481,8 @@ func (s *RegionRequestSender) SendReqAsync(
 		return
 	}
 
-	if req.Context.MaxExecutionDurationMs == 0 {
-		req.Context.MaxExecutionDurationMs = uint64(timeout.Milliseconds())
+	if req.MaxExecutionDurationMs == 0 {
+		req.MaxExecutionDurationMs = uint64(timeout.Milliseconds())
 	}
 
 	s.reset()
@@ -989,7 +988,7 @@ func (s *sendReqState) next() (done bool) {
 	logutil.Eventf(bo.GetCtx(), "send %s request to region %d at %s", req.Type, s.args.regionID.id, s.vars.rpcCtx.Addr)
 	s.storeAddr = s.vars.rpcCtx.Addr
 
-	req.Context.ClusterId = s.vars.rpcCtx.ClusterID
+	req.ClusterId = s.vars.rpcCtx.ClusterID
 	if req.InputRequestSource != "" && s.replicaSelector != nil {
 		patchRequestSource(req, s.replicaSelector.replicaType())
 	}
@@ -1240,7 +1239,7 @@ func (s *sendReqState) initForAsyncRequest() (ok bool) {
 
 	// set access location based on source and target "zone" label.
 	s.setReqAccessLocation(req)
-	req.Context.ClusterId = s.vars.rpcCtx.ClusterID
+	req.ClusterId = s.vars.rpcCtx.ClusterID
 	if req.InputRequestSource != "" && s.replicaSelector != nil {
 		patchRequestSource(req, s.replicaSelector.replicaType())
 	}
@@ -1425,8 +1424,8 @@ func (s *RegionRequestSender) SendReqCtx(
 
 	// If the MaxExecutionDurationMs is not set yet, we set it to be the RPC timeout duration
 	// so TiKV can give up the requests whose response TiDB cannot receive due to timeout.
-	if req.Context.MaxExecutionDurationMs == 0 {
-		req.Context.MaxExecutionDurationMs = uint64(timeout.Milliseconds())
+	if req.MaxExecutionDurationMs == 0 {
+		req.MaxExecutionDurationMs = uint64(timeout.Milliseconds())
 	}
 
 	state := &sendReqState{
@@ -1513,7 +1512,7 @@ func (s *RegionRequestSender) logSendReqError(bo *retry.Backoffer, msg string, r
 	builder.WriteString(", timeout: ")
 	builder.WriteString(util.FormatDuration(timeout))
 	builder.WriteString(", req-max-exec-timeout: ")
-	builder.WriteString(util.FormatDuration(time.Duration(int64(req.Context.MaxExecutionDurationMs) * int64(time.Millisecond))))
+	builder.WriteString(util.FormatDuration(time.Duration(int64(req.MaxExecutionDurationMs) * int64(time.Millisecond))))
 	builder.WriteString(", retry-times: ")
 	builder.WriteString(strconv.Itoa(retryTimes))
 	if s.AccessStats != nil {
@@ -1600,7 +1599,7 @@ func fetchRespInfo(resp *tikvrpc.Response) string {
 
 func isRPCError(err error) bool {
 	// exclude ErrClientResourceGroupThrottled
-	return err != nil && errs.ErrClientResourceGroupThrottled.NotEqual(err)
+	return err != nil && pderr.ErrClientResourceGroupThrottled.NotEqual(err)
 }
 
 func storeIDLabel(rpcCtx *RPCContext) string {