Merge branch 'master' into revert_backup_progress

.bazelrc

@@ -6,11 +6,6 @@ run:ci --color=yes
 
 build --announce_rc
 build --experimental_guard_against_concurrent_changes
-build --experimental_remote_merkle_tree_cache
-build --java_language_version=17
-build --java_runtime_version=17
-build --tool_java_language_version=17
-build --tool_java_runtime_version=17
 build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
 build:ci --color=yes
 build:ci --experimental_remote_cache_compression

.bazelversion

@@ -0,0 +1 @@
+7.4.1

.github/licenserc.yml

@@ -64,4 +64,9 @@ header:
     - "pkg/lightning/mydump/bytes.go"
     - "pkg/lightning/mydump/examples/metadata"
     - "tests/_utils/config/"
+    - "**/tidb-slow.log"
+    - "**/tidb-slow-*.log"
+    - "**/metadata"
+    - "pkg/extension/_import/generated-enterprise.go"
+
   comment: on-failure

.github/workflows/integration-test-dumpling.yml

@@ -53,6 +53,7 @@ jobs:
           - 8.0.22
           - 8.0.26
           - 8.0.37
+          - 8.4.3
     runs-on: ubuntu-latest
     timeout-minutes: 15
     services:

.gitignore

@@ -11,7 +11,6 @@ profile.coverprofile
 mysql_tester
 tests/integrationtest/integration-test.out
 tests/integrationtest/integrationtest_tidb-server
-tests/integrationtest/portgenerator
 tests/integrationtest/s/
 tests/integrationtest/replayer/
 *.fail.go

.golangci.yml

@@ -17,7 +17,7 @@ linters:
     - gosec
     - asciicheck
     - bodyclose
-    - exportloopref
+    - copyloopvar
     - rowserrcheck
     - makezero
     - durationcheck
@@ -26,6 +26,7 @@ linters:
     - revive
     - lll
     - gofmt
+    - intrange
 
 linters-settings:
   staticcheck:

Dockerfile

@@ -16,7 +16,7 @@
 # production environment, please refer to https://github.com/PingCAP-QE/artifacts/blob/main/dockerfiles/cd/builders/tidb/Dockerfile.
 
 # Builder image
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 WORKDIR /tidb
 
 COPY . .

Dockerfile.enterprise

@@ -14,7 +14,7 @@
 
 # The current dockerfile is only used for development purposes.
 # Builder image
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 WORKDIR /tidb
 
 COPY . .

Makefile.common

@@ -14,6 +14,7 @@
 
 PROJECT=tidb
 GOPATH ?= $(shell go env GOPATH)
+GOMODCACHE ?= $(shell go env GOMODCACHE)
 P=8
 
 # Ensure GOPATH is set before running build process.
@@ -132,4 +133,4 @@ ifneq ("$(CI)", "")
 endif
 BAZEL_INSTRUMENTATION_FILTER := --instrument_test_targets --instrumentation_filter=//pkg/...,//br/...,//dumpling/...
 
-NOGO_FLAG=true
+NOGO_FLAG=true

OWNERS

@@ -43,7 +43,6 @@ approvers:
   - guo-shaoge
   - hanfei1991
   - hawkingrei
-  - hi-rustin
   - hicqu
   - holys
   - hongyunyan
@@ -80,6 +79,7 @@ approvers:
   - qw4990
   - rebelice
   - Reminiscent
+  - Rustin170506
   - sdojjy
   - shenli
   - siddontang
@@ -98,6 +98,7 @@ approvers:
   - winoros
   - WizardXiao
   - wjhuang2016
+  - wk989898
   - wshwsh12
   - xhebox
   - xiongjiwei
@@ -127,6 +128,7 @@ reviewers:
   - dhysum
   - fengou1
   - fzzf678
+  - ghazalfamilyusa
   - iamxy
   - JmPotato
   - js00070
@@ -145,6 +147,7 @@ reviewers:
   - shihongzhi
   - spongedu
   - tangwz
+  - terry1purcell
   - Tjianke
   - TonsnakeLin
   - tsthght

OWNERS_ALIASES

@@ -2,13 +2,13 @@
 aliases:
   sig-critical-approvers-tidb-server:
     - yudongusa
-    - easonn7
+    - BenMeadowcroft
   sig-critical-approvers-tidb-lightning:
     - yudongusa
-    - easonn7
+    - BenMeadowcroft
   sig-critical-approvers-parser:
     - yudongusa
-    - easonn7
+    - BenMeadowcroft
   sig-approvers-autoid-service: # approvers for auto-id service
     - bb7133
     - tiancaiamao
@@ -40,10 +40,7 @@ aliases:
     - D3Hunter
     - gmhdbjd
     - lance6716
-    - lichunzhu
-    - okJiang
   sig-approvers-domain: # approvers for domain pkg
-    - zimulala
     - D3Hunter
     - gmhdbjd
     - lance6716
@@ -53,28 +50,24 @@ aliases:
     - Benjamin2037
     - tangenta
     - wjhuang2016
-    - ywqzzy
-    - zimulala
+    - D3Hunter
+    - gmhdbjd
+    - lance6716
   sig-approvers-disttask: # approvers for disttask pkg
     - Benjamin2037
     - D3Hunter
     - gmhdbjd
     - lance6716
     - tangenta
     - wjhuang2016
-    - ywqzzy
   sig-approvers-dumpling: # approvers for dumpling module
     - Benjamin2037
     - gmhdbjd
-    - lichunzhu
-    - okJiang
     - lance6716
     - tangenta
   sig-approvers-infoschema: # approvers for infoschema pkg
-    - zimulala
     - wjhuang2016
     - tangenta
-    - ywqzzy
     - D3Hunter
     - Benjamin2037
     - gmhdbjd
@@ -83,15 +76,13 @@ aliases:
     - gmhdbjd
     - tangenta
     - wjhuang2016
-    - ywqzzy
-    - zimulala    
+    - D3Hunter
+    - lance6716
   sig-approvers-owner: # approvers for `owner` pkg
     - Benjamin2037
-    - lichunzhu
     - tangenta
     - wjhuang2016
-    - ywqzzy
-    - zimulala
+    - D3Hunter
   sig-approvers-parser: # approvers for `parser` module.
     - bb7133
     - BornChanger
@@ -104,31 +95,27 @@ aliases:
     - lance6716
     - tangenta
     - wjhuang2016
-    - ywqzzy
   sig-approvers-table: # approvers for table packages.
     - Benjamin2037
     - cfzjywxk
     - gmhdbjd
     - tangenta
     - wjhuang2016
-    - ywqzzy
-    - zimulala
   sig-approvers-lock: # approvers for lock pkg
     - Benjamin2037
     - lance6716
     - tangenta
     - wjhuang2016
-    - zimulala
   sig-approvers-tidb-binlog: # approvers for tidb-binlog module
     - Benjamin2037
     - gmhdbjd
-    - lichunzhu
+    - lance6716
   sig-approvers-planner: # approvers for planner module
     - AilinKid
+    - Rustin170506
     - elsa0520
     - fixdb
     - hawkingrei
-    - hi-rustin
     - qw4990
     - time-and-fate
     - winoros