Skip to content

Commit c15e81f

Browse files
dveedendveeden
committed
Merge remote-tracking branch 'upstream/master' into TestCompareReservedWordsWithMySQL_CI
2 parents b971527 + 6c4b1ea commit c15e81f

File tree

1,682 files changed

+86624
-49571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,682 files changed

+86624
-49571
lines changed

‎.bazelrc

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ build:release --workspace_status_command=./build/print-workspace-status.sh --sta
1818
build:release --config=ci
1919
build:race --config=ci
2020
build:race --@io_bazel_rules_go//go/config:race --test_env=GORACE=halt_on_error=1 --test_sharding_strategy=disabled
21-
test --test_env=TZ=Asia/Shanghai
2221
test --test_output=errors --test_summary=detailed
2322
test:ci --color=yes
2423
test:ci --verbose_failures --test_verbose_timeout_warnings

‎.codecov.yml

+17-15
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,24 @@ flag_management:
7272

7373
ignore:
7474
- "LICENSES"
75-
- "*_test.go"
75+
- "**/*_test.go"
7676
- ".git"
77-
- "*.yml"
78-
- "*.md"
79-
- "cmd/.*"
80-
- "docs/.*"
81-
- "vendor/.*"
82-
- "pkg/ddl/failtest/.*"
83-
- "pkg/ddl/testutil/.*"
84-
- "pkg/executor/seqtest/.*"
85-
- "pkg/metrics/.*"
86-
- "pkg/expression/generator/.*"
87-
- "br/pkg/mock/.*"
88-
- "pkg/testkit/.*"
89-
- "pkg/server/internal/testutil/.*"
90-
- "pkg/statistics/handle/cache/internal/testutil/.*"
77+
- "**/*.yml"
78+
- "**/*.md"
79+
- "cmd"
80+
- "docs"
81+
- "vendor"
82+
- "pkg/ddl/failtest"
83+
- "pkg/ddl/testutil"
84+
- "pkg/executor/seqtest"
85+
- "pkg/metrics"
86+
- "pkg/expression/generator"
87+
- "br/pkg/mock"
88+
- "pkg/testkit"
89+
- "pkg/server/internal/testutil"
90+
- "pkg/statistics/handle/cache/internal/testutil"
9191
- "pkg/session/testutil.go"
9292
- "pkg/store/mockstore/unistore/testutil.go"
93+
- "k8s.io/apimachinery/pkg"
94+
- "build"
9395

‎.dockerignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
.git/
21
bazel-bin/
32
bazel-out/
43
bazel-tidb/
54
bazel-testlogs/
65
bin/
76
tidb-server/tidb-server
87
*.test.bin
9-
cmd/
108
Dockerfile

‎.github/licenserc.yml

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ header:
1616
- "**/BUILD.bazel"
1717
- "WORKSPACE"
1818
- "WORKSPACE.patchgo"
19+
- "MODULE.bazel"
20+
- "MODULE.bazel.lock"
1921
- ".bazelrc"
2022
- "**/*.key"
2123
- "**/*.md"
@@ -28,6 +30,7 @@ header:
2830
- "**/*.example"
2931
- "**/*.patch"
3032
- "**/*.bzl"
33+
- "**/.git/**"
3134
- ".codecov.yml"
3235
- "Jenkinsfile"
3336
- ".editorconfig"

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ coverage.out
66
*.iml
77
*.swp
88
*.log
9-
*.test.bin
109
tags
1110
profile.coverprofile
1211
mysql_tester
1312
tests/integrationtest/integration-test.out
1413
tests/integrationtest/integrationtest_tidb-server
1514
tests/integrationtest/portgenerator
1615
tests/integrationtest/s/
16+
tests/integrationtest/replayer/
1717
*.fail.go
1818
tools/bin/
1919
vendor
@@ -38,3 +38,6 @@ bazel-tidb
3838
.ijwb/
3939
/oom_record/
4040
*.log.json
41+
genkeyword
42+
test_coverage
43+
coverage.dat

‎DEPS.bzl

+1,368-1,429
Large diffs are not rendered by default.

‎Dockerfile

+12-15
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# The current dockerfile is only used for development purposes. If used in a
16+
# production environment, please refer to https://github.com/PingCAP-QE/artifacts/blob/main/dockerfiles/cd/builders/tidb/Dockerfile.
17+
1518
# Builder image
16-
FROM rockylinux:9 as builder
17-
18-
ENV GOLANG_VERSION 1.21.1
19-
ENV ARCH amd64
20-
ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
21-
ENV GOPATH /go
22-
ENV GOROOT /usr/local/go
23-
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
24-
RUN yum update -y && yum groupinstall 'Development Tools' -y \
25-
&& curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
26-
&& tar -C /usr/local -xzf golang.tar.gz \
27-
&& rm golang.tar.gz
28-
29-
COPY . /tidb
19+
FROM golang:1.21 as builder
20+
WORKDIR /tidb
21+
22+
COPY . .
23+
3024
ARG GOPROXY
31-
RUN export GOPROXY=${GOPROXY} && cd /tidb && make server
25+
ENV GOPROXY ${GOPROXY}
26+
27+
RUN make server
28+
3229

3330
FROM rockylinux:9-minimal
3431

‎Dockerfile.enterprise

+7-13
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,17 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# The current dockerfile is only used for development purposes.
1516
# Builder image
16-
FROM rockylinux:9 as builder
17+
FROM golang:1.21 as builder
18+
WORKDIR /tidb
1719

18-
ENV GOLANG_VERSION 1.21.1
19-
ENV ARCH amd64
20-
ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
21-
ENV GOPATH /go
22-
ENV GOROOT /usr/local/go
23-
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
24-
RUN yum update -y && yum groupinstall 'Development Tools' -y \
25-
&& curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
26-
&& tar -C /usr/local -xzf golang.tar.gz \
27-
&& rm golang.tar.gz
20+
COPY . .
2821

29-
COPY . /tidb
3022
ARG GOPROXY
31-
RUN export GOPROXY=${GOPROXY} && cd /tidb && make enterprise-server-build
23+
ENV GOPROXY ${GOPROXY}
24+
25+
RUN make enterprise-server-build
3226

3327
FROM rockylinux:9-minimal
3428

‎MODULE.bazel

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

0 commit comments

Comments
 (0)