Merge branch 'master' into dh-cloud-patch-3

Author: dh-cloud

.asf.yaml

@@ -16,129 +16,149 @@
 #
 
 github:
-  description: Apache Doris is an easy-to-use, high performance and unified analytics database. 
+  description: Apache Doris is an easy-to-use, high performance and unified analytics database.
   homepage: https://doris.apache.org
   labels:
     - real-time
     - 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:
     squash:  true
     merge:   false
     rebase:  false
   protected_branches:
     master:
       required_status_checks:
-        # if strict is true, means "Require branches to be up to date before merging".
         strict: false
         contexts:
           - License Check
           - Clang Formatter
           - CheckStyle
           - P0 Regression (Doris Regression)
-          - P1 Regression (Doris Regression)
+          - NonConcurrent Regression (Doris Regression)
           - External Regression (Doris External Regression)
-          - cloud_p1 (Doris Cloud Regression)
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
           - FE UT (Doris FE UT)
           - BE UT (Doris BE UT)
           - Build Broker
-          - ShellCheck          
           - Build Third Party Libraries (Linux)
           - Build Third Party Libraries (macOS)
           - Build Third Party Libraries (macOS-arm64)
           - COMPILE (DORIS_COMPILE)
           - 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-1.1-lts:
+    branch-3.1:
       required_status_checks:
-        # if strict is true, means "Require branches to be up to date before merging".
         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)
+          - performance (Doris Performance)
       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
+        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-2.1:
       required_status_checks:
-        # strict means "Require branches to be up to date before merging".
         strict: false
         contexts:
           - License Check
           - Clang Formatter
           - CheckStyle
           - Build Broker
-          - ShellCheck
           - Build Third Party Libraries (Linux)
-          - Build Third Party Libraries (macOS)
           - COMPILE (DORIS_COMPILE)
           - External Regression (Doris External Regression)
           - FE UT (Doris FE UT)
           - BE UT (Doris BE UT)
           - P0 Regression (Doris Regression)
-
-        required_pull_request_reviews:
-          dismiss_stale_reviews: true
-          required_approving_review_count: 1
-
+      required_pull_request_reviews:
+        require_code_owner_reviews: true
+        required_approving_review_count: 1
+        dismiss_stale_reviews: true
     branch-2.0:
       required_status_checks:
-      # if strict is true, means "Require branches to be up to date before merging".
         strict: false
         contexts:
           - License Check
-          - Clang Formatter
           - CheckStyle
           - P0 Regression (Doris Regression)
-          - P1 Regression (Doris Regression)
           - External Regression (Doris External Regression)
           - FE UT (Doris FE UT)
           - BE UT (Doris BE UT)
           - Build Broker
-          - ShellCheck
           - Build Third Party Libraries (Linux)
           - Build Third Party Libraries (macOS)
           - COMPILE (DORIS_COMPILE)
-
-        required_pull_request_reviews:
-          dismiss_stale_reviews: true
-          required_approving_review_count: 1
-
+      required_pull_request_reviews:
+        dismiss_stale_reviews: true
+        required_approving_review_count: 1
   collaborators:
-    - LemonLiTree
     - Yukang-Lian
     - TangSiyang2001
-    - Lchangliang
     - freemandealer
     - shuke987
     - wm1581066
-    - KassieZ
-    - yujun777
-    - gavinchou
-
+    - doris-robot
+    - echo-hhj
+    - yuanyuan8983
+    - yz-jayhua
+    - ixzc
 notifications:
-    pullrequests_status:  commits@doris.apache.org
-
+  pullrequests_status:  commits@doris.apache.org

.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,
@@ -25,7 +28,6 @@ Checks: |
   -readability-named-parameter,
   -readability-avoid-const-params-in-decls,
   -readability-convert-member-functions-to-static,
-  portability-simd-intrinsics,
   performance-type-promotion-in-math-fn,
   performance-faster-string-find,
   performance-inefficient-algorithm,

.dlc.json

@@ -15,3 +15,5 @@
 *.proto text eol=lf
 *.conf text eol=lf
 *.out text eol=lf -diff
+*.groovy -linguist-detectable
+regression-test/ export-ignore

.gitattributes

