Merge remote-tracking branch 'upstream/master' into TestCompareReserv…

…edWordsWithMySQL_CI

.bazelrc

@@ -18,7 +18,6 @@ build:release --workspace_status_command=./build/print-workspace-status.sh --sta
 build:release --config=ci
 build:race --config=ci
 build:race --@io_bazel_rules_go//go/config:race --test_env=GORACE=halt_on_error=1 --test_sharding_strategy=disabled
-test --test_env=TZ=Asia/Shanghai
 test --test_output=errors --test_summary=detailed
 test:ci --color=yes
 test:ci --verbose_failures --test_verbose_timeout_warnings

.codecov.yml

@@ -72,22 +72,24 @@ flag_management:
 
 ignore:
   - "LICENSES"
-  - "*_test.go"
+  - "**/*_test.go"
   - ".git"
-  - "*.yml"
-  - "*.md"
-  - "cmd/.*"
-  - "docs/.*"
-  - "vendor/.*"
-  - "pkg/ddl/failtest/.*"
-  - "pkg/ddl/testutil/.*"
-  - "pkg/executor/seqtest/.*"
-  - "pkg/metrics/.*"
-  - "pkg/expression/generator/.*"
-  - "br/pkg/mock/.*"
-  - "pkg/testkit/.*"
-  - "pkg/server/internal/testutil/.*"
-  - "pkg/statistics/handle/cache/internal/testutil/.*"
+  - "**/*.yml"
+  - "**/*.md"
+  - "cmd"
+  - "docs"
+  - "vendor"
+  - "pkg/ddl/failtest"
+  - "pkg/ddl/testutil"
+  - "pkg/executor/seqtest"
+  - "pkg/metrics"
+  - "pkg/expression/generator"
+  - "br/pkg/mock"
+  - "pkg/testkit"
+  - "pkg/server/internal/testutil"
+  - "pkg/statistics/handle/cache/internal/testutil"
   - "pkg/session/testutil.go"
   - "pkg/store/mockstore/unistore/testutil.go"
+  - "k8s.io/apimachinery/pkg"
+  - "build"
 

.dockerignore

@@ -1,10 +1,8 @@
-.git/
 bazel-bin/
 bazel-out/
 bazel-tidb/
 bazel-testlogs/
 bin/
 tidb-server/tidb-server
 *.test.bin
-cmd/
 Dockerfile

.github/licenserc.yml

@@ -16,6 +16,8 @@ header:
     - "**/BUILD.bazel"
     - "WORKSPACE"
     - "WORKSPACE.patchgo"
+    - "MODULE.bazel"
+    - "MODULE.bazel.lock"
     - ".bazelrc"
     - "**/*.key"
     - "**/*.md"
@@ -28,6 +30,7 @@ header:
     - "**/*.example"
     - "**/*.patch"
     - "**/*.bzl"
+    - "**/.git/**"
     - ".codecov.yml"
     - "Jenkinsfile"
     - ".editorconfig"

.gitignore

@@ -6,14 +6,14 @@ coverage.out
 *.iml
 *.swp
 *.log
-*.test.bin
 tags
 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
 tools/bin/
 vendor
@@ -38,3 +38,6 @@ bazel-tidb
 .ijwb/
 /oom_record/
 *.log.json
+genkeyword
+test_coverage
+coverage.dat

Dockerfile

@@ -12,23 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# The current dockerfile is only used for development purposes. If used in a 
+# production environment, please refer to https://github.com/PingCAP-QE/artifacts/blob/main/dockerfiles/cd/builders/tidb/Dockerfile.
+
 # Builder image
-FROM rockylinux:9 as builder
-
-ENV GOLANG_VERSION 1.21.1
-ENV ARCH amd64
-ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
-ENV GOPATH /go
-ENV GOROOT /usr/local/go
-ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
-RUN yum update -y && yum groupinstall 'Development Tools' -y \
-    && curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
-	&& tar -C /usr/local -xzf golang.tar.gz \
-	&& rm golang.tar.gz
-
-COPY . /tidb
+FROM golang:1.21 as builder
+WORKDIR /tidb
+
+COPY . .
+
 ARG GOPROXY
-RUN export GOPROXY=${GOPROXY} && cd /tidb && make server
+ENV GOPROXY ${GOPROXY}
+
+RUN make server
+
 
 FROM rockylinux:9-minimal
 

Dockerfile.enterprise

@@ -12,23 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# The current dockerfile is only used for development purposes.
 # Builder image
-FROM rockylinux:9 as builder
+FROM golang:1.21 as builder
+WORKDIR /tidb
 
-ENV GOLANG_VERSION 1.21.1
-ENV ARCH amd64
-ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
-ENV GOPATH /go
-ENV GOROOT /usr/local/go
-ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
-RUN yum update -y && yum groupinstall 'Development Tools' -y \
-    && curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
-	&& tar -C /usr/local -xzf golang.tar.gz \
-	&& rm golang.tar.gz
+COPY . .
 
-COPY . /tidb
 ARG GOPROXY
-RUN export GOPROXY=${GOPROXY} && cd /tidb && make enterprise-server-build
+ENV GOPROXY ${GOPROXY}
+
+RUN make enterprise-server-build
 
 FROM rockylinux:9-minimal
 

MODULE.bazel

@@ -0,0 +1,6 @@
+###############################################################################
+# Bazel now uses Bzlmod by default to manage external dependencies.
+# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
+#
+# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
+###############################################################################