[pull] main from StarRocks:main

.clang-tidy

@@ -13,7 +13,7 @@ Checks: >
     modernize-replace-auto-ptr,
     modernize-replace-disallow-copy-and-assign-macro,
     modernize-replace-random-shuffle,
-    modernize-return-braced-init-list,
+    -modernize-return-braced-init-list,
     modernize-shrink-to-fit,
     modernize-unary-static-assert,
     modernize-use-bool-literals,

.github/CODEOWNERS

@@ -56,7 +56,6 @@
 /fe/fe-core/src/main/java/com/starrocks/credential/  @StarRocks/connector-maintainer
 
 # parser
-/fe/fe-core/src/main/java/com/starrocks/planner/  @StarRocks/parser
 /fe/fe-core/src/main/java/com/starrocks/sql/ast/ @StarRocks/parser
 /fe/fe-core/src/main/java/com/starrocks/sql/parser/ @StarRocks/parser
 
@@ -125,10 +124,14 @@
 /be/src/http/action/compaction_action.cpp       @StarRocks/load-unload-maintainer
 /be/src/http/action/*stream_load.cpp    @StarRocks/load-unload-maintainer
 /be/src/http/action/restore*            @StarRocks/load-unload-maintainer
+/be/src/runtime/batch_write/*           @StarRocks/load-unload-maintainer
 /be/src/runtime/routine_load/*          @StarRocks/load-unload-maintainer
 /be/src/runtime/stream_load/*           @StarRocks/load-unload-maintainer
 /be/src/runtime/load*                   @StarRocks/load-unload-maintainer
 /be/src/runtime/tablets_channel.cpp     @StarRocks/load-unload-maintainer
 /be/src/runtime/export_sink.cpp         @StarRocks/load-unload-maintainer
 
+# meta upgrade/downgrade compatibility
+/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java @StarRocks/meta-compatibility-maintainer
+
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -36,8 +36,8 @@ If yes, please specify the type of change:
 
 ## Bugfix cherry-pick branch check:
 - [ ] I have checked the version labels which the pr will be auto-backported to the target branch
+  - [ ] 3.4
   - [ ] 3.3
   - [ ] 3.2
   - [ ] 3.1
-  - [ ] 3.0
-  - [ ] 2.5
+  - [ ] 3.0

.github/workflows/ci-doc-checker.yml

@@ -130,6 +130,11 @@ jobs:
           rm -rf ./docs/release_notes ./docs/ecosystem_release
           mv ../zh ./i18n/zh/docusaurus-plugin-content-docs/current
           rm -rf ./i18n/zh/docusaurus-plugin-content-docs/current/release_notes ./i18n/zh/docusaurus-plugin-content-docs/current/ecosystem_release
+          # Using package.json and yarn.lock from a PR is not safe, so copy from main branch.
+          rm package.json
+          rm yarn.lock
+          curl -O https://raw.githubusercontent.com/StarRocks/starrocks/refs/heads/main/docs/docusaurus/package.json
+          curl -O https://raw.githubusercontent.com/StarRocks/starrocks/refs/heads/main/docs/docusaurus/yarn.lock
           yarn install --frozen-lockfile
           yarn clear
           yarn build

.github/workflows/ci-merged-sonarcloud-fe.yml

@@ -12,6 +12,7 @@ jobs:
   sonarcloud-fe:
     runs-on: ubuntu-latest
     if: github.repository == 'StarRocks/starrocks'
+    timeout-minutes: 60
     steps:
       - name: clean
         run: |
@@ -35,14 +36,14 @@ jobs:
           distribution: 'adopt'
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -71,4 +72,8 @@ jobs:
           mkdir -p thirdparty/installed/bin/
           cd thirdparty/installed/bin/ && ln -s /usr/local/bin/thrift thrift
           cd ${{ github.workspace }}/fe
-          mvn -B -DskipTests verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=StarRocks_starrocks -Dsonar.pullrequest.key=${{ github.event.number }} -Dsonar.pullrequest.base=${{ github.base_ref }} -Dsonar.pullrequest.branch=${{ github.head_ref }}
+          export SONAR_SCANNER_OPTS="-Xms3072m -Xmx12288m"
+          export MAVEN_OPTS="-Xms3072m -Xmx12288m"
+          mvn -B -DskipTests verify org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar \
+            -Dsonar.projectKey=StarRocks_starrocks -Dsonar.pullrequest.key=${{ github.event.number }} \
+            -Dsonar.pullrequest.base=${{ github.base_ref }} -Dsonar.pullrequest.branch=${{ github.head_ref }}

.github/workflows/ci-merged.yml

@@ -22,89 +22,32 @@ jobs:
       github.base_ref == 'main' && 
       github.repository == 'StarRocks/starrocks' &&
       !contains(github.event.pull_request.title, 'cherry-pick') &&
-      !contains(github.event.pull_request.title, 'backport') && (
-      contains(github.event.pull_request.labels.*.name, '3.3') ||
-      contains(github.event.pull_request.labels.*.name, '3.2') ||
-      contains(github.event.pull_request.labels.*.name, '3.1') ||
-      contains(github.event.pull_request.labels.*.name, '3.0') ||
-      contains(github.event.pull_request.labels.*.name, '2.5') )
+      !contains(github.event.pull_request.title, 'backport')
+
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [ '3.4', '3.3', '3.2', '3.1', '3.0' ]
     env:
       PR_NUMBER: ${{ github.event.number }}
     steps:
-      - name: backport branch-3.3
-        if: contains(github.event.pull_request.labels.*.name, '3.3')
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            @Mergifyio backport branch-3.3
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions-ecosystem/action-remove-labels@v1
-        if: contains(github.event.pull_request.labels.*.name, '3.3')
-        with:
-          labels: '3.3'
-
-      - name: backport branch-3.2
-        if: contains(github.event.pull_request.labels.*.name, '3.2')
+      - name: backport branch-${{ matrix.version }}
+        if: contains(github.event.pull_request.labels.*.name, matrix.version)
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
-            @Mergifyio backport branch-3.2
+            @Mergifyio backport branch-${{ matrix.version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: actions-ecosystem/action-remove-labels@v1
-        if: contains(github.event.pull_request.labels.*.name, '3.2')
-        with:
-          labels: '3.2'
-
-      - name: backport branch-3.1
-        if: contains(github.event.pull_request.labels.*.name, '3.1')
-        uses: thollander/actions-comment-pull-request@v2
+        if: contains(github.event.pull_request.labels.*.name, matrix.version)
         with:
-          message: |
-            @Mergifyio backport branch-3.1
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions-ecosystem/action-remove-labels@v1
-        if: contains(github.event.pull_request.labels.*.name, '3.1')
-        with:
-          labels: '3.1'
-
-      - name: backport branch-3.0
-        if: contains(github.event.pull_request.labels.*.name, '3.0')
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            @Mergifyio backport branch-3.0
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions-ecosystem/action-remove-labels@v1
-        if: contains(github.event.pull_request.labels.*.name, '3.0')
-        with:
-          labels: '3.0'
-
-      - name: backport branch-2.5
-        if: contains(github.event.pull_request.labels.*.name, '2.5')
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            @Mergifyio backport branch-2.5
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions-ecosystem/action-remove-labels@v1
-        if: contains(github.event.pull_request.labels.*.name, '2.5')
-        with:
-          labels: '2.5'
+          labels: ${{ matrix.version }}
 
   thirdparty-update-image:
     runs-on: [self-hosted, normal]
     name: Thirdparty Update Image
     if: github.event.pull_request.merged == true
-    continue-on-error: false
-    strategy:
-      fail-fast: false
-      matrix:
-        linux: [ centos7, ubuntu ]
     env:
       PR_NUMBER: ${{ github.event.number }}
       BRANCH: ${{ github.base_ref }}
@@ -123,11 +66,17 @@ jobs:
             - 'thirdparty/**'
             - 'docker/dockerfiles/dev-env/dev-env.Dockerfile'
 
-      - name: update image (${{ matrix.linux }})
+      - name: update image - ubuntu
+        if: steps.changes.outputs.thirdparty == 'true'
+        run: |
+          rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
+          ./bin/elastic-update-image.sh $BRANCH $PR_NUMBER ubuntu
+
+      - name: update image - centos7
         if: steps.changes.outputs.thirdparty == 'true'
         run: |
           rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
-          ./bin/elastic-update-image.sh $BRANCH $PR_NUMBER ${{ matrix.linux }}
+          ./bin/elastic-update-image.sh $BRANCH $PR_NUMBER centos7
 
       - name: Clean ENV
         if: always()

.github/workflows/ci-pipeline-branch.yml

@@ -138,26 +138,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: [ Release, ASAN ]
+        linux: [ centos7, ubuntu ]
     steps:
       - name: clean
         run: |
           rm -rf ${{ github.workspace }}
           mkdir -p ${{ github.workspace }}
 
-      - name: Update Image (${{ matrix.build_type }})
+      - name: Update Image (${{ matrix.linux }})
         id: update-image
         if: needs.be-checker.outputs.output2  == 'true'
         env:
-          linux_distro: ${{ matrix.build_type }}
+          linux_distro: ${{ matrix.linux }}
         run: |
           cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
           ./bin/run-pr-update-image.sh
 
       - name: Upload Thirdparty Result
         uses: actions/upload-artifact@v4
         with:
-          name: THIRDPARTY-RESULT-${{ matrix.build_type }}
+          name: THIRDPARTY-RESULT-${{ matrix.linux }}
           path: image_cache.info
           retention-days: 1
           overwrite: true
@@ -346,6 +346,7 @@ jobs:
     needs: fe-checker
     if: needs.fe-checker.outputs.output1 == 'true' && github.repository == 'StarRocks/starrocks'
     name: FE Sonarcloud Check
+    timeout-minutes: 60
     env:
       PR_NUMBER: ${{ github.event.number }}
       CODE_PATH: ${{ github.workspace }}
@@ -382,14 +383,14 @@ jobs:
           distribution: 'adopt'
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -418,7 +419,11 @@ jobs:
           mkdir -p thirdparty/installed/bin/
           cd thirdparty/installed/bin/ && ln -s /usr/local/bin/thrift thrift
           cd ${{ github.workspace }}/fe
-          mvn -B -DskipTests verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=StarRocks_starrocks -Dsonar.pullrequest.key=${{ github.event.number }} -Dsonar.pullrequest.base=${{ github.base_ref }} -Dsonar.pullrequest.branch=${{ github.head_ref }}
+          export SONAR_SCANNER_OPTS="-Xms3072m -Xmx12288m"
+          export MAVEN_OPTS="-Xms3072m -Xmx12288m"
+          mvn -B -DskipTests verify org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar \
+            -Dsonar.projectKey=StarRocks_starrocks -Dsonar.pullrequest.key=${{ github.event.number }} \
+            -Dsonar.pullrequest.base=${{ github.base_ref }} -Dsonar.pullrequest.branch=${{ github.head_ref }}
 
   fe-ut:
     runs-on: [self-hosted, normal]
@@ -504,6 +509,7 @@ jobs:
           name: head_sha
           path: ./head_sha.txt
           retention-days: 3
+          overwrite: true
 
       - name: Clean
         run: |