Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into add-bootstrap-sql
Browse files Browse the repository at this point in the history
* upstream/master: (1323 commits)
  ttl: escape parameters for finish job sql (pingcap#40118)
  statistics: fix incorrect datetime value when loading stats (pingcap#40084)
  planner: move code of generating IndexMergePath to a separated file (pingcap#40134)
  ddl: set context correctly in the setDDLLabelForDiagnosis (pingcap#40090)
  parser: fix cast function restore (pingcap#40129)
  ddl: fix issue of partition table with foreign key and add more test case (pingcap#40122)
  ddl: fix issue of add foreign key too slow in big table (pingcap#40112)
  *: support foreign key check/cascade when execute replace into statement (pingcap#40069)
  server: support download plan replayer continues capture file (pingcap#40085)
  statistics: fix the sync load sql did'nt running internally (pingcap#40087)
  *: optimize mpp probe (pingcap#39932)
  server: avoid reusing cached stmt ctx on cursor read (pingcap#40023)
  metrics: add metrics for ema cpu metrics and GOGC (pingcap#40049)
  *: filter particularly errors when `truncateAsWarning` is true (pingcap#40078)
  parser: support keep_order and no_keep_order hint (pingcap#39965)
  planner: check the `ignore-plan-cache` hint in insert-stmt (pingcap#40080)
  *: fix issue of multi-schema change with foreign key (pingcap#40042)
  sysvar: allow modifying 'tidb_allow_remove_auto_inc' when SEM is ON (pingcap#40083)
  ddl: check the limitation when creating multi-valued index  (pingcap#39818)
  planner: support set binding status by sql digest (pingcap#39517)
  ...
  • Loading branch information
morgo committed Dec 23, 2022
2 parents 08a96f8 + c61ef1d commit db4fe52
Show file tree
Hide file tree
Showing 2,110 changed files with 180,778 additions and 59,977 deletions.
28 changes: 20 additions & 8 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
startup --host_jvm_args=-Xmx8g
startup --unlimit_coredumps

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

run --color=yes
build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
build:ci --color=yes
build:ci --experimental_remote_cache_compression
build:release --workspace_status_command=./build/print-workspace-status.sh --stamp
build:release --config=ci
build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
build:ci --remote_cache=http://172.16.4.21:8080/tidb --remote_timeout="10s"
test:ci --verbose_failures
test:ci --test_env=GO_TEST_WRAP_TESTV=1 --test_verbose_timeout_warnings
test:ci --remote_cache=http://172.16.4.21:8080/tidb --remote_timeout="10s"
test:ci --test_env=TZ=Asia/Shanghai --test_output=errors --experimental_ui_max_stdouterr_bytes=104857600
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=testcase
test:ci --color=yes
test:ci --verbose_failures --test_verbose_timeout_warnings
test:ci --test_env=GO_TEST_WRAP_TESTV=1
test:ci --experimental_ui_max_stdouterr_bytes=104857600
test:race --test_timeout=1200,6000,18000,72000

try-import /data/bazel
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.3.2
10 changes: 10 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.git/
bazel-bin/
bazel-out/
bazel-tidb/
bazel-testlogs/
bin/
tidb-server/tidb-server
*.test.bin
cmd/
Dockerfile
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2
updates:
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "weekly"
day: "friday"
time: "18:00"
timezone: "Asia/Shanghai"
allow:
- dependency-name: "golang.org/*"
- dependency-name: "github.com/golangci/golangci-lint"
open-pull-requests-limit: 2

42 changes: 0 additions & 42 deletions .github/labeler.yml

This file was deleted.

71 changes: 37 additions & 34 deletions .github/licenserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,41 @@ header:
spdx-id: Apache-2.0
copyright-owner: PingCAP, Inc.
paths-ignore:
- 'docs/'
- 'br/'
- '.gitignore'
- '.gitattributes'
- '.golangci.yml'
- '.golangci_br.yml'
- 'LICENSES/'
- '**/BUILD.bazel'
- 'WORKSPACE'
- '.bazelrc'
- '**/*.key'
- '**/*.md'
- '**/*.json'
- '**/*.toml'
- '**/*.pem'
- '**/*.crt'
- '**/*.test'
- '**/*.result'
- '**/*.example'
- '**/*.patch'
- '**/*.bzl'
- '.codecov.yml'
- 'Jenkinsfile'
- '.editorconfig'
- 'hooks/pre-commit'
- '**/go.mod'
- '**/go.sum'
- 'LICENSE'
- '.github/'
- 'parser/'
- 'dumpling/'
- 'tidb-binlog/driver/example'
- 'tidb-binlog/proto/go-binlog/secondary_binlog.pb.go'
- '**/*.sql'
- "docs/"
- "br/"
- ".gitignore"
- ".dockerignore"
- ".gitattributes"
- ".cilinter.yaml"
- ".golangci.yml"
- ".golangci_br.yml"
- "LICENSES/"
- "**/BUILD.bazel"
- "WORKSPACE"
- ".bazelrc"
- "**/*.key"
- "**/*.md"
- "**/*.json"
- "**/*.toml"
- "**/*.pem"
- "**/*.crt"
- "**/*.test"
- "**/*.result"
- "**/*.example"
- "**/*.patch"
- "**/*.bzl"
- ".codecov.yml"
- "Jenkinsfile"
- ".editorconfig"
- "hooks/pre-commit"
- "**/go.mod"
- "**/go.sum"
- "LICENSE"
- ".github/"
- "parser/"
- "dumpling/"
- "tidb-binlog/driver/example"
- "tidb-binlog/proto/go-binlog/secondary_binlog.pb.go"
- "**/*.sql"
- ".bazelversion"
comment: on-failure
60 changes: 0 additions & 60 deletions .github/workflows/integration-test-br-compatibility.yml

This file was deleted.

51 changes: 27 additions & 24 deletions .github/workflows/integration-test-compile-br.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
name: BR & Lightning
name: BR & Lightning
on:
push:
branches:
- master
- 'release-[0-9].[0-9]*'
- "release-[0-9].[0-9]*"
paths:
- 'br/**'
- '!**.html'
- '!**.md'
- '!CNAME'
- '!LICENSE'
- '!br/docs/**'
- '!br/tests/**'
- '!br/docker/**'
#change trigger policy
- "br/**"
- "!**.html"
- "!**.md"
- "!CNAME"
- "!LICENSE"
- "!br/docs/**"
- "!br/tests/**"
- "!br/docker/**"
#change trigger policy
pull_request:
types:
- labeled # <--
- labeled # <--
branches:
- master
- 'release-[0-9].[0-9]*'
- "release-[0-9].[0-9]*"
paths:
- 'br/**'
- '!**.html'
- '!**.md'
- '!CNAME'
- '!LICENSE'
- '!br/docs/**'
- '!br/tests/**'
- '!br/docker/**'
- "br/**"
- "!**.html"
- "!**.md"
- "!CNAME"
- "!LICENSE"
- "!br/docs/**"
- "!br/tests/**"
- "!br/docker/**"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

permissions:
contents: read # to fetch code (actions/checkout)

jobs:
compile-windows:
if: github.event_name == 'push' || github.event_name == 'pull_request' && github.event.label.name == 'action/run-br-cross-platform-build'
Expand All @@ -45,13 +48,13 @@ jobs:
- uses: actions/[email protected]

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version-file: 'go.mod'

- name: Run build
run: make build_tools

compile:
if: github.event_name == 'pull_request' && github.event.label.name == 'action/run-br-cross-platform-build'
name: Compile for ${{ matrix.os }} / ${{ matrix.target}}
Expand Down
Loading

0 comments on commit db4fe52

Please sign in to comment.