Merge branch 'master' into fix-region-api

lhy1024 · Dec 25, 2024 · ebf6176 · ebf6176
2 parents 79a7508 + 95bfbe6
commit ebf6176
Show file tree

Hide file tree

Showing 622 changed files with 7,826 additions and 5,430 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -28,6 +28,7 @@ linters:
     - protogetter
     - reassign
     - intrange
+    - gci
 linters-settings:
   gocritic:
     # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
@@ -233,6 +234,13 @@ linters-settings:
             desc: "Use 'sync/atomic' instead of 'go.uber.org/atomic'"
           - pkg: github.com/pkg/errors
             desc: "Use 'github.com/pingcap/errors' instead of 'github.com/pkg/errors'"
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/pingcap)
+      - prefix(github.com/tikv/pd)
+      - blank
 issues:
   exclude-rules:
     - path: (_test\.go|pkg/mock/.*\.go|tests/.*\.go)

diff --git a/client/batch_controller_test.go b/client/batch_controller_test.go