Merge branch 'master' into bugfix-111

.github/CODEOWNERS

@@ -16,3 +16,4 @@
 #
 be/src/io/* @platoneko @gavinchou @dataroaring
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @dataroaring @CalvinKirs @morningman
+**/pom.xml @CalvinKirs @morningman

.github/workflows/comment-to-trigger-teamcity.yml

@@ -21,15 +21,21 @@ on:
   issue_comment:
     types: [created, edited]
 
+permissions:
+  contents: read
+  pull-requests: write
+  statuses: write
+
 jobs:
   check-comment-if-need-to-trigger-teamcity:
 
     # This job only runs for pull request comments, and comment body contains 'run'
-    if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'run') }}
+    if: ${{ github.event.issue.pull_request && (contains(github.event.comment.body, 'run') || contains(github.event.comment.body, 'skip buildall')) }}
 
     runs-on: ubuntu-latest
     env:
       COMMENT_BODY: ${{ github.event.comment.body }}
+      COMMENT_USER_ID: ${{ github.event.comment.user.id }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
@@ -50,8 +56,20 @@ jobs:
             "${COMMENT_BODY}" == *'run arm'* ||
             "${COMMENT_BODY}" == *'run performance'* ]]; then
             echo "comment_trigger=true" | tee -a "$GITHUB_OUTPUT"
+            echo "comment_skip=false" | tee -a "$GITHUB_OUTPUT"
+        elif [[ "${COMMENT_BODY}" == *'skip buildall'* ]]; then
+            if [[ "${COMMENT_USER_ID}" == '27881198' ||
+                  "${COMMENT_USER_ID}" == '37901441' ]]; then
+                echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
+                echo "comment_skip=true" | tee -a "$GITHUB_OUTPUT"
+                echo "COMMENT_USER_ID ${COMMENT_USER_ID} is allowed to skip buildall."
+            else
+                echo "COMMENT_USER_ID ${COMMENT_USER_ID} is not allowed to skip buildall."
+                exit
+            fi
         else
             echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
+            echo "comment_skip=false" | tee -a "$GITHUB_OUTPUT"
             echo "find no keyword in comment body, skip this action."
             exit
         fi
@@ -71,7 +89,7 @@ jobs:
         echo "COMMENT_REPEAT_TIMES=${COMMENT_REPEAT_TIMES}" | tee -a "$GITHUB_OUTPUT"
 
     - name: "Checkout master"
-      if: ${{ fromJSON(steps.parse.outputs.comment_trigger) }}
+      if: ${{ fromJSON(steps.parse.outputs.comment_trigger) || fromJSON(steps.parse.outputs.comment_skip) }}
       uses: actions/checkout@v4
 
     - name: "Check if pr need run build"
@@ -150,6 +168,7 @@ jobs:
         set -x
         if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
               "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ||
+              "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-3.0'"  ||
               "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.1'" ]]; then
           trigger_or_skip_build \
             "${{ steps.changes.outputs.changed_fe_ut }}" \
@@ -158,7 +177,7 @@ jobs:
             "feut" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         else
-          echo "PR target branch is not in (master, branch-2.0, branch-2.1), skip run feut"
+          echo "PR target branch is not in (master, branch-2.0, branch-2.1, branch-3.0), skip run feut"
           trigger_or_skip_build \
             "false" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
@@ -175,6 +194,7 @@ jobs:
         set -x
         if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
               "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ||
+              "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-3.0'" ||
               "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.1'" ]]; then
           trigger_or_skip_build \
             "${{ steps.changes.outputs.changed_be_ut }}" \
@@ -183,7 +203,7 @@ jobs:
             "beut" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         else
-          echo "PR target branch is not in (master, branch-2.0, branch-2.1), skip run beut"
+          echo "PR target branch is not in (master, branch-2.0, branch-2.1, branch-3.0), skip run beut"
           trigger_or_skip_build \
             "false" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
@@ -197,15 +217,16 @@ jobs:
       run: |
         source ./regression-test/pipeline/common/teamcity-utils.sh
         set -x
-        if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ]]; then
+        if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
+              "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-3.0'" ]]; then
           trigger_or_skip_build \
             "${{ steps.changes.outputs.changed_cloud_ut }}" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
             "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
             "cloudut" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         else
-          echo "PR target branch is not master, skip run cloudut"
+          echo "PR target branch is not in (master, branch-3.0), skip run cloudut"
         fi
 
     - name: "Trigger or Skip compile"
@@ -279,16 +300,17 @@ jobs:
           echo "COMMENT_TRIGGER_TYPE is buildall, trigger compile is enough, compile will trigger cloud_p0" && exit
         fi
         set -x
-        if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ]]; then
-          echo "PR target branch in (master), need run cloud_p0"
+        if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
+              "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-3.0'" ]]; then
+          echo "PR target branch is in (master, branch-3.0), need run cloud_p0"
           trigger_or_skip_build \
             "${{ steps.changes.outputs.changed_cloud_p0 }}" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
             "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
             "cloud_p0" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         else
-          echo "PR target branch not in (master), skip run cloud_p0"
+          echo "PR target branch is not in (master, branch-3.0), skip run cloud_p0"
           trigger_or_skip_build \
             "false" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
