Merge pull request #338 from wudidapaopao/upgrade-to-v25.5.2.47

Upgrade ClickHouse version to v25.5.2.47

Author: auxten

.clang-format

@@ -83,6 +83,7 @@ NamespaceIndentation: None
 ObjCBlockIndentWidth: 4
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: Never
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120

.clang-tidy

@@ -10,40 +10,30 @@ HeaderFilterRegex: '^.*/(base|src|programs|utils)/.*(h|hpp)$'
 Checks: [
   '*',
 
-  '-abseil-*',
+  '-abseil-string-find-str-contains', # disabled to avoid a misleading suggestion (obsolete absl::StrContains() instead of C++23 std::string::contains())
 
   '-altera-*',
 
   '-android-*',
 
+  '-boost-use-ranges',
+
   '-bugprone-assignment-in-if-condition',
   '-bugprone-branch-clone',
   '-bugprone-easily-swappable-parameters',
   '-bugprone-exception-escape',
-  '-bugprone-forward-declaration-namespace',
   '-bugprone-implicit-widening-of-multiplication-result',
   '-bugprone-multi-level-implicit-pointer-conversion',
   '-bugprone-narrowing-conversions',
-  '-bugprone-not-null-terminated-result',
-  '-bugprone-reserved-identifier', # useful but too slow, TODO retry when https://reviews.llvm.org/rG1c282052624f9d0bd273bde0b47b30c96699c6c7 is merged
   '-bugprone-unchecked-optional-access',
   '-bugprone-crtp-constructor-accessibility',
-  '-bugprone-suspicious-stringview-data-usage',
+  '-bugprone-not-null-terminated-result',
 
   '-cert-dcl16-c',
-  '-cert-dcl37-c',
-  '-cert-dcl51-cpp',
   '-cert-err58-cpp',
-  '-cert-msc32-c',
-  '-cert-msc51-cpp',
-  '-cert-oop54-cpp',
-  '-cert-oop57-cpp',
-  '-cert-err33-c', # Misreports on clang-19: it warns about all functions containing 'remove' in the name, not only about the standard library.
 
   '-clang-analyzer-optin.performance.Padding',
 
-  '-clang-analyzer-unix.Malloc',
-
   '-cppcoreguidelines-*', # impractical in a codebase as large as ClickHouse, also slow
 
   '-darwin-*',
@@ -76,38 +66,34 @@ Checks: [
   '-hicpp-use-emplace',
   '-hicpp-vararg',
 
-  '-linuxkernel-*',
-
   '-llvm-*',
 
   '-llvmlibc-*',
 
-  '-openmp-*',
-
   '-misc-const-correctness',
   '-misc-include-cleaner', # useful but far too many occurrences
   '-misc-no-recursion',
   '-misc-non-private-member-variables-in-classes',
-  '-misc-confusable-identifiers', # useful but slooo
   '-misc-use-anonymous-namespace',
+  '-misc-use-internal-linkage',
 
   '-modernize-avoid-c-arrays',
   '-modernize-concat-nested-namespaces',
-  '-modernize-macro-to-enum',
   '-modernize-pass-by-value',
   '-modernize-return-braced-init-list',
   '-modernize-use-auto',
-  '-modernize-use-constraints', # This is a good check, but clang-tidy crashes, see https://github.com/llvm/llvm-project/issues/91872
   '-modernize-use-default-member-init',
   '-modernize-use-emplace',
   '-modernize-use-nodiscard',
+  '-modernize-use-ranges',
   '-modernize-use-trailing-return-type',
   '-modernize-use-designated-initializers',
 
+  '-performance-avoid-endl',
   '-performance-enum-size',
   '-performance-inefficient-string-concatenation',
+  '-performance-inefficient-vector-operation',
   '-performance-no-int-to-ptr',
-  '-performance-avoid-endl',
   '-performance-unnecessary-value-param',
 
   '-portability-simd-intrinsics',
@@ -122,7 +108,6 @@ Checks: [
   '-readability-identifier-length',
   '-readability-identifier-naming', # useful but too slow
   '-readability-implicit-bool-conversion',
-  '-readability-isolate-declaration',
   '-readability-magic-numbers',
   '-readability-named-parameter',
   '-readability-redundant-declaration',
@@ -137,6 +122,7 @@ Checks: [
   '-readability-suspicious-call-argument',
   '-readability-uppercase-literal-suffix',
   '-readability-use-anyofallof',
+  '-readability-math-missing-parentheses',
 
   '-zircon-*'
 ]
@@ -173,4 +159,4 @@ CheckOptions:
   performance-move-const-arg.CheckTriviallyCopyableMove: false
   # Workaround clang-tidy bug: https://github.com/llvm/llvm-project/issues/46097
   readability-identifier-naming.TypeTemplateParameterIgnoredRegexp: expr-type
-  cppcoreguidelines-avoid-do-while.IgnoreMacros: true
+  cppcoreguidelines-avoid-do-while.IgnoreMacros: true

.clangd

@@ -14,3 +14,6 @@ Diagnostics:
             readability-identifier-naming,
             bugprone-reserved-identifier,
         ]
+# Require LLVM 20 (https://github.com/llvm/llvm-project/pull/67749)
+Style:
+  AngledHeaders: [".*"]

.editorconfig

@@ -19,3 +19,7 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+
+# Some SQL results have trailing whitespace which is removed by IDEs
+[tests/queries/**.reference]
+trim_trailing_whitespace = false

.git-blame-ignore-revs

@@ -13,3 +13,9 @@
 # dbms/ → src/
 # (though it is unlikely that you will see it in blame)
 06446b4f08a142d6f1bc30664c47ded88ab51782
+
+# Applied Black formatter for Python code
+e6f5a3f98b21ba99cf274a9833797889e020a2b3
+
+# Enabling clang-tidy readability-else-no-return rule
+67c1e89d90ef576e62f8b1c68269742a3c6f9b1e

.gitattributes

@@ -2,3 +2,4 @@ contrib/* linguist-vendored
 *.h linguist-language=C++
 tests/queries/0_stateless/data_json/* binary
 tests/queries/0_stateless/*.reference -crlf
+src/Core/SettingsChangesHistory.cpp merge=union

.github/workflows/build_linux_arm64_wheels-gh.yml

@@ -45,9 +45,9 @@ jobs:
           uname -a
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 18
-          which clang++-18
-          clang++-18 --version
+          sudo ./llvm.sh 19
+          which clang++-19
+          clang++-19 --version
           sudo apt-get install -y make cmake ccache ninja-build yasm gawk wget
           ccache -s
       - name: Update git
@@ -68,13 +68,13 @@ jobs:
           key: ${{ matrix.os }}
           max-size: 5G
           append-timestamp: true
-      - name: remove old clang and link clang-18 to clang
+      - name: remove old clang and link clang-19 to clang
         if: matrix.os == 'ubuntu-24.04'
         run: |
           sudo rm -f /usr/bin/clang || true
-          sudo ln -s /usr/bin/clang-18 /usr/bin/clang
+          sudo ln -s /usr/bin/clang-19 /usr/bin/clang
           sudo rm -f /usr/bin/clang++ || true
-          sudo ln -s /usr/bin/clang++-18 /usr/bin/clang++
+          sudo ln -s /usr/bin/clang++-19 /usr/bin/clang++
           which clang++
           clang++ --version
       - name: Run chdb/build.sh

.github/workflows/build_linux_x86_wheels.yml

@@ -45,9 +45,9 @@ jobs:
           uname -a
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 18
-          which clang++-18
-          clang++-18 --version
+          sudo ./llvm.sh 19
+          which clang++-19
+          clang++-19 --version
           sudo apt-get install -y make cmake ccache ninja-build yasm gawk wget
           ccache -s
       - name: Update git
@@ -68,13 +68,13 @@ jobs:
           key: ${{ matrix.os }}
           max-size: 5G
           append-timestamp: true
-      - name: remove old clang and link clang-18 to clang
+      - name: remove old clang and link clang-19 to clang
         if: matrix.os == 'ubuntu-22.04'
         run: |
           sudo rm -f /usr/bin/clang || true
-          sudo ln -s /usr/bin/clang-18 /usr/bin/clang
+          sudo ln -s /usr/bin/clang-19 /usr/bin/clang
           sudo rm -f /usr/bin/clang++ || true
-          sudo ln -s /usr/bin/clang++-18 /usr/bin/clang++
+          sudo ln -s /usr/bin/clang++-19 /usr/bin/clang++
           which clang++
           clang++ --version
       - name: Run chdb/build.sh

.github/workflows/build_macos_arm64_wheels.yml

@@ -0,0 +1,165 @@
+name: Build macOS arm64
+
+on:
+  workflow_dispatch:
+    inputs:
+      TAG_NAME:
+        description: 'Release Version Tag'
+        required: true
+  release:
+    types: [created]
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**/*.md'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**/*.md'
+
+jobs:
+  build_wheels_macos_13:
+    name: ${{ matrix.os }} py${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-13-xlarge ]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+    env:
+      RUNNER_OS: ${{ matrix.os }}
+      PYTHON_VERSION: ${{ matrix.python-version }}
+    steps:
+      - name: Install python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "${{ matrix.python-version }}"
+      - name: Remove /usr/local/bin/python3
+        run: |
+          sudo rm -f /usr/local/bin/python3
+      - name: Install clang++ for macOS
+        run: |
+          pwd
+          uname -a
+          export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+          brew update
+          brew install ca-certificates lz4 mpdecimal openssl@3 readline sqlite xz z3 zstd
+          brew install --ignore-dependencies llvm@19
+          brew install git ccache ninja libtool gettext gcc binutils grep findutils nasm
+          cd /usr/local/opt/ && sudo rm -f llvm && sudo ln -sf llvm@19 llvm
+          export PATH=$(brew --prefix llvm@19)/bin:$PATH
+          which clang++
+          clang++ --version
+          ccache -s
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Update submodules
+        run: |
+          git submodule update --init --recursive --jobs 4
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ matrix.os }}
+          max-size: 5G
+          append-timestamp: true
+      - name: Run chdb/build.sh
+        timeout-minutes: 300
+        run: |
+          python3 -m pip install pybind11 setuptools
+          export PATH=$(brew --prefix llvm@19)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
+          export CC=$(brew --prefix llvm@19)/bin/clang
+          export CXX=$(brew --prefix llvm@19)/bin/clang++
+          bash gen_manifest.sh
+          bash ./chdb/build.sh
+          python3 -m pip install pandas pyarrow
+          bash -x ./chdb/test_smoke.sh
+        continue-on-error: false
+      - name: Debug libchdb
+        run: |
+          ls -lh
+          llvm-nm libchdb.so | grep query_stable || true
+          echo "Global Symbol in libchdb.so:"
+          llvm-nm -g libchdb.so || true
+          echo "Global Symbol in libclickhouse-local-chdb.a:"
+          llvm-nm -g buildlib/programs/local/libclickhouse-local-chdb.a || true
+          echo "Global Symbol in libclickhouse-local-lib.a:"
+          llvm-nm -g buildlib/programs/local/libclickhouse-local-lib.a || true
+          echo "pychdb_cmd.sh:"
+          cat buildlib/pychdb_cmd.sh
+          echo "libchdb_cmd.sh:"
+          cat buildlib/libchdb_cmd.sh
+      - name: Run libchdb stub in examples dir
+        run: |
+          bash -x ./examples/runStub.sh
+      - name: Keep killall ccache and wait for ccache to finish
+        if: always()
+        run: |
+          sleep 60
+          while ps -ef | grep ccache | grep -v grep; do \
+            killall ccache; \
+            sleep 10; \
+          done
+      - name: Check ccache statistics
+        run: |
+          ccache -s
+          ls -lh chdb
+          df -h
+        env:
+          CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@19)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@19)/bin/clang CXX=$(brew --prefix llvm@19)/bin/clang++"
+      - name: Install dependencies for building wheels
+        run: |
+          python3 -m pip install -U pip tox pybind11 twine setuptools wheel>=0.40.0
+      - name: Build wheels
+        run: |
+          export PATH=$(brew --prefix llvm@19)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
+          export CC=$(brew --prefix llvm@19)/bin/clang
+          export CXX=$(brew --prefix llvm@19)/bin/clang++
+          make wheel
+      - name: Fix wheel platform tag
+        run: |
+          python3 -m wheel tags --platform-tag=macosx_11_0_arm64 --remove dist/*.whl
+      - name: Run tests
+        run: |
+          python3 -m pip install dist/*.whl
+          python3 -m pip install pandas pyarrow psutil
+          python3 -c "import chdb; res = chdb.query('select 1112222222,555', 'CSV'); print(res)"
+          make test
+        continue-on-error: false
+      - name: Show files
+        run: ls -lh dist
+        shell: bash
+      - name: Upload wheels to release
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          gh release upload ${{ github.ref_name }} dist/*.whl --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      - name: Packege libchdb.so
+        if: matrix.python-version == '3.12'
+        run: |
+          cp programs/local/chdb.h chdb.h
+          tar -czvf macos-arm64-libchdb.tar.gz libchdb.so chdb.h
+      - name: Upload libchdb.so to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.python-version == '3.12'
+        run: |
+          gh release upload ${{ github.ref_name }} macos-arm64-libchdb.tar.gz --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      - uses: actions/upload-artifact@v4
+        with:
+          name: chdb-artifacts-macos-arm64-${{ matrix.python-version }}
+          path: |
+            ./dist/*.whl
+            ./macos-arm64-libchdb.tar.gz
+          overwrite: true
+      - name: Upload pypi
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          python3 -m pip install twine
+          python3 -m twine upload dist/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}