Merge branch 'main' of https://github.com/datafuselabs/databend into span

Author: andylokandy

.github/actions/benchmark_cloud/action.yml

@@ -101,7 +101,7 @@ runs:
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:
-        name: benchmark-${{ inputs.dataset }}-cloud-${{ inputs.size }}
+        name: benchmark-${{ inputs.dataset }}
         path: benchmark/clickbench/result-${{ inputs.dataset }}-cloud-${{ inputs.size }}.json
 
     - name: Remove warehouse

.github/actions/benchmark_local/action.yml

@@ -63,7 +63,7 @@ runs:
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:
-        name: benchmark-${{ inputs.dataset }}-local
+        name: benchmark-${{ inputs.dataset }}
         path: benchmark/clickbench/result-${{ inputs.dataset }}-local.json
 
     - name: Clean test data

.github/workflows/trusted-benchmark.yml

@@ -268,6 +268,7 @@ jobs:
           title: "Benchmark Cloud for ${{ matrix.dataset }} with ${{ matrix.size }} warehouse"
           summary: "status: **running**"
       - uses: ./.github/actions/benchmark_cloud
+        continue-on-error: true
         id: benchmark
         with:
           sha: ${{ needs.metadata.outputs.sha }}
@@ -308,27 +309,11 @@ jobs:
           aws-region: us-east-2
       - uses: actions/download-artifact@v3
         with:
-          name: benchmark-hits-local
+          name: benchmark-hits
           path: benchmark/clickbench/results/hits
       - uses: actions/download-artifact@v3
         with:
-          name: benchmark-hits-cloud-Medium
-          path: benchmark/clickbench/results/hits
-      - uses: actions/download-artifact@v3
-        with:
-          name: benchmark-hits-cloud-Large
-          path: benchmark/clickbench/results/hits
-      - uses: actions/download-artifact@v3
-        with:
-          name: benchmark-tpch-local
-          path: benchmark/clickbench/results/tpch
-      - uses: actions/download-artifact@v3
-        with:
-          name: benchmark-tpch-cloud-Medium
-          path: benchmark/clickbench/results/tpch
-      - uses: actions/download-artifact@v3
-        with:
-          name: benchmark-tpch-cloud-Large
+          name: benchmark-tpch
           path: benchmark/clickbench/results/tpch
       - name: Get Report Prefix
         run: |
@@ -337,12 +322,8 @@ jobs:
       - name: Upload PR clickbench result to repo.databend.rs
         working-directory: benchmark/clickbench
         run: |
-          aws s3 cp ./results/hits/result-hits-local.json ${{ env.REPORT_S3_PREFIX }}/hits-local.json
-          aws s3 cp ./results/hits/result-hits-cloud-Medium.json ${{ env.REPORT_S3_PREFIX }}/hits-cloud-Medium.json
-          aws s3 cp ./results/hits/result-hits-cloud-Large.json ${{ env.REPORT_S3_PREFIX }}/hits-cloud-Large.json
-          aws s3 cp ./results/tpch/result-tpch-local.json ${{ env.REPORT_S3_PREFIX }}/tpch-local.json
-          aws s3 cp ./results/tpch/result-tpch-cloud-Medium.json ${{ env.REPORT_S3_PREFIX }}/tpch-cloud-Medium.json
-          aws s3 cp ./results/tpch/result-tpch-cloud-Large.json ${{ env.REPORT_S3_PREFIX }}/tpch-cloud-Large.json
+          aws s3 sync ./results/hits/ ${{ env.REPORT_S3_PREFIX }}/ --include "*.json"
+          aws s3 sync ./results/tpch/ ${{ env.REPORT_S3_PREFIX }}/ --include "*.json"
       - name: Get latest release clickbench result
         working-directory: benchmark/clickbench
         run: |
@@ -390,22 +371,17 @@ jobs:
           aws-region: us-east-2
       - uses: actions/download-artifact@v3
         with:
-          name: benchmark-${{ matrix.dataset }}-local
-          path: benchmark/clickbench/results/${{ matrix.dataset }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: benchmark-${{ matrix.dataset }}-cloud-Medium
+          name: benchmark-${{ matrix.dataset }}
           path: benchmark/clickbench/results/${{ matrix.dataset }}
       - name: Upload nightly results to repo.databend.rs
-        working-directory: benchmark/clickbench
+        working-directory: benchmark/clickbench/
         run: |
           RESULT_PEFIX="${{ env.BENCHMARK_S3_PREFIX }}/release/${{ matrix.dataset }}/$(date -u +%Y)/$(date -u +%m)/$(date -u +%Y-%m-%d)/${{ needs.metadata.outputs.source_id }}"
           LATEST_PREFIX="${{ env.BENCHMARK_S3_PREFIX }}/release/${{ matrix.dataset }}/latest/latest"
-          aws s3 cp ./results/result-${{ matrix.dataset }}-local.json "${RESULT_PEFIX}-local.json"
-          aws s3 cp ./results/result-${{ matrix.dataset }}-cloud-Medium.json "${RESULT_PEFIX}-cloud-Medium.json"
-          aws s3 cp ./results/result-${{ matrix.dataset }}-local.json "${LATEST_PREFIX}-local.json"
-          aws s3 cp ./results/result-${{ matrix.dataset }}-cloud-Medium.json "${LATEST_PREFIX}-cloud-Medium.json"
-          rm -f ./results/result-*
+          for file in ./results/${{ matrix.dataset }}/*.json; do
+            aws s3 cp $file "${RESULT_PEFIX}-$(basename $file)"
+            aws s3 cp $file "${LATEST_PREFIX}-$(basename $file)"
+          done
       - name: Generate report
         working-directory: benchmark/clickbench
         run: |