From 0dc9ab3cfbba7261d16b9dce81f1b2f6606b21e1 Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 07:39:13 +0800
Subject: [PATCH 1/7] ci: merge race UT and BVT coverage artifacts

---
 .github/workflows/ci.yaml             |  14 +++-
 .github/workflows/e2e-compose.yaml    |  30 ++++++-
 .github/workflows/e2e-standalone.yaml |  76 ++++++++++++++++-
 .github/workflows/utils.yaml          | 114 +++++++++++++++++++++++++-
 4 files changed, 225 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f87a1f7..e2e45d0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -122,8 +122,20 @@ jobs:
       - name: Unit Testing
         id: ut
         run: |
+          set -euo pipefail
+          coverage_dir="${RUNNER_TEMP}/race-ut-coverage"
+          rm -rf "${coverage_dir}"
+          mkdir -p "${coverage_dir}"
           cd $GITHUB_WORKSPACE && make clean && make config
-          make ut UT_PARALLEL=${{ vars.UT_PARALLEL || 6 }} UT_TIMEOUT=${{ vars.UT_TIMEOUT || 40 }}
+          make ut UT_PARALLEL=${{ vars.UT_PARALLEL || 6 }} UT_TIMEOUT=${{ vars.UT_TIMEOUT || 40 }} UT_COVERAGE_DIR="${coverage_dir}"
+      - name: Upload race UT coverage
+        if: ${{ success() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: race-ut-coverage
+          path: ${{ runner.temp }}/race-ut-coverage/ut-race-*.out
+          if-no-files-found: error
+          retention-days: 7
       - name: Print Result(Old)
         if: ${{ always() }}
         continue-on-error: true
diff --git a/.github/workflows/e2e-compose.yaml b/.github/workflows/e2e-compose.yaml
index 4ffc3ab..f8acb55 100644
--- a/.github/workflows/e2e-compose.yaml
+++ b/.github/workflows/e2e-compose.yaml
@@ -224,6 +224,10 @@ jobs:
       - name: docker compose launch-multi-cn
         timeout-minutes: 10
         run: |
+          set -euo pipefail
+          export GOCOVERDIR="${GITHUB_WORKSPACE}/coverage"
+          rm -rf "${GOCOVERDIR}"
+          mkdir -p "${GOCOVERDIR}"
           cat ./etc/launch-tae-compose/config/cn-0.toml
           cat ./etc/launch-tae-compose/config/cn-1.toml
           cat ./etc/launch-tae-compose/config/tn.toml
@@ -234,7 +238,7 @@ jobs:
           sed -i 's|:/test\b|:'"$GITHUB_WORKSPACE"'/test|g' ./etc/launch-tae-compose/compose.yaml
 
           # build matrixone docker image first
-          docker build -t matrixorigin/matrixone:latest . -f ./optools/images/Dockerfile
+          docker build --build-arg GOBUILD_OPT=-cover -t matrixorigin/matrixone:latest . -f ./optools/images/Dockerfile
 
           mkdir -p ${{ github.workspace }}/docker-compose-log
           docker compose -f etc/launch-tae-compose/compose.yaml --profile launch-multi-cn up -d
@@ -332,6 +336,30 @@ jobs:
           docker compose -f etc/launch-tae-compose/compose.yaml --profile launch-multi-cn down --remove-orphans
           docker volume rm launch-tae-compose_minio_storage
 
+      - name: Generate compose BVT coverage profile
+        if: ${{ always() && !cancelled() }}
+        run: |
+          set -uo pipefail
+          coverage_dir="${GITHUB_WORKSPACE}/coverage"
+          sudo chown -R "$(id -u):$(id -g)" "${coverage_dir}" || true
+          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_dir}/bvt-compose.out"; then
+            test -s "${coverage_dir}/bvt-compose.out"
+          elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
+            echo "::error::failed to generate compose BVT coverage after a successful BVT"
+            exit 1
+          else
+            echo "::warning::compose BVT coverage unavailable because BVT did not finish successfully"
+          fi
+
+      - name: Upload compose BVT coverage
+        if: ${{ always() && !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: bvt-coverage-compose
+          path: ${{ github.workspace }}/coverage/bvt-compose.out
+          if-no-files-found: warn
+          retention-days: 7
+
       - uses: actions/upload-artifact@v7
         if: ${{ failure() || cancelled()}}
         continue-on-error: true
diff --git a/.github/workflows/e2e-standalone.yaml b/.github/workflows/e2e-standalone.yaml
index 1ecbb25..d6d02a0 100644
--- a/.github/workflows/e2e-standalone.yaml
+++ b/.github/workflows/e2e-standalone.yaml
@@ -29,7 +29,7 @@ jobs:
           go-version-file: "${{ github.workspace }}/head/go.mod"
       - name: Build MatrixOne
         run: |
-          cd $GITHUB_WORKSPACE/head && make clean && make build
+          cd $GITHUB_WORKSPACE/head && make clean && make GOBUILD_OPT=-cover build
           git rev-parse --short HEAD
       - name: echo config
         run: |
@@ -182,6 +182,9 @@ jobs:
         run: |
           sudo cat /etc/hosts | grep '127.0.0.1';
           cd $GITHUB_WORKSPACE/head
+          export GOCOVERDIR="${RUNNER_TEMP}/bvt-coverage-proxy"
+          rm -rf "${GOCOVERDIR}"
+          mkdir -p "${GOCOVERDIR}"
           ./optools/run_bvt.sh $GITHUB_WORKSPACE/head launch-dynamic-with-proxy -with-proxy
       - name: Clone test-tool repository
         uses: actions/checkout@v6
@@ -214,6 +217,39 @@ jobs:
           cd $GITHUB_WORKSPACE/head
           # one node in one Process
           ./optools/check_log_count.sh 1000 60 # {count threshold} {metric collected interval}
+      - name: Generate proxy BVT coverage profile
+        if: ${{ always() && !cancelled() }}
+        run: |
+          set -uo pipefail
+          coverage_dir="${RUNNER_TEMP}/bvt-coverage-proxy"
+          pids=$(pgrep -f 'mo-service' || true)
+          if [ -n "${pids}" ]; then
+            kill -TERM ${pids} || true
+          fi
+          for _ in $(seq 1 30); do
+            pgrep -f 'mo-service' >/dev/null || break
+            sleep 1
+          done
+          pids=$(pgrep -f 'mo-service' || true)
+          if [ -n "${pids}" ]; then
+            kill -KILL ${pids} || true
+          fi
+          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_dir}/bvt-proxy.out"; then
+            test -s "${coverage_dir}/bvt-proxy.out"
+          elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
+            echo "::error::failed to generate proxy BVT coverage after a successful BVT"
+            exit 1
+          else
+            echo "::warning::proxy BVT coverage unavailable because BVT did not finish successfully"
+          fi
+      - name: Upload proxy BVT coverage
+        if: ${{ always() && !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: bvt-coverage-proxy
+          path: ${{ runner.temp }}/bvt-coverage-proxy/bvt-proxy.out
+          if-no-files-found: warn
+          retention-days: 7
       - name: generate upload files
         if: ${{ always() }}
         continue-on-error: true
@@ -256,7 +292,7 @@ jobs:
 
       - name: Build MatrixOne
         run: |
-          cd $GITHUB_WORKSPACE/head && make clean && make build
+          cd $GITHUB_WORKSPACE/head && make clean && make GOBUILD_OPT=-cover build
           git rev-parse --short HEAD
 
       - name: Add cn.txn
@@ -275,6 +311,9 @@ jobs:
       - name: Start MO
         run: |
           cd $GITHUB_WORKSPACE/head
+          export GOCOVERDIR="${RUNNER_TEMP}/bvt-coverage-pessimistic"
+          rm -rf "${GOCOVERDIR}"
+          mkdir -p "${GOCOVERDIR}"
           ./optools/run_bvt.sh $GITHUB_WORKSPACE/head launch
 
       - name: Clone test-tool repository
@@ -311,10 +350,39 @@ jobs:
           # 4 nodes in one Process
           ./optools/check_log_count.sh 4000 60 # {count threshold} {metric collected interval}
 
-      - name: Check mo-service Status
+      - name: Generate pessimistic BVT coverage profile
         if: ${{ always() && !cancelled() }}
         run: |
-          if [ "$(ps -ef | grep 'mo-service' | grep -v "grep" | wc -l)" -gt 0 ]; then pkill -9 mo-service; else echo 'current mo-service has already crashed'; exit 1; fi
+          set -uo pipefail
+          coverage_dir="${RUNNER_TEMP}/bvt-coverage-pessimistic"
+          pids=$(pgrep -f 'mo-service' || true)
+          if [ -n "${pids}" ]; then
+            kill -TERM ${pids} || true
+          fi
+          for _ in $(seq 1 30); do
+            pgrep -f 'mo-service' >/dev/null || break
+            sleep 1
+          done
+          pids=$(pgrep -f 'mo-service' || true)
+          if [ -n "${pids}" ]; then
+            kill -KILL ${pids} || true
+          fi
+          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_dir}/bvt-pessimistic.out"; then
+            test -s "${coverage_dir}/bvt-pessimistic.out"
+          elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
+            echo "::error::failed to generate pessimistic BVT coverage after a successful BVT"
+            exit 1
+          else
+            echo "::warning::pessimistic BVT coverage unavailable because BVT did not finish successfully"
+          fi
+      - name: Upload pessimistic BVT coverage
+        if: ${{ always() && !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: bvt-coverage-pessimistic
+          path: ${{ runner.temp }}/bvt-coverage-pessimistic/bvt-pessimistic.out
+          if-no-files-found: warn
+          retention-days: 7
 
       - name: generate upload files
         if: ${{ always() }}
diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml
index 52d3d37..f2b8661 100644
--- a/.github/workflows/utils.yaml
+++ b/.github/workflows/utils.yaml
@@ -88,9 +88,11 @@ jobs:
             echo "safe_label=0" >> $GITHUB_OUTPUT;
           fi
 
-  pr_coverage:
-    if: ${{ needs.check_organization_user.outputs.safe_label == '1' || needs.check_organization_user.outputs.in_org == '1' }}
-    name: Coverage
+  pr_coverage_legacy_disabled:
+    # Replaced by coverage_merge below. Keep the old definition temporarily so
+    # its failure-analysis history remains easy to compare during rollout.
+    if: ${{ github.event.pull_request.number == 0 }}
+    name: Legacy serial coverage (disabled)
     needs: [check_organization_user]
     environment: ci
     # if you change runner, must modify L117
@@ -449,6 +451,112 @@ jobs:
             ${{ github.workspace }}/merged_coverage.out
           retention-days: 7
 
+  coverage_merge:
+    if: ${{ needs.check_organization_user.outputs.safe_label == '1' || needs.check_organization_user.outputs.in_org == '1' }}
+    name: Coverage
+    needs: [check_organization_user]
+    environment: ci
+    runs-on: amd64-mo-guangzhou-2xlarge16
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          token: ${{ secrets.TOKEN_ACTION }}
+          fetch-depth: "1"
+          path: ./matrixone
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Checkout coverage parser
+        uses: actions/checkout@v6
+        with:
+          token: ${{ secrets.TOKEN_ACTION }}
+          repository: matrixorigin/CI
+          fetch-depth: "1"
+          path: ./CI
+
+      - name: Set up Go
+        uses: matrixorigin/CI/actions/setup-env@main
+        with:
+          setup-java: false
+          go-version-file: "${{ github.workspace }}/matrixone/go.mod"
+
+      - name: Generate diff.patch
+        env:
+          GH_TOKEN: ${{ secrets.TOKEN_ACTION }}
+          IS_PUB_REPO: ${{ vars.IS_PUB_REPO }}
+        run: |
+          set -euo pipefail
+          cd "$GITHUB_WORKSPACE/matrixone"
+          if [ -n "${IS_PUB_REPO:-}" ] && [ "${IS_PUB_REPO}" != "0" ] && [ "${IS_PUB_REPO}" != "false" ]; then
+            curl -fL --retry 5 --retry-delay 3 \
+              "https://github.com/${{ github.event.pull_request.base.repo.full_name }}/pull/${{ github.event.pull_request.number }}.diff" \
+              -o diff.patch
+          else
+            curl -fL --retry 5 --retry-delay 3 \
+              -H "Accept: application/vnd.github.v3.diff" \
+              -H "Authorization: Bearer ${GH_TOKEN}" \
+              "https://api.github.com/repos/${{ github.event.pull_request.base.repo.full_name }}/pulls/${{ github.event.pull_request.number }}" \
+              -o diff.patch
+          fi
+
+      - name: Download test coverage artifacts
+        uses: actions/download-artifact@v7
+        with:
+          pattern: '*-coverage*'
+          merge-multiple: true
+          path: ${{ github.workspace }}/coverage-artifacts
+
+      - name: Merge UT and BVT coverage
+        run: |
+          set -euo pipefail
+          artifact_dir="$GITHUB_WORKSPACE/coverage-artifacts"
+          processed_dir="$GITHUB_WORKSPACE/coverage-processed"
+          mkdir -p "${processed_dir}"
+
+          mapfile -t ut_profiles < <(find "${artifact_dir}" -type f -name 'ut-race-*.out' | sort)
+          mapfile -t bvt_profiles < <(find "${artifact_dir}" -type f -name 'bvt-*.out' | sort)
+          if [ "${#ut_profiles[@]}" -eq 0 ]; then
+            echo "::error::race UT coverage artifact is missing"
+            exit 1
+          fi
+          if [ "${#bvt_profiles[@]}" -lt 3 ]; then
+            echo "::error::expected coverage from proxy, pessimistic, and compose BVT; found ${#bvt_profiles[@]} profile(s)"
+            find "${artifact_dir}" -type f -print || true
+            exit 1
+          fi
+
+          coverage_files=()
+          for profile in "${ut_profiles[@]}"; do
+            output="${processed_dir}/$(basename "${profile}")"
+            grep -Ev 'pkg/pb|pkg/sql/parsers/goyacc|yaccpar' "${profile}" > "${output}" || true
+            test -s "${output}"
+            coverage_files+=("${output}")
+          done
+          for profile in "${bvt_profiles[@]}"; do
+            output="${processed_dir}/$(basename "${profile}")"
+            grep -Ev 'pkg/pb|yaccpar' "${profile}" > "${output}" || true
+            test -s "${output}"
+            coverage_files+=("${output}")
+          done
+
+          cd "$GITHUB_WORKSPACE"
+          python CI/scripts/parse_coverage.py \
+            -coverage_files "${coverage_files[@]}" \
+            -diff_path "$GITHUB_WORKSPACE/matrixone/diff.patch"
+          go tool cover -o "$GITHUB_WORKSPACE/matrixone/pr_coverage.html" -html=merged_coverage.out
+
+      - name: Upload coverage result
+        if: ${{ always() && !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: final-result-files
+          path: |
+            ${{ github.workspace }}/matrixone/pr_coverage.html
+            ${{ github.workspace }}/pr_coverage.out
+            ${{ github.workspace }}/merged_coverage.out
+            ${{ github.workspace }}/coverage-artifacts
+          retention-days: 7
+
   pr-size-label:
     environment: ci
     runs-on: arm64-mo-shanghai-4c8g

From 33c8b43fc8b490438b7640cdbdedc07051a782ec Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 07:42:20 +0800
Subject: [PATCH 2/7] ci: add coverage integration dispatch workflow

---
 .github/workflows/ci.yaml                   | 21 ++++++---
 .github/workflows/coverage-integration.yaml | 50 +++++++++++++++++++++
 .github/workflows/e2e-compose.yaml          | 19 +++++---
 .github/workflows/e2e-standalone.yaml       | 21 ++++++---
 .github/workflows/utils.yaml                | 36 ++++++++++++---
 5 files changed, 124 insertions(+), 23 deletions(-)
 create mode 100644 .github/workflows/coverage-integration.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e2e45d0..f683d67 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,6 +3,15 @@ name: MatrixOne CI
 
 on:
   workflow_call:
+    inputs:
+      repository:
+        description: "Optional MatrixOne repository override for manual integration runs"
+        required: false
+        type: string
+      ref:
+        description: "Optional MatrixOne ref override for manual integration runs"
+        required: false
+        type: string
     secrets:
       TOKEN_ACTION:
         description: "Token for checkout (e.g. pull from fork/private)"
@@ -103,8 +112,8 @@ jobs:
         with:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Set up Go
         uses: matrixorigin/CI/actions/setup-env@main
         with:
@@ -196,8 +205,8 @@ jobs:
         with:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Set up Go
         uses: matrixorigin/CI/actions/setup-env@main
         with:
@@ -235,8 +244,8 @@ jobs:
         with:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - uses: thiagodnf/yaml-schema-checker@v0.0.12
         name: Check Issue Template
         with:
diff --git a/.github/workflows/coverage-integration.yaml b/.github/workflows/coverage-integration.yaml
new file mode 100644
index 0000000..4652cfb
--- /dev/null
+++ b/.github/workflows/coverage-integration.yaml
@@ -0,0 +1,50 @@
+name: MatrixOne coverage integration
+
+on:
+  workflow_dispatch:
+    inputs:
+      repository:
+        description: MatrixOne repository to test
+        required: true
+        default: matrixorigin/matrixone
+        type: string
+      ref:
+        description: MatrixOne branch or SHA to test
+        required: true
+        type: string
+      pr_number:
+        description: MatrixOne PR number used for the diff coverage gate
+        required: true
+        type: string
+
+jobs:
+  matrixone-ci:
+    uses: ./.github/workflows/ci.yaml
+    with:
+      repository: ${{ inputs.repository }}
+      ref: ${{ inputs.ref }}
+    secrets: inherit
+
+  matrixone-compose-ci:
+    uses: ./.github/workflows/e2e-compose.yaml
+    with:
+      repository: ${{ inputs.repository }}
+      ref: ${{ inputs.ref }}
+    secrets: inherit
+
+  matrixone-standalone-ci:
+    uses: ./.github/workflows/e2e-standalone.yaml
+    with:
+      repository: ${{ inputs.repository }}
+      ref: ${{ inputs.ref }}
+    secrets: inherit
+
+  matrixone-utils-ci:
+    needs: [matrixone-ci, matrixone-compose-ci, matrixone-standalone-ci]
+    if: ${{ always() }}
+    uses: ./.github/workflows/utils.yaml
+    with:
+      repository: ${{ inputs.repository }}
+      ref: ${{ inputs.ref }}
+      pr_number: ${{ inputs.pr_number }}
+    secrets: inherit
diff --git a/.github/workflows/e2e-compose.yaml b/.github/workflows/e2e-compose.yaml
index f8acb55..063f751 100644
--- a/.github/workflows/e2e-compose.yaml
+++ b/.github/workflows/e2e-compose.yaml
@@ -2,6 +2,15 @@ name: MatrixOne Compose Test
 
 on:
   workflow_call:
+    inputs:
+      repository:
+        description: "Optional MatrixOne repository override for manual integration runs"
+        required: false
+        type: string
+      ref:
+        description: "Optional MatrixOne ref override for manual integration runs"
+        required: false
+        type: string
     secrets:
       TOKEN_ACTION:
         description: "Token for checkout (e.g. pull from fork/private)"
@@ -30,8 +39,8 @@ jobs:
         with:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Set up Go And Java
         uses: matrixorigin/CI/actions/setup-env@main
         with:
@@ -181,7 +190,7 @@ jobs:
           retention-days: 7
 
   multi-CN-bvt-docker-compose-pessimistic:
-    if: ${{ !github.event.pull_request.draft }}
+    if: ${{ inputs.repository != '' || !github.event.pull_request.draft }}
     environment: ci
     runs-on: ${{ vars.RUNNER_LABEL || 'ubuntu-22.04' }}
     name: multi cn e2e bvt test docker compose(PESSIMISTIC)
@@ -201,8 +210,8 @@ jobs:
         with:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Set up Go And Java
         uses: matrixorigin/CI/actions/setup-env@main
         with:
diff --git a/.github/workflows/e2e-standalone.yaml b/.github/workflows/e2e-standalone.yaml
index d6d02a0..fae3c5d 100644
--- a/.github/workflows/e2e-standalone.yaml
+++ b/.github/workflows/e2e-standalone.yaml
@@ -2,6 +2,15 @@ name: MatrixOne e2e CI(Standalone)
 
 on:
   workflow_call:
+    inputs:
+      repository:
+        description: "Optional MatrixOne repository override for manual integration runs"
+        required: false
+        type: string
+      ref:
+        description: "Optional MatrixOne ref override for manual integration runs"
+        required: false
+        type: string
     secrets:
       TOKEN_ACTION:
         description: "Token for checkout (e.g. pull from fork/private)"
@@ -21,8 +30,8 @@ jobs:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
           path: ./head
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Set up Go And Java
         uses: matrixorigin/CI/actions/setup-env@main
         with:
@@ -156,8 +165,8 @@ jobs:
         with:
           token: ${{ secrets.TOKEN_ACTION }}
           path: ./head
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Set up Go And Java
         uses: matrixorigin/CI/actions/setup-env@main
         with:
@@ -282,8 +291,8 @@ jobs:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "3"
           path: ./head
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
 
       - name: Set up Go And Java
         uses: matrixorigin/CI/actions/setup-env@main
diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml
index f2b8661..171380c 100644
--- a/.github/workflows/utils.yaml
+++ b/.github/workflows/utils.yaml
@@ -3,6 +3,19 @@ name: MatrixOne Utils CI
 
 on:
   workflow_call:
+    inputs:
+      repository:
+        description: "Optional MatrixOne repository override for manual integration runs"
+        required: false
+        type: string
+      ref:
+        description: "Optional MatrixOne ref override for manual integration runs"
+        required: false
+        type: string
+      pr_number:
+        description: "Optional MatrixOne PR number override for manual integration runs"
+        required: false
+        type: string
     secrets:
       TOKEN_ACTION:
         description: "A token passed from the caller workflow"
@@ -52,6 +65,10 @@ jobs:
       - id: check_in_org
         name: CHECK ORGANIZATION USER
         run: |
+          if [ -n "${{ inputs.repository }}" ]; then
+            echo "in_org=1" >> $GITHUB_OUTPUT;
+            exit 0;
+          fi
           PAGE=1;
           PER_PAGE=100;
           USER_IN_ORG="0";
@@ -77,6 +94,10 @@ jobs:
       - id: check_safe_label
         name: CHECK PULL REQUEST LABEL
         run: |
+          if [ -n "${{ inputs.repository }}" ]; then
+            echo "safe_label=1" >> $GITHUB_OUTPUT;
+            exit 0;
+          fi
           labels=$(curl -L \
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${{ secrets.TOKEN_ACTION }}" \
@@ -103,8 +124,8 @@ jobs:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "1"
           path: ./matrixone
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
       - name: Clone test-tool repository
         uses: actions/checkout@v6
         with:
@@ -463,8 +484,8 @@ jobs:
           token: ${{ secrets.TOKEN_ACTION }}
           fetch-depth: "1"
           path: ./matrixone
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
 
       - name: Checkout coverage parser
         uses: actions/checkout@v6
@@ -487,15 +508,17 @@ jobs:
         run: |
           set -euo pipefail
           cd "$GITHUB_WORKSPACE/matrixone"
+          pr_repo="${{ inputs.repository || github.event.pull_request.base.repo.full_name }}"
+          pr_number="${{ inputs.pr_number || github.event.pull_request.number }}"
           if [ -n "${IS_PUB_REPO:-}" ] && [ "${IS_PUB_REPO}" != "0" ] && [ "${IS_PUB_REPO}" != "false" ]; then
             curl -fL --retry 5 --retry-delay 3 \
-              "https://github.com/${{ github.event.pull_request.base.repo.full_name }}/pull/${{ github.event.pull_request.number }}.diff" \
+              "https://github.com/${pr_repo}/pull/${pr_number}.diff" \
               -o diff.patch
           else
             curl -fL --retry 5 --retry-delay 3 \
               -H "Accept: application/vnd.github.v3.diff" \
               -H "Authorization: Bearer ${GH_TOKEN}" \
-              "https://api.github.com/repos/${{ github.event.pull_request.base.repo.full_name }}/pulls/${{ github.event.pull_request.number }}" \
+              "https://api.github.com/repos/${pr_repo}/pulls/${pr_number}" \
               -o diff.patch
           fi
 
@@ -558,6 +581,7 @@ jobs:
           retention-days: 7
 
   pr-size-label:
+    if: ${{ inputs.repository == '' }}
     environment: ci
     runs-on: arm64-mo-shanghai-4c8g
     needs: [check_organization_user]

From 38ce2218e502fe2679a3a4166e7ad773cefd7ebe Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 07:42:56 +0800
Subject: [PATCH 3/7] ci: run coverage integration harness on validation branch

---
 .github/workflows/coverage-integration.yaml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/coverage-integration.yaml b/.github/workflows/coverage-integration.yaml
index 4652cfb..62bb9a4 100644
--- a/.github/workflows/coverage-integration.yaml
+++ b/.github/workflows/coverage-integration.yaml
@@ -1,6 +1,9 @@
 name: MatrixOne coverage integration
 
 on:
+  push:
+    branches:
+      - xp/ci-race-coverage-artifacts
   workflow_dispatch:
     inputs:
       repository:
@@ -21,22 +24,22 @@ jobs:
   matrixone-ci:
     uses: ./.github/workflows/ci.yaml
     with:
-      repository: ${{ inputs.repository }}
-      ref: ${{ inputs.ref }}
+      repository: ${{ inputs.repository || 'matrixorigin/matrixone' }}
+      ref: ${{ inputs.ref || 'xp/ci-race-coverage-artifacts' }}
     secrets: inherit
 
   matrixone-compose-ci:
     uses: ./.github/workflows/e2e-compose.yaml
     with:
-      repository: ${{ inputs.repository }}
-      ref: ${{ inputs.ref }}
+      repository: ${{ inputs.repository || 'matrixorigin/matrixone' }}
+      ref: ${{ inputs.ref || 'xp/ci-race-coverage-artifacts' }}
     secrets: inherit
 
   matrixone-standalone-ci:
     uses: ./.github/workflows/e2e-standalone.yaml
     with:
-      repository: ${{ inputs.repository }}
-      ref: ${{ inputs.ref }}
+      repository: ${{ inputs.repository || 'matrixorigin/matrixone' }}
+      ref: ${{ inputs.ref || 'xp/ci-race-coverage-artifacts' }}
     secrets: inherit
 
   matrixone-utils-ci:
@@ -44,7 +47,7 @@ jobs:
     if: ${{ always() }}
     uses: ./.github/workflows/utils.yaml
     with:
-      repository: ${{ inputs.repository }}
-      ref: ${{ inputs.ref }}
-      pr_number: ${{ inputs.pr_number }}
+      repository: ${{ inputs.repository || 'matrixorigin/matrixone' }}
+      ref: ${{ inputs.ref || 'xp/ci-race-coverage-artifacts' }}
+      pr_number: ${{ inputs.pr_number || '26179' }}
     secrets: inherit

From 8b3a2c7cbcc1b5873c8ced3c65cc4f02d72c6465 Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 09:24:12 +0800
Subject: [PATCH 4/7] ci: split BVT coverage across compose and launch

---
 .github/workflows/ci.yaml             | 76 ++++++++++++++++++++++-----
 .github/workflows/e2e-compose.yaml    | 34 ++++++++----
 .github/workflows/e2e-standalone.yaml | 26 ++++++---
 .github/workflows/utils.yaml          |  6 +--
 4 files changed, 108 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f683d67..65e4969 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,6 +16,12 @@ on:
       TOKEN_ACTION:
         description: "Token for checkout (e.g. pull from fork/private)"
         required: false
+      TEST_S3FS_ALIYUN:
+        description: "Object storage configuration for UT coverage"
+        required: true
+      TEST_S3FS_QCLOUD:
+        description: "Object storage configuration for UT coverage"
+        required: true
       S3ENDPOINT:
         description: "S3ENDPOINT For Test"
         required: true
@@ -131,20 +137,8 @@ jobs:
       - name: Unit Testing
         id: ut
         run: |
-          set -euo pipefail
-          coverage_dir="${RUNNER_TEMP}/race-ut-coverage"
-          rm -rf "${coverage_dir}"
-          mkdir -p "${coverage_dir}"
           cd $GITHUB_WORKSPACE && make clean && make config
-          make ut UT_PARALLEL=${{ vars.UT_PARALLEL || 6 }} UT_TIMEOUT=${{ vars.UT_TIMEOUT || 40 }} UT_COVERAGE_DIR="${coverage_dir}"
-      - name: Upload race UT coverage
-        if: ${{ success() }}
-        uses: actions/upload-artifact@v7
-        with:
-          name: race-ut-coverage
-          path: ${{ runner.temp }}/race-ut-coverage/ut-race-*.out
-          if-no-files-found: error
-          retention-days: 7
+          make ut UT_PARALLEL=${{ vars.UT_PARALLEL || 6 }} UT_TIMEOUT=${{ vars.UT_TIMEOUT || 40 }}
       - name: Print Result(Old)
         if: ${{ always() }}
         continue-on-error: true
@@ -193,6 +187,62 @@ jobs:
         run: |
           find ./ut-report -name top.txt -exec cat {} \;
 
+  ut-coverage-linux-x86:
+    environment: ci
+    runs-on: ${{ vars.COVERAGE_UT_RUNNER_LABEL || 'amd64-mo-guangzhou-2xlarge16' }}
+    name: UT Coverage on Linux/x86
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          token: ${{ secrets.TOKEN_ACTION }}
+          fetch-depth: "3"
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
+      - name: Set up Go
+        uses: matrixorigin/CI/actions/setup-env@main
+        with:
+          setup-java: true
+          go-version-file: "${{ github.workspace }}/go.mod"
+      - name: Run coverage unit tests
+        run: |
+          set -euo pipefail
+          cd "$GITHUB_WORKSPACE"
+          export endpoint='${{ secrets.S3ENDPOINT }}'
+          export region='${{ secrets.S3REGION }}'
+          export apikey='${{ secrets.S3APIKEY }}'
+          export apisecret='${{ secrets.S3APISECRET }}'
+          export bucket='${{ secrets.S3BUCKET }}'
+          export TEST_S3FS_ALIYUN='${{ secrets.TEST_S3FS_ALIYUN }}'
+          export TEST_S3FS_QCLOUD='${{ secrets.TEST_S3FS_QCLOUD }}'
+
+          test_scope=$(go list -mod=readonly ./... | grep -v 'driver\|engine/aoe\|engine/memEngine\|pkg/catalog')
+          cover_pkgs=$(printf '%s\n' "${test_scope}" | paste -sd, -)
+          test -n "${cover_pkgs}"
+
+          make clean && make config && make cgo && make thirdparties
+          thirdparties_dir="$GITHUB_WORKSPACE/thirdparties"
+          thirdparties_install_dir="${thirdparties_dir}/install"
+          cgo_cflags="-I${GITHUB_WORKSPACE}/cgo -I${thirdparties_install_dir}/include"
+          cgo_ldflags="-L${GITHUB_WORKSPACE}/cgo -lmo -L${thirdparties_install_dir}/lib -lusearch_c -Wl,-rpath,${thirdparties_install_dir}/lib -lm"
+          coverage_profile="${RUNNER_TEMP}/ut-coverage.out"
+
+          CGO_CFLAGS="${cgo_cflags}" CGO_LDFLAGS="${cgo_ldflags}" \
+            go test -mod=readonly -json -short -v -tags matrixone_test -p 6 \
+            -covermode=set -coverprofile="${coverage_profile}" -coverpkg="${cover_pkgs}" \
+            ${test_scope} | tee "${RUNNER_TEMP}/ut-coverage-report.json"
+          test -s "${coverage_profile}"
+      - name: Upload UT coverage
+        if: ${{ always() && !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: ut-coverage
+          path: |
+            ${{ runner.temp }}/ut-coverage.out
+            ${{ runner.temp }}/ut-coverage-report.json
+          if-no-files-found: warn
+          retention-days: 7
+
   ut-mac-x86:
     #if: ${{ !github.event.pull_request.draft }}
     if: ${{ false }}
diff --git a/.github/workflows/e2e-compose.yaml b/.github/workflows/e2e-compose.yaml
index 063f751..ebb9259 100644
--- a/.github/workflows/e2e-compose.yaml
+++ b/.github/workflows/e2e-compose.yaml
@@ -193,8 +193,14 @@ jobs:
     if: ${{ inputs.repository != '' || !github.event.pull_request.draft }}
     environment: ci
     runs-on: ${{ vars.RUNNER_LABEL || 'ubuntu-22.04' }}
-    name: multi cn e2e bvt test docker compose(PESSIMISTIC)
+    name: multi cn e2e bvt test docker compose(PROXY, group ${{ matrix.group_offset }})
     timeout-minutes: 75
+    strategy:
+      fail-fast: false
+      matrix:
+        # Together with the native launch job's (PR + 1) group, these two
+        # slots execute every non-optimistic BVT case exactly once per PR.
+        group_offset: [0, 2]
     steps:
       - name: Pre Clean Some Unneeded Images
         run: |
@@ -234,9 +240,9 @@ jobs:
         timeout-minutes: 10
         run: |
           set -euo pipefail
-          export GOCOVERDIR="${GITHUB_WORKSPACE}/coverage"
-          rm -rf "${GOCOVERDIR}"
-          mkdir -p "${GOCOVERDIR}"
+          coverage_dir="${GITHUB_WORKSPACE}/coverage"
+          rm -rf "${coverage_dir}"
+          mkdir -p "${coverage_dir}"
           cat ./etc/launch-tae-compose/config/cn-0.toml
           cat ./etc/launch-tae-compose/config/cn-1.toml
           cat ./etc/launch-tae-compose/config/tn.toml
@@ -305,7 +311,14 @@ jobs:
           cat mo.yml
           echo "============================="
 
-          ./run.sh -n -g -o -p $GITHUB_WORKSPACE/test/distributed/cases -e optimistic 2>&1
+          pr_number="${{ github.event.pull_request.number }}"
+          bvt_group=$(( (pr_number + ${{ matrix.group_offset }}) % 3 ))
+          echo "Compose Proxy BVT: PR ${pr_number}, group ${bvt_group}"
+          cd "$GITHUB_WORKSPACE"
+          bash ./optools/run_bvt_group.sh \
+            "$GITHUB_WORKSPACE/mo-tester" \
+            "$GITHUB_WORKSPACE/test/distributed/cases" \
+            "${bvt_group}" 2>&1
 
       - name: Print Docker Info Before Container Shutdown
         if: ${{ always() }}
@@ -350,9 +363,10 @@ jobs:
         run: |
           set -uo pipefail
           coverage_dir="${GITHUB_WORKSPACE}/coverage"
+          coverage_profile="${RUNNER_TEMP}/bvt-compose-${{ matrix.group_offset }}.out"
           sudo chown -R "$(id -u):$(id -g)" "${coverage_dir}" || true
-          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_dir}/bvt-compose.out"; then
-            test -s "${coverage_dir}/bvt-compose.out"
+          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_profile}"; then
+            test -s "${coverage_profile}"
           elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
             echo "::error::failed to generate compose BVT coverage after a successful BVT"
             exit 1
@@ -364,8 +378,8 @@ jobs:
         if: ${{ always() && !cancelled() }}
         uses: actions/upload-artifact@v7
         with:
-          name: bvt-coverage-compose
-          path: ${{ github.workspace }}/coverage/bvt-compose.out
+          name: bvt-coverage-compose-${{ matrix.group_offset }}
+          path: ${{ runner.temp }}/bvt-compose-${{ matrix.group_offset }}.out
           if-no-files-found: warn
           retention-days: 7
 
@@ -373,7 +387,7 @@ jobs:
         if: ${{ failure() || cancelled()}}
         continue-on-error: true
         with:
-          name: Compose-multi-cn-e2e-bvt-test-docker-log(PESSIMISTIC)
+          name: Compose-multi-cn-e2e-bvt-test-docker-log(PROXY,group-${{ matrix.group_offset }})
           path: |
             ${{ github.workspace }}/docker-compose-log
           retention-days: 7
diff --git a/.github/workflows/e2e-standalone.yaml b/.github/workflows/e2e-standalone.yaml
index fae3c5d..3f9280c 100644
--- a/.github/workflows/e2e-standalone.yaml
+++ b/.github/workflows/e2e-standalone.yaml
@@ -154,6 +154,10 @@ jobs:
           retention-days: 7
 
   multi-cn-proxy-bvt-linux-x86:
+    # Compose now supplies the proxy deployment used by the PR BVT matrix.
+    # Keep this legacy launcher disabled until it is assigned to a separate
+    # scheduled compatibility workflow.
+    if: false
     runs-on: ${{ vars.RUNNER_LABEL || 'ubuntu-22.04' }}
     name: Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
     timeout-minutes: 75
@@ -340,12 +344,17 @@ jobs:
         run: |
           export LC_ALL="C.UTF-8"
           locale
-          cd $GITHUB_WORKSPACE/mo-tester
-          sed -i 's/  port: [0-9]*/  port: 12345/g' mo.yml
-          cat mo.yml
+          sed -i 's/  port: [0-9]*/  port: 12345/g' "$GITHUB_WORKSPACE/mo-tester/mo.yml"
+          cat "$GITHUB_WORKSPACE/mo-tester/mo.yml"
           echo "============================="
-
-          ./run.sh -n -g -o -p $GITHUB_WORKSPACE/head/test/distributed/cases -s  $GITHUB_WORKSPACE/head/test/distributed/resources -e optimistic 2>&1
+          pr_number="${{ github.event.pull_request.number }}"
+          bvt_group=$(( (pr_number + 1) % 3 ))
+          echo "Pessimistic BVT: PR ${pr_number}, group ${bvt_group}"
+          cd $GITHUB_WORKSPACE/head
+          bash ./optools/run_bvt_group.sh \
+            "$GITHUB_WORKSPACE/mo-tester" \
+            "$GITHUB_WORKSPACE/head/test/distributed/cases" \
+            "${bvt_group}" 2>&1
 
       - name: Dump mo-service goroutines
         if: ${{ always() && !cancelled() }}
@@ -364,6 +373,7 @@ jobs:
         run: |
           set -uo pipefail
           coverage_dir="${RUNNER_TEMP}/bvt-coverage-pessimistic"
+          coverage_profile="${RUNNER_TEMP}/bvt-pessimistic.out"
           pids=$(pgrep -f 'mo-service' || true)
           if [ -n "${pids}" ]; then
             kill -TERM ${pids} || true
@@ -376,8 +386,8 @@ jobs:
           if [ -n "${pids}" ]; then
             kill -KILL ${pids} || true
           fi
-          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_dir}/bvt-pessimistic.out"; then
-            test -s "${coverage_dir}/bvt-pessimistic.out"
+          if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_profile}"; then
+            test -s "${coverage_profile}"
           elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
             echo "::error::failed to generate pessimistic BVT coverage after a successful BVT"
             exit 1
@@ -389,7 +399,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: bvt-coverage-pessimistic
-          path: ${{ runner.temp }}/bvt-coverage-pessimistic/bvt-pessimistic.out
+          path: ${{ runner.temp }}/bvt-pessimistic.out
           if-no-files-found: warn
           retention-days: 7
 
diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml
index 171380c..73eaf60 100644
--- a/.github/workflows/utils.yaml
+++ b/.github/workflows/utils.yaml
@@ -536,14 +536,14 @@ jobs:
           processed_dir="$GITHUB_WORKSPACE/coverage-processed"
           mkdir -p "${processed_dir}"
 
-          mapfile -t ut_profiles < <(find "${artifact_dir}" -type f -name 'ut-race-*.out' | sort)
+          mapfile -t ut_profiles < <(find "${artifact_dir}" -type f -name 'ut-coverage.out' | sort)
           mapfile -t bvt_profiles < <(find "${artifact_dir}" -type f -name 'bvt-*.out' | sort)
           if [ "${#ut_profiles[@]}" -eq 0 ]; then
-            echo "::error::race UT coverage artifact is missing"
+            echo "::error::UT coverage artifact is missing"
             exit 1
           fi
           if [ "${#bvt_profiles[@]}" -lt 3 ]; then
-            echo "::error::expected coverage from proxy, pessimistic, and compose BVT; found ${#bvt_profiles[@]} profile(s)"
+            echo "::error::expected coverage from two Compose Proxy jobs and one native pessimistic BVT job; found ${#bvt_profiles[@]} profile(s)"
             find "${artifact_dir}" -type f -print || true
             exit 1
           fi

From aab55c56ce59623650f1315557b78820b1288598 Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 09:26:06 +0800
Subject: [PATCH 5/7] ci: share compose image build cache

---
 .github/workflows/e2e-compose.yaml | 42 +++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-compose.yaml b/.github/workflows/e2e-compose.yaml
index ebb9259..55e8306 100644
--- a/.github/workflows/e2e-compose.yaml
+++ b/.github/workflows/e2e-compose.yaml
@@ -17,6 +17,31 @@ on:
         required: false
 
 jobs:
+  build-compose-proxy-image:
+    if: ${{ inputs.repository != '' || !github.event.pull_request.draft }}
+    environment: ci
+    runs-on: ${{ vars.RUNNER_LABEL || 'ubuntu-22.04' }}
+    name: build Compose Proxy image
+    timeout-minutes: 30
+    steps:
+      - name: checkout
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          token: ${{ secrets.TOKEN_ACTION }}
+          fetch-depth: "3"
+          repository: ${{ inputs.repository || github.event.pull_request.head.repo.full_name }}
+          ref: ${{ inputs.ref || github.event.pull_request.head.ref }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and export Compose Proxy image cache
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./optools/images/Dockerfile
+          build-args: GOBUILD_OPT=-cover
+          cache-from: type=gha,scope=matrixone-compose-proxy-${{ github.event.pull_request.number || github.run_id }}
+          cache-to: type=gha,scope=matrixone-compose-proxy-${{ github.event.pull_request.number || github.run_id }},mode=max
+
   bvt-docker-compose-push:
     if: false
     environment: ci
@@ -191,6 +216,7 @@ jobs:
 
   multi-CN-bvt-docker-compose-pessimistic:
     if: ${{ inputs.repository != '' || !github.event.pull_request.draft }}
+    needs: build-compose-proxy-image
     environment: ci
     runs-on: ${{ vars.RUNNER_LABEL || 'ubuntu-22.04' }}
     name: multi cn e2e bvt test docker compose(PROXY, group ${{ matrix.group_offset }})
@@ -226,6 +252,19 @@ jobs:
       - name: Print run attempt
         run: echo "run attempt is ${{ github.run_attempt }}"
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Load Compose Proxy image from shared build cache
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./optools/images/Dockerfile
+          tags: matrixorigin/matrixone:latest
+          load: true
+          build-args: GOBUILD_OPT=-cover
+          cache-from: type=gha,scope=matrixone-compose-proxy-${{ github.event.pull_request.number || github.run_id }}
+
       - name: Print Disk Usage Before Container Start
         if: ${{ always() }}
         run: |
@@ -252,9 +291,6 @@ jobs:
           # Handle various docker-compose volume formats: /test, /test:options, /test followed by space
           sed -i 's|:/test\b|:'"$GITHUB_WORKSPACE"'/test|g' ./etc/launch-tae-compose/compose.yaml
 
-          # build matrixone docker image first
-          docker build --build-arg GOBUILD_OPT=-cover -t matrixorigin/matrixone:latest . -f ./optools/images/Dockerfile
-
           mkdir -p ${{ github.workspace }}/docker-compose-log
           docker compose -f etc/launch-tae-compose/compose.yaml --profile launch-multi-cn up -d
 

From 208c5e123cf579da88ca7f66f27fbc7c7c515be3 Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 10:26:17 +0800
Subject: [PATCH 6/7] ci: rotate BVT groups and streamline coverage merge

---
 .github/workflows/ci.yaml             |  3 +++
 .github/workflows/e2e-compose.yaml    | 23 ++++++++++++++-----
 .github/workflows/e2e-standalone.yaml | 17 +++++++++++---
 .github/workflows/utils.yaml          | 32 +++++++++++++++++++++++++--
 4 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65e4969..9a622f0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -232,6 +232,9 @@ jobs:
             -covermode=set -coverprofile="${coverage_profile}" -coverpkg="${cover_pkgs}" \
             ${test_scope} | tee "${RUNNER_TEMP}/ut-coverage-report.json"
           test -s "${coverage_profile}"
+          grep -Ev 'pkg/pb|pkg/sql/parsers/goyacc|yaccpar' "${coverage_profile}" > "${coverage_profile}.filtered" || true
+          test -s "${coverage_profile}.filtered"
+          mv "${coverage_profile}.filtered" "${coverage_profile}"
       - name: Upload UT coverage
         if: ${{ always() && !cancelled() }}
         uses: actions/upload-artifact@v7
diff --git a/.github/workflows/e2e-compose.yaml b/.github/workflows/e2e-compose.yaml
index 55e8306..ce90f26 100644
--- a/.github/workflows/e2e-compose.yaml
+++ b/.github/workflows/e2e-compose.yaml
@@ -219,13 +219,13 @@ jobs:
     needs: build-compose-proxy-image
     environment: ci
     runs-on: ${{ vars.RUNNER_LABEL || 'ubuntu-22.04' }}
-    name: multi cn e2e bvt test docker compose(PROXY, group ${{ matrix.group_offset }})
+    name: multi cn e2e bvt test docker compose(PROXY, slot ${{ matrix.group_offset }})
     timeout-minutes: 75
     strategy:
       fail-fast: false
       matrix:
-        # Together with the native launch job's (PR + 1) group, these two
-        # slots execute every non-optimistic BVT case exactly once per PR.
+        # Together with the native launch job's seed+1 group, these two slots
+        # execute every non-optimistic BVT case exactly once per CI run.
         group_offset: [0, 2]
     steps:
       - name: Pre Clean Some Unneeded Images
@@ -347,9 +347,17 @@ jobs:
           cat mo.yml
           echo "============================="
 
-          pr_number="${{ github.event.pull_request.number }}"
-          bvt_group=$(( (pr_number + ${{ matrix.group_offset }}) % 3 ))
-          echo "Compose Proxy BVT: PR ${pr_number}, group ${bvt_group}"
+          run_id="${{ github.run_id }}"
+          run_attempt="${{ github.run_attempt }}"
+          group_seed=$(( (run_id + run_attempt) % 3 ))
+          bvt_group=$(( (group_seed + ${{ matrix.group_offset }}) % 3 ))
+          echo "Compose Proxy BVT: run ${run_id}, attempt ${run_attempt}, seed ${group_seed}, group ${bvt_group}"
+          {
+            echo "### BVT group assignment"
+            echo "- CI run: ${run_id}, attempt: ${run_attempt}"
+            echo "- Deployment: Compose Multi-CN + Proxy"
+            echo "- Group: ${bvt_group}"
+          } >> "$GITHUB_STEP_SUMMARY"
           cd "$GITHUB_WORKSPACE"
           bash ./optools/run_bvt_group.sh \
             "$GITHUB_WORKSPACE/mo-tester" \
@@ -403,6 +411,9 @@ jobs:
           sudo chown -R "$(id -u):$(id -g)" "${coverage_dir}" || true
           if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_profile}"; then
             test -s "${coverage_profile}"
+            grep -Ev 'pkg/pb|yaccpar' "${coverage_profile}" > "${coverage_profile}.filtered" || true
+            test -s "${coverage_profile}.filtered"
+            mv "${coverage_profile}.filtered" "${coverage_profile}"
           elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
             echo "::error::failed to generate compose BVT coverage after a successful BVT"
             exit 1
diff --git a/.github/workflows/e2e-standalone.yaml b/.github/workflows/e2e-standalone.yaml
index 3f9280c..2604615 100644
--- a/.github/workflows/e2e-standalone.yaml
+++ b/.github/workflows/e2e-standalone.yaml
@@ -347,9 +347,17 @@ jobs:
           sed -i 's/  port: [0-9]*/  port: 12345/g' "$GITHUB_WORKSPACE/mo-tester/mo.yml"
           cat "$GITHUB_WORKSPACE/mo-tester/mo.yml"
           echo "============================="
-          pr_number="${{ github.event.pull_request.number }}"
-          bvt_group=$(( (pr_number + 1) % 3 ))
-          echo "Pessimistic BVT: PR ${pr_number}, group ${bvt_group}"
+          run_id="${{ github.run_id }}"
+          run_attempt="${{ github.run_attempt }}"
+          group_seed=$(( (run_id + run_attempt) % 3 ))
+          bvt_group=$(( (group_seed + 1) % 3 ))
+          echo "Pessimistic BVT: run ${run_id}, attempt ${run_attempt}, seed ${group_seed}, group ${bvt_group}"
+          {
+            echo "### BVT group assignment"
+            echo "- CI run: ${run_id}, attempt: ${run_attempt}"
+            echo "- Deployment: native launch (PESSIMISTIC)"
+            echo "- Group: ${bvt_group}"
+          } >> "$GITHUB_STEP_SUMMARY"
           cd $GITHUB_WORKSPACE/head
           bash ./optools/run_bvt_group.sh \
             "$GITHUB_WORKSPACE/mo-tester" \
@@ -388,6 +396,9 @@ jobs:
           fi
           if go tool covdata textfmt -i="${coverage_dir}" -o "${coverage_profile}"; then
             test -s "${coverage_profile}"
+            grep -Ev 'pkg/pb|yaccpar' "${coverage_profile}" > "${coverage_profile}.filtered" || true
+            test -s "${coverage_profile}.filtered"
+            mv "${coverage_profile}.filtered" "${coverage_profile}"
           elif [ "${{ steps.bvt_on_pr_version.conclusion }}" = "success" ]; then
             echo "::error::failed to generate pessimistic BVT coverage after a successful BVT"
             exit 1
diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml
index 73eaf60..864c9fe 100644
--- a/.github/workflows/utils.yaml
+++ b/.github/workflows/utils.yaml
@@ -477,7 +477,10 @@ jobs:
     name: Coverage
     needs: [check_organization_user]
     environment: ci
-    runs-on: amd64-mo-guangzhou-2xlarge16
+    # This job only downloads and merges text coverage profiles; it does not
+    # build MatrixOne or run CGo. Keep its queue independent from heavy tests.
+    runs-on: ${{ vars.COVERAGE_MERGE_RUNNER_LABEL || 'arm64-mo-shanghai-4c8g' }}
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
@@ -563,11 +566,25 @@ jobs:
           done
 
           cd "$GITHUB_WORKSPACE"
+          # parse_coverage.py intentionally resolves .ignore from its current
+          # working directory. The legacy job staged this file; keep that
+          # contract in the artifact-based merge job too.
+          cp "$GITHUB_WORKSPACE/CI/scripts/.ignore" "$GITHUB_WORKSPACE/.ignore"
           python CI/scripts/parse_coverage.py \
             -coverage_files "${coverage_files[@]}" \
             -diff_path "$GITHUB_WORKSPACE/matrixone/diff.patch"
           go tool cover -o "$GITHUB_WORKSPACE/matrixone/pr_coverage.html" -html=merged_coverage.out
 
+      - name: Measure coverage outputs
+        if: ${{ always() && !cancelled() }}
+        run: |
+          du -sh \
+            "$GITHUB_WORKSPACE/coverage-artifacts" \
+            "$GITHUB_WORKSPACE/coverage-processed" \
+            "$GITHUB_WORKSPACE/merged_coverage.out" \
+            "$GITHUB_WORKSPACE/pr_coverage.out" \
+            "$GITHUB_WORKSPACE/matrixone/pr_coverage.html" 2>/dev/null || true
+
       - name: Upload coverage result
         if: ${{ always() && !cancelled() }}
         uses: actions/upload-artifact@v7
@@ -577,9 +594,20 @@ jobs:
             ${{ github.workspace }}/matrixone/pr_coverage.html
             ${{ github.workspace }}/pr_coverage.out
             ${{ github.workspace }}/merged_coverage.out
-            ${{ github.workspace }}/coverage-artifacts
           retention-days: 7
 
+      - name: Upload raw coverage inputs for failed merge
+        if: ${{ failure() && !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: coverage-merge-debug
+          path: |
+            ${{ github.workspace }}/coverage-artifacts
+            ${{ github.workspace }}/coverage-processed
+            ${{ github.workspace }}/matrixone/diff.patch
+          if-no-files-found: warn
+          retention-days: 1
+
   pr-size-label:
     if: ${{ inputs.repository == '' }}
     environment: ci

From ba787100d0ba04b231fa140e3e026fbdf43f1680 Mon Sep 17 00:00:00 2001
From: XuPeng-SH <xupeng3112@163.com>
Date: Sun, 26 Jul 2026 10:33:08 +0800
Subject: [PATCH 7/7] ci: run coverage merge on hosted runner

---
 .github/workflows/utils.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/utils.yaml b/.github/workflows/utils.yaml
index 864c9fe..de27783 100644
--- a/.github/workflows/utils.yaml
+++ b/.github/workflows/utils.yaml
@@ -478,8 +478,9 @@ jobs:
     needs: [check_organization_user]
     environment: ci
     # This job only downloads and merges text coverage profiles; it does not
-    # build MatrixOne or run CGo. Keep its queue independent from heavy tests.
-    runs-on: ${{ vars.COVERAGE_MERGE_RUNNER_LABEL || 'arm64-mo-shanghai-4c8g' }}
+    # build MatrixOne or run CGo. Use a GitHub-hosted runner so it is isolated
+    # from the self-hosted queues used by heavy UT and coverage producers.
+    runs-on: ${{ vars.COVERAGE_MERGE_RUNNER_LABEL || 'ubuntu-22.04' }}
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3