*: Update golangci-lint to v1.59.1 and fix lint errors #1415

pingyu · 2024-08-04T08:18:25Z

The current version v1.51.2 of golangci-lint report false positive errors (see https://github.com/tikv/client-go/actions/runs/10214979208/job/28310744852?pr=1414):

❯ golangci-lint run
../../opt/go1.21.0/src/slices/sort.go:67:7: undefined: min (typecheck)
                m = min(m, x[i])
                    ^
../../opt/go1.21.0/src/slices/sort.go:97:7: undefined: max (typecheck)
                m = max(m, x[i])

Changes

Update version of golangci-lint to v1.59.1 in CI.
Fix new lint errors:
- Remove depguard linter as we do not deny any 3rd package. The depguard linter is by default in strict mode and deny and 3rd package. In another hand if change to lax mode the linter will complain that depguard: must have an Allow and/or Deny package list
- Use new unsafe.SliceXXX methods to replace deprecated reflect.SliceHeader.

The new lint errors:

❯ golangci-lint run
tikvrpc/endpoint.go:37:8: import 'github.com/pingcap/kvproto/pkg/metapb' is not allowed from list 'Main' (depguard)
import "github.com/pingcap/kvproto/pkg/metapb"
       ^
tikvrpc/tikvrpc.go:42:2: import 'github.com/pingcap/kvproto/pkg/coprocessor' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/coprocessor"
        ^
tikvrpc/tikvrpc.go:43:2: import 'github.com/pingcap/kvproto/pkg/debugpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/debugpb"
        ^
tikvrpc/tikvrpc.go:44:2: import 'github.com/pingcap/kvproto/pkg/errorpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/errorpb"
        ^
tikvrpc/tikvrpc.go:45:2: import 'github.com/pingcap/kvproto/pkg/kvrpcpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/kvrpcpb"
        ^
tikvrpc/tikvrpc.go:46:2: import 'github.com/pingcap/kvproto/pkg/metapb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/metapb"
        ^
tikvrpc/tikvrpc.go:47:2: import 'github.com/pingcap/kvproto/pkg/mpp' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/mpp"
        ^
tikvrpc/tikvrpc.go:48:2: import 'github.com/pingcap/kvproto/pkg/tikvpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/tikvpb"
        ^
tikvrpc/tikvrpc.go:49:2: import 'github.com/pkg/errors' is not allowed from list 'Main' (depguard)
        "github.com/pkg/errors"
        ^
tikvrpc/tikvrpc.go:50:2: import 'github.com/tikv/client-go/v2/kv' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/kv"
        ^
tikvrpc/tikvrpc.go:51:2: import 'github.com/tikv/client-go/v2/oracle' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/oracle"
        ^
tikvrpc/tikvrpc_test.go:44:2: import 'github.com/pingcap/kvproto/pkg/coprocessor' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/coprocessor"
        ^
tikvrpc/tikvrpc_test.go:45:2: import 'github.com/pingcap/kvproto/pkg/kvrpcpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/kvrpcpb"
        ^
tikvrpc/tikvrpc_test.go:46:2: import 'github.com/pingcap/kvproto/pkg/tikvpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/tikvpb"
        ^
tikvrpc/tikvrpc_test.go:47:2: import 'github.com/stretchr/testify/assert' is not allowed from list 'Main' (depguard)
        "github.com/stretchr/testify/assert"
        ^
oracle/oracles/local_test.go:42:2: import 'github.com/stretchr/testify/assert' is not allowed from list 'Main' (depguard)
        "github.com/stretchr/testify/assert"
        ^
oracle/oracles/local_test.go:43:2: import 'github.com/stretchr/testify/require' is not allowed from list 'Main' (depguard)
        "github.com/stretchr/testify/require"
        ^
oracle/oracles/local_test.go:44:2: import 'github.com/tikv/client-go/v2/oracle' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/oracle"
        ^
oracle/oracles/local_test.go:45:2: import 'github.com/tikv/client-go/v2/oracle/oracles' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/oracle/oracles"
        ^
oracle/oracles/pd_test.go:43:2: import 'github.com/stretchr/testify/assert' is not allowed from list 'Main' (depguard)
        "github.com/stretchr/testify/assert"
        ^
oracle/oracles/pd_test.go:44:2: import 'github.com/tikv/client-go/v2/oracle' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/oracle"
        ^
oracle/oracles/pd_test.go:45:2: import 'github.com/tikv/client-go/v2/oracle/oracles' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/oracle/oracles"
        ^
internal/apicodec/codec.go:6:2: import 'github.com/pingcap/errors' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/errors"
        ^
internal/apicodec/codec.go:7:2: import 'github.com/pingcap/kvproto/pkg/keyspacepb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/keyspacepb"
        ^
internal/apicodec/codec.go:8:2: import 'github.com/pingcap/kvproto/pkg/kvrpcpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/kvrpcpb"
        ^
internal/apicodec/codec.go:9:2: import 'github.com/tikv/client-go/v2/tikvrpc' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/tikvrpc"
        ^
internal/apicodec/codec_v1.go:4:2: import 'github.com/pingcap/errors' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/errors"
        ^
internal/apicodec/codec_v1.go:5:2: import 'github.com/pingcap/kvproto/pkg/errorpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/errorpb"
        ^
internal/apicodec/codec_v1.go:6:2: import 'github.com/pingcap/kvproto/pkg/keyspacepb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/keyspacepb"
        ^
internal/apicodec/codec_v1.go:8:2: import 'github.com/tikv/client-go/v2/tikvrpc' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/tikvrpc"
        ^
internal/apicodec/codec_v2.go:8:2: import 'github.com/pingcap/kvproto/pkg/coprocessor' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/coprocessor"
        ^
internal/apicodec/codec_v2.go:9:2: import 'github.com/pingcap/kvproto/pkg/errorpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/errorpb"
        ^
internal/apicodec/codec_v2.go:10:2: import 'github.com/pingcap/kvproto/pkg/keyspacepb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/keyspacepb"
        ^
internal/apicodec/codec_v2.go:12:2: import 'github.com/pingcap/kvproto/pkg/metapb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/metapb"
        ^
internal/apicodec/codec_v2.go:13:2: import 'github.com/pkg/errors' is not allowed from list 'Main' (depguard)
        "github.com/pkg/errors"
        ^
internal/apicodec/codec_v2.go:14:2: import 'github.com/tikv/client-go/v2/internal/logutil' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/internal/logutil"
        ^
internal/apicodec/codec_v2.go:15:2: import 'github.com/tikv/client-go/v2/tikvrpc' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/tikvrpc"
        ^
internal/apicodec/mem_codec.go:4:2: import 'github.com/pkg/errors' is not allowed from list 'Main' (depguard)
        "github.com/pkg/errors"
        ^
internal/apicodec/mem_codec.go:5:2: import 'github.com/tikv/client-go/v2/util/codec' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/util/codec"
        ^
internal/apicodec/codec_v2_test.go:12:2: import 'github.com/pingcap/kvproto/pkg/mpp' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/mpp"
        ^
internal/apicodec/codec_v2_test.go:13:2: import 'github.com/stretchr/testify/suite' is not allowed from list 'Main' (depguard)
        "github.com/stretchr/testify/suite"
        ^
internal/apicodec/codec_v2_test.go:15:2: import 'github.com/tikv/client-go/v2/util/codec' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/util/codec"
        ^
internal/client/client.go:50:2: import 'github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing' is not allowed from list 'Main' (depguard)
        grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing"
        ^
internal/client/client.go:51:2: import 'github.com/opentracing/opentracing-go' is not allowed from list 'Main' (depguard)
        "github.com/opentracing/opentracing-go"
        ^
internal/client/client.go:53:2: import 'github.com/pingcap/kvproto/pkg/debugpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/debugpb"
        ^
internal/client/client.go:54:2: import 'github.com/pingcap/kvproto/pkg/mpp' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/mpp"
        ^
internal/client/client.go:55:2: import 'github.com/pingcap/kvproto/pkg/tikvpb' is not allowed from list 'Main' (depguard)
        "github.com/pingcap/kvproto/pkg/tikvpb"
        ^
internal/client/client.go:57:2: import 'github.com/prometheus/client_golang/prometheus' is not allowed from list 'Main' (depguard)
        "github.com/prometheus/client_golang/prometheus"
        ^
internal/client/client.go:58:2: import 'github.com/tikv/client-go/v2/config' is not allowed from list 'Main' (depguard)
        "github.com/tikv/client-go/v2/config"
        ^
internal/client/client.go:59:2: import 'github.com/tikv/client-go/v2/error' is not allowed from list 'Main' (depguard)
        tikverr "github.com/tikv/client-go/v2/error"
        ^
util/misc.go:171:14: SA1019: reflect.SliceHeader has been deprecated since Go 1.21 and an alternative has been available since Go 1.17: Use unsafe.Slice or unsafe.SliceData instead. (staticcheck)
        pbytes := (*reflect.SliceHeader)(unsafe.Pointer(&b))
                    ^
util/misc.go:172:15: SA1019: reflect.StringHeader has been deprecated since Go 1.21 and an alternative has been available since Go 1.20: Use unsafe.String or unsafe.StringData instead. (staticcheck)
        pstring := (*reflect.StringHeader)(unsafe.Pointer(&s))
                     ^
internal/unionstore/memdb.go:841:11: SA1019: reflect.SliceHeader has been deprecated since Go 1.21 and an alternative has been available since Go 1.17: Use unsafe.Slice or unsafe.SliceData instead. (staticcheck)
        hdr := (*reflect.SliceHeader)(unsafe.Pointer(&ret))
                 ^

Signed-off-by: Ping Yu <[email protected]>

iosmanthus · 2024-08-05T05:11:20Z

internal/unionstore/memdb.go

@@ -837,12 +836,8 @@ func (n *memdbNode) setBlack() {
 }

 func (n *memdbNode) getKey() []byte {


Are there any tests against this function?

Current UT cases in memdb_test.go has covered this method.

E.g. TestGetSet -> p.Get(..) -> db.traverse(..) -> getKey.

And the coverage result also prove that (getKey is green):

update golangci-lint to v1.59.1. fix lint errors

1236873

Signed-off-by: Ping Yu <[email protected]>

ti-chi-bot bot added the dco-signoff: yes Indicates the PR's author has signed the dco. label Aug 4, 2024

pingyu mentioned this pull request Aug 4, 2024

txn-file: Fix miss slice after region error is met or commit failed #1414

Merged

iosmanthus reviewed Aug 5, 2024

View reviewed changes

iosmanthus merged commit ea9f424 into tikv:tidb-cse-7.5 Aug 5, 2024
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: Update golangci-lint to v1.59.1 and fix lint errors #1415

*: Update golangci-lint to v1.59.1 and fix lint errors #1415

pingyu commented Aug 4, 2024

iosmanthus Aug 5, 2024

pingyu Aug 5, 2024

		@@ -837,12 +836,8 @@ func (n *memdbNode) setBlack() {
		}

		func (n *memdbNode) getKey() []byte {

*: Update golangci-lint to v1.59.1 and fix lint errors #1415

*: Update golangci-lint to v1.59.1 and fix lint errors #1415

Conversation

pingyu commented Aug 4, 2024

Changes

iosmanthus Aug 5, 2024

Choose a reason for hiding this comment

pingyu Aug 5, 2024

Choose a reason for hiding this comment