@@ -305,16 +327,17 @@ jobs:
           echo "COMMENT_TRIGGER_TYPE is buildall, trigger compile is enough, compile will trigger cloud_p1" && exit
         fi
         set -x
-        if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ]]; then
-          echo "PR target branch in (master), need run cloud_p1"
+        if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
+              "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-3.0'" ]]; then
+          echo "PR target branch is in (master, branch-3.0), need run cloud_p1"
           trigger_or_skip_build \
             "${{ steps.changes.outputs.changed_cloud_p1 }}" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
             "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
             "cloud_p1" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         else
-          echo "PR target branch not in (master), skip run cloud_p1"
+          echo "PR target branch is not in (master, branch-3.0), skip run cloud_p1"
           trigger_or_skip_build \
             "false" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
@@ -341,20 +364,37 @@ jobs:
         source ./regression-test/pipeline/common/teamcity-utils.sh
         set -x
         if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
+              "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-3.0'" ||
               "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ]]; then
-          echo "PR target branch in (master, branch-2.0), need run performance"
+          echo "PR target branch is in (master, branch-2.0, branch-3.0), need run performance"
           trigger_or_skip_build \
             "${{ steps.changes.outputs.changed_performance }}" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
             "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
             "performance" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         else
-          echo "PR target branch not in (master, branch-2.0), skip run performance"
+          echo "PR target branch is not in (master, branch-2.0, branch-3.0), skip run performance"
           trigger_or_skip_build \
             "false" \
             "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
             "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
             "performance" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         fi
+
+    - name: "Skip buildall"
+      if: ${{ fromJSON(steps.parse.outputs.comment_skip) }}
+      run: |
+        source ./regression-test/pipeline/common/teamcity-utils.sh
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" feut
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" beut
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" compile
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" p0
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" p1
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" external
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" performance
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" arm
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" cloud_p0
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" cloud_p1
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" cloudut

.github/workflows/labeler/scope-label-conf.yml

@@ -25,4 +25,6 @@ meta-change:
   - gensrc/proto/*
 
 doing:
-  - *
+  - base-branch: 'master'
+  - changed-files:
+    - any-glob-to-any-file: '**'

.licenserc.yaml

@@ -92,4 +92,5 @@ header:
     - "pytest/qe"
     - "pytest/sys/data"
     - "pytest/deploy/*.conf"
+    - "tools/jeprof"
   comment: on-failure

be/CMakeLists.txt

@@ -157,6 +157,7 @@ set(BOOST_VERSION "1.81.0")
 
 if (NOT APPLE)
     find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS system date_time)
+    find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS system container)
 else()
     find_package(Boost ${BOOST_VERSION} COMPONENTS system date_time)
     find_package(Boost ${BOOST_VERSION} COMPONENTS system container)
@@ -298,12 +299,11 @@ if (COMPILER_CLANG)
                         -Wno-implicit-float-conversion
                         -Wno-implicit-int-conversion
                         -Wno-sign-conversion
+                        -Wno-missing-field-initializers
+                        -Wno-unused-const-variable
                         -Wno-shorten-64-to-32)
     if (USE_LIBCPP)
         add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>)
-        if (NOT OS_MACOSX)
-            add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-lstdc++>)
-        endif()
         add_definitions(-DUSE_LIBCPP)
     endif()
 endif ()
@@ -517,6 +517,7 @@ find_package(absl)
 # add it here first.
 set(COMMON_THIRDPARTY
     Boost::date_time
+    Boost::container
     ${COMMON_THIRDPARTY}
 )
 
@@ -559,7 +560,6 @@ endif()
 if (OS_MACOSX)
     set(COMMON_THIRDPARTY
         ${COMMON_THIRDPARTY}
-        Boost::container
         bfd
         iberty
         intl
@@ -603,9 +603,11 @@ if (NOT OS_MACOSX)
         ${DORIS_DEPENDENCIES}
         -static-libstdc++
         -static-libgcc
-        -lstdc++fs
         -lresolv
     )
+    if (NOT (USE_LIBCPP AND COMPILER_CLANG))
+        set(DORIS_LINK_LIBS ${DORIS_LINK_LIBS} -lstdc++fs)
+    endif()
 else()
     set(DORIS_LINK_LIBS
         ${DORIS_LINK_LIBS}

be/src/agent/be_exec_version_manager.h

@@ -80,14 +80,16 @@ class BeExecVersionManager {
  *    b. clear old version of version 3->4
  *    c. change FunctionIsIPAddressInRange from AlwaysNotNullable to DependOnArguments
  *    d. change some agg function nullable property: PR #37215
+ *    e. change variant serde to fix PR #38413
  */
-constexpr inline int BeExecVersionManager::max_be_exec_version = 5;
+constexpr inline int BeExecVersionManager::max_be_exec_version = 7;
 constexpr inline int BeExecVersionManager::min_be_exec_version = 0;
 
 /// functional
 constexpr inline int BITMAP_SERDE = 3;
 constexpr inline int USE_NEW_SERDE = 4;         // release on DORIS version 2.1
 constexpr inline int OLD_WAL_SERDE = 3;         // use to solve compatibility issues, see pr #32299
 constexpr inline int AGG_FUNCTION_NULLABLE = 5; // change some agg nullable property: PR #37215
+constexpr inline int VARIANT_SERDE = 6;         // change variant serde to fix PR #38413
 
 } // namespace doris