@@ -14,5 +14,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-be/src/io/* @platoneko @gavinchou @dataroaring
+
+# for more syntax help and usage example
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
+
+be/src/io/ @gavinchou @dataroaring
+be/src/agent/be_exec_version_manager.cpp @BiteTheDDDDt
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @dataroaring @CalvinKirs @morningman
+**/pom.xml @CalvinKirs @morningman
+fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java @dataroaring @morningman @yiguolei @xiaokang
+fe/fe-core/src/main/java/org/apache/doris/cloud/ @luwei16 @gavinchou @dearding @dataroaring
+cloud/src/meta-service/*job* @luwei16 @gavinchou @dataroaring
+cloud/src/meta-service/*meta_service_txn* @swjtu-zhanglei @gavinchou @dataroaring
+cloud/src/meta-service/*resource* @deardeng @gavinchou @dataroaring
+cloud/src/resource-manager/* @deardeng @gavinchou @dataroaring
+cloud/src/recycler/* @swjtu-zhanglei @gavinchou @dataroaring
+be/src/cloud/*compact* @luwei16 @gavinchou @dataroaring
+be/src/cloud/*schema* @luwei16 @gavinchou @dataroaring
+cloud/ @gavinchou @dataroaring @w41ter
+be/src/cloud/ @gavinchou @dataroaring
+gensrc/proto/olap_file.proto @gavinchou @dataroaring @yiguolei
+gensrc/proto/cloud.proto @gavinchou @dataroaring @w41ter
+fe/fe-core/src/main/java/org/apache/doris/fs @CalvinKirs
+fe/fe-core/src/main/java/org/apache/doris/fsv2 @CalvinKirs

.github/CODEOWNERS

@@ -1,6 +1,39 @@
-## Proposed changes
+### What problem does this PR solve?
 
 Issue Number: close #xxx
 
-<!--Describe your changes.-->
+Related PR: #xxx
+
+Problem Summary:
+
+### Release note
+
+None
+
+### Check List (For Author)
+
+- Test <!-- At least one of them must be included. -->
+    - [ ] Regression test
+    - [ ] Unit Test
+    - [ ] Manual test (add detailed scripts or steps below)
+    - [ ] No need to test or manual test. Explain why:
+        - [ ] This is a refactor/code format and no logic has been changed.
+        - [ ] Previous test can cover this change.
+        - [ ] No code files have been changed.
+        - [ ] Other reason <!-- Add your reason?  -->
+
+- Behavior changed:
+    - [ ] No.
+    - [ ] Yes. <!-- Explain the behavior change -->
+
+- Does this need documentation?
+    - [ ] No.
+    - [ ] Yes. <!-- Add document PR link here. eg: https://github.com/apache/doris-website/pull/1214 -->
+
+### Check List (For Reviewer who merge this PR)
+
+- [ ] Confirm the release note
+- [ ] Confirm test cases
+- [ ] Confirm document
+- [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into -->
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,80 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+name: Auto Cherry-Pick to Branch
+
+on:
+  pull_request_target:
+    types:
+      - closed
+      - labeled
+    branches:
+      - master
+permissions:
+  checks: write
+  contents: write
+  pull-requests: write
+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') || contains(github.event.pull_request.labels.*.name, 'dev/3.1.x') || github.event.label.name == 'dev/3.0.x' || github.event.label.name == 'dev/2.1.x' || github.event.label.name == 'dev/3.1.x') && github.event.pull_request.merged == true }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          pip install PyGithub
+      - name: Check SHA
+        run: |
+            expected_sha="5439ca6304c986a5b26e8f48d528253909b417597088fe98969afee5c2eccbe6d60c5cd1eb03d452eb8082ce2a8ff4ea18854770375487a30bd4af7af9afd322"
+            calculated_sha=$(sha512sum tools/auto-pick-script.py | awk '{ print $1 }')
+            if [ "$calculated_sha" != "$expected_sha" ]; then
+              echo "SHA mismatch! Expected: $expected_sha, but got: $calculated_sha"
+              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')) }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO_NAME: ${{ github.repository }}
+          CONFLICT_LABEL: dev/3.0.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')) }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO_NAME: ${{ github.repository }}
+          CONFLICT_LABEL: dev/2.1.x-conflict
+        run: |
+            python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-2.1         
+      - 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.1.x-conflict
+        run: |
+            python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-3.1