Merge branch 'master' into unify-fe-name

Author: xy720

.asf.yaml

@@ -23,18 +23,18 @@ github:
     - query-engine
     - olap
     - lakehouse
-    - etl
+    - ai
+    - agent
     - elt
     - sql
     - snowflake
     - redshift
     - bigquery
-    - hive
     - iceberg
     - hudi
     - delta-lake
+    - paimon
     - spark
-    - hadoop
     - dbt
     - database
   enabled_merge_buttons:
@@ -50,6 +50,7 @@ github:
           - Clang Formatter
           - CheckStyle
           - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (Doris Regression)
           - External Regression (Doris External Regression)
           - cloud_p0 (Doris Cloud Regression)
           - vault_p0 (Doris Cloud Regression)
@@ -63,10 +64,55 @@ github:
           - Need_2_Approval
           - Cloud UT (Doris Cloud UT)
           - performance (Doris Performance)
+          - check_coverage (Coverage)
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         require_code_owner_reviews: true
         required_approving_review_count: 1
+    branch-4.0:
+      required_status_checks:
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - Build Third Party Libraries (Linux)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (Doris Regression)
+          - External Regression (Doris External Regression) 
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
+      required_pull_request_reviews:
+        require_code_owner_reviews: true
+        required_approving_review_count: 1
+        dismiss_stale_reviews: true
+    branch-3.1:
+      required_status_checks:
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - Build Third Party Libraries (Linux)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (Doris Regression)
+          - External Regression (Doris External Regression) 
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
+      required_pull_request_reviews:
+        require_code_owner_reviews: true
+        required_approving_review_count: 1
+        dismiss_stale_reviews: true
     branch-3.0:
       required_status_checks:
         strict: false
@@ -81,6 +127,7 @@ github:
           - Cloud UT (Doris Cloud UT)
           - COMPILE (DORIS_COMPILE)
           - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (Doris Regression)
           - External Regression (Doris External Regression)
           - cloud_p0 (Doris Cloud Regression)
           - vault_p0 (Doris Cloud Regression)

.clang-format-ignore

@@ -9,3 +9,4 @@ be/src/util/sse2neon.h
 be/src/util/mustache/mustache.h
 be/src/util/mustache/mustache.cc
 be/src/util/utf8_check.cpp
+cloud/src/common/defer.h

.clang-tidy

@@ -16,6 +16,9 @@ Checks: |
   misc-unused-*,
   -misc-unused-parameters,
   readability-*,
+  -readability-simplify-boolean-expr,
+  -readability-math-missing-parentheses,
+  -readability-redundant-inline-specifier,
   -readability-identifier-length,
   -readability-implicit-bool-conversion,
   -readability-magic-numbers,

.gitattributes

@@ -14,4 +14,6 @@
 *.thrift text eol=lf
 *.proto text eol=lf
 *.conf text eol=lf
-*.out text eol=lf -diff
+*.out text eol=lf diff
+*.groovy -linguist-detectable
+regression-test/ export-ignore

.github/actions/setup-maven

@@ -31,7 +31,7 @@ permissions:
 jobs:
   auto_cherry_pick:
     runs-on: ubuntu-latest
-    if: ${{(contains(github.event.pull_request.labels.*.name, 'dev/3.0.x') || contains(github.event.pull_request.labels.*.name, 'dev/2.1.x') ||github.event.label.name == 'dev/3.0.x' || github.event.label.name == 'dev/2.1.x') && github.event.pull_request.merged == true }}
+    if: ${{(contains(github.event.pull_request.labels.*.name, 'dev/4.0.x') || contains(github.event.pull_request.labels.*.name, 'dev/3.1.x') || github.event.label.name == 'dev/4.0.x' || github.event.label.name == 'dev/3.1.x') && github.event.pull_request.merged == true }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -53,20 +53,20 @@ jobs:
               exit 1
             else
               echo "SHA matches: $calculated_sha"
-            fi
-      - name: Auto cherry-pick to branch-3.0
-        if: ${{ ((github.event.action == 'labeled' && github.event.label.name == 'dev/3.0.x'))|| ((github.event_name == 'pull_request_target' && github.event.action == 'closed') && contains(github.event.pull_request.labels.*.name, 'dev/3.0.x')) }}
+            fi    
+      - name: Auto cherry-pick to branch-3.1
+        if: ${{ ((github.event.action == 'labeled' && github.event.label.name == 'dev/3.1.x'))|| ((github.event_name == 'pull_request_target' && github.event.action == 'closed') && contains(github.event.pull_request.labels.*.name, 'dev/3.1.x')) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO_NAME: ${{ github.repository }}
-          CONFLICT_LABEL: dev/3.0.x-conflict
+          CONFLICT_LABEL: dev/3.1.x-conflict
         run: |
-          python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-3.0  
-      - name: Auto cherry-pick to branch-2.1
-        if: ${{ ((github.event.action == 'labeled' && github.event.label.name == 'dev/2.1.x'))|| ((github.event_name == 'pull_request_target' && github.event.action == 'closed') && contains(github.event.pull_request.labels.*.name, 'dev/2.1.x')) }}
+            python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-3.1    
+      - name: Auto cherry-pick to branch-4.0
+        if: ${{ ((github.event.action == 'labeled' && github.event.label.name == 'dev/4.0.x'))|| ((github.event_name == 'pull_request_target' && github.event.action == 'closed') && contains(github.event.pull_request.labels.*.name, 'dev/4.0.x')) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO_NAME: ${{ github.repository }}
-          CONFLICT_LABEL: dev/2.1.x-conflict
+          CONFLICT_LABEL: dev/4.0.x-conflict
         run: |
-            python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-2.1         
+          python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-4.0             

.github/workflows/auto-cherry-pick.yml

@@ -53,6 +53,7 @@ jobs:
           filters: |
             thirdparty_changes:
               - 'thirdparty/**'
+              - 'env.sh'
 
   build_linux:
     name: Build Third Party Libraries (Linux)
@@ -120,7 +121,7 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt install --yes "${packages[@]}"
 
           mkdir -p "${DEFAULT_DIR}"
-          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh \
+          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.25/ldb_toolchain_gen.sh \
             -q -O /tmp/ldb_toolchain_gen.sh
           bash /tmp/ldb_toolchain_gen.sh "${DEFAULT_DIR}/ldb-toolchain"
 
@@ -131,6 +132,8 @@ jobs:
           export PATH="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 1 -type d -name 'bin'):${PATH}"
           export JAVA_HOME="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 0)"
           export DORIS_TOOLCHAIN=gcc
+          export CMAKE_POLICY_VERSION_MINIMUM=3.10
+          export CUSTOM_CMAKE="/usr/local/bin/cmake"
 
           cd thirdparty
           ./build-thirdparty.sh -j "$(nproc)"
@@ -173,7 +176,7 @@ jobs:
             'openjdk@11'
             'maven'
             'node'
-            'llvm@16'
+            'llvm@20'
           )
 
           # Install packages except cmake
@@ -189,6 +192,8 @@ jobs:
       - name: Build
         run: |
           export MACOSX_DEPLOYMENT_TARGET=12.0
+          export CMAKE_POLICY_VERSION_MINIMUM=3.10
+          export CUSTOM_CMAKE="/usr/local/bin/cmake"
 
           cd thirdparty
           ./build-thirdparty.sh -j "$(nproc)"
@@ -231,7 +236,7 @@ jobs:
             'openjdk@11'
             'maven'
             'node'
-            'llvm@16'
+            'llvm@20'
           )
 
           # Install packages except cmake
@@ -247,6 +252,8 @@ jobs:
       - name: Build
         run: |
           export MACOSX_DEPLOYMENT_TARGET=12.0
+          export CMAKE_POLICY_VERSION_MINIMUM=3.10
+          export CUSTOM_CMAKE="/usr/local/bin/cmake"
 
           cd thirdparty
           ./build-thirdparty.sh -j "$(nproc)"

.github/workflows/build-thirdparty.yml

@@ -51,11 +51,13 @@ jobs:
               - 'gensrc/proto/**'
               - 'gensrc/thrift/**'
 
-      - name: Setup Maven Action
+      - name: Set up JDK with Maven
         if: steps.filter.outputs.fe_changes == 'true'
-        uses: ./.github/actions/setup-maven
+        uses: actions/setup-java@v4
         with:
-          maven-version: 3.8.4
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'    
 
       - name: Run java checkstyle
         if: steps.filter.outputs.fe_changes == 'true'