Merge branch 'master' into session_inline_cte

pingcap · Sep 8, 2022 · 418e3c1 · 418e3c1
2 parents 1ff8838 + 0fb8ae8
commit 418e3c1
Show file tree

Hide file tree

Showing 149 changed files with 3,371 additions and 1,075 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
diff --git a/.github/licenserc.yml b/.github/licenserc.yml
@@ -3,39 +3,39 @@ header:
     spdx-id: Apache-2.0
     copyright-owner: PingCAP, Inc.
   paths-ignore:
-    - 'docs/'
-    - 'br/'
-    - '.gitignore'
-    - '.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'
+    - "docs/"
+    - "br/"
+    - ".gitignore"
+    - ".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"
   comment: on-failure
diff --git a/.github/workflows/integration-test-br-compatibility.yml b/.github/workflows/integration-test-br-compatibility.yml
@@ -2,19 +2,19 @@ name: BR / Compatibility Test
 
 on:
   push:
-  # merged git action
+    # merged git action
     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/**"
   # disable pull request only keep the merge action since it is very costly to run those tests
   # pull_request:
 
@@ -27,34 +27,33 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
-
-    - uses: actions/checkout@v2
-
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.18
-
-    - name: Generate compatibility test backup data
-      timeout-minutes: 15
-      run: sh br/compatibility/prepare_backup.sh
-
-    - name: Start server
-      run: |
-        TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml rm -s -v
-        TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml build
-        TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml up --remove-orphans -d
-        TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml exec -T control go mod tidy 
-        TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml exec -T control make build_br
-        TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml exec -T control br/tests/run_compatible.sh run
-
-    - name: Collect component log
-      if: ${{ failure() }}
-      run: |
-        tar czvf ${{ github.workspace }}/logs.tar.gz /tmp/br/docker/backup_logs/*
-
-    - uses: actions/upload-artifact@v2
-      if: ${{ failure() }}
-      with:
-        name: logs
-        path: ${{ github.workspace }}/logs.tar.gz
+      - uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: 'go.mod'
+
+      - name: Generate compatibility test backup data
+        timeout-minutes: 15
+        run: sh br/compatibility/prepare_backup.sh
+
+      - name: Start server
+        run: |
+          TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml rm -s -v
+          TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml build
+          TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml up --remove-orphans -d
+          TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml exec -T control go mod tidy 
+          TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml exec -T control make build_br
+          TAG=nightly PORT_SUFFIX=1 docker-compose -f br/compatibility/backup_cluster.yaml exec -T control br/tests/run_compatible.sh run
+
+      - name: Collect component log
+        if: ${{ failure() }}
+        run: |
+          tar czvf ${{ github.workspace }}/logs.tar.gz /tmp/br/docker/backup_logs/*
+
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: logs
+          path: ${{ github.workspace }}/logs.tar.gz
diff --git a/.github/workflows/integration-test-compile-br.yml b/.github/workflows/integration-test-compile-br.yml
@@ -1,34 +1,34 @@
-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 }}
 
@@ -45,13 +45,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}}

diff --git a/.github/workflows/integration-test-dumpling-common.yml b/.github/workflows/integration-test-dumpling-common.yml