Merge remote-tracking branch 'origin/backport/24.3/71308' into cherrypick/24.3/8615526f203760b04be472a97bc899e63db2bdcc

.clang-format

@@ -89,7 +89,7 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-RemoveBracesLLVM: false
+RemoveBracesLLVM: true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements

.clang-tidy

@@ -22,13 +22,10 @@ Checks: [
   '-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',
 
   '-cert-dcl16-c',
   '-cert-dcl37-c',
@@ -38,7 +35,6 @@ Checks: [
   '-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',
 
@@ -97,14 +93,12 @@ Checks: [
   '-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-override',
   '-modernize-use-trailing-return-type',
-  '-modernize-use-designated-initializers',
 
-  '-performance-enum-size',
   '-performance-inefficient-string-concatenation',
   '-performance-no-int-to-ptr',
   '-performance-avoid-endl',
@@ -112,7 +106,6 @@ Checks: [
 
   '-portability-simd-intrinsics',
 
-  '-readability-avoid-nested-conditional-operator',
   '-readability-avoid-unconditional-preprocessor-if',
   '-readability-braces-around-statements',
   '-readability-convert-member-functions-to-static',
@@ -126,14 +119,8 @@ Checks: [
   '-readability-magic-numbers',
   '-readability-named-parameter',
   '-readability-redundant-declaration',
-  '-readability-redundant-inline-specifier', # useful but incompatible with __attribute((always_inline))__ (aka. ALWAYS_INLINE, base/base/defines.h).
-        # ALWAYS_INLINE only has an effect if combined with `inline`: https://godbolt.org/z/Eefd74qdM
-  '-readability-redundant-member-init', # Useful but triggers another problem. Imagine a struct S with multiple String members. Structs are often instantiated via designated
-        # initializer S s{.s1 = [...], .s2 = [...], [...]}. In this case, compiler warning `missing-field-initializers` requires to specify all members which are not in-struct
-        # initialized (example: s1 in struct S { String s1; String s2{};}; is not in-struct initialized, therefore it must be specified at instantiation time). As explicitly
-        # specifying all members is tedious for large structs, `missing-field-initializers` makes programmers initialize as many members as possible in-struct. Clang-tidy
-        # warning `readability-redundant-member-init` does the opposite thing, both are not compatible with each other.
   '-readability-simplify-boolean-expr',
+  '-readability-static-accessed-through-instance',
   '-readability-suspicious-call-argument',
   '-readability-uppercase-literal-suffix',
   '-readability-use-anyofallof',

.editorconfig

@@ -19,7 +19,3 @@ 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,9 +13,3 @@
 # 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,4 +2,3 @@ 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/ISSUE_TEMPLATE/10_question.md

@@ -0,0 +1,12 @@
+---
+name: Question
+about: Ask a question about ClickHouse
+title: ''
+labels: question
+assignees: ''
+
+---
+
+> Make sure to check documentation https://clickhouse.com/docs/en/ first. If the question is concise and probably has a short answer, asking it in [community Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-1gh9ds7f4-PgDhJAaF8ad5RbWBAAjzFg) is probably the fastest way to find the answer. For more complicated questions, consider asking them on StackOverflow with "clickhouse" tag https://stackoverflow.com/questions/tagged/clickhouse 
+
+> If you still prefer GitHub issues, remove all this text and ask your question here.

.github/ISSUE_TEMPLATE/10_question.yaml

@@ -1,20 +0,0 @@
-name: Question
-description: Ask a question about ClickHouse
-labels: ["question"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > Make sure to check documentation https://clickhouse.com/docs/en/ first. If the question is concise and probably has a short answer, asking it in [community Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-1gh9ds7f4-PgDhJAaF8ad5RbWBAAjzFg) is probably the fastest way to find the answer. For more complicated questions, consider asking them on StackOverflow with "clickhouse" tag https://stackoverflow.com/questions/tagged/clickhouse
-  - type: textarea
-    attributes:
-      label: Company or project name
-      description: Put your company name or project description here.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Question
-      description: Please put your question here.
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/20_feature-request.md

@@ -9,13 +9,9 @@ assignees: ''
 
 > (you don't have to strictly follow this form)
 
-**Company or project name**
-
-> Put your company name or project description here
-
 **Use case**
 
-> A clear and concise description of what the intended usage scenario is.
+> A clear and concise description of what is the intended usage scenario is.
 
 **Describe the solution you'd like**
 

.github/ISSUE_TEMPLATE/30_unexpected-behaviour.md

@@ -9,10 +9,6 @@ assignees: ''
 
 (you don't have to strictly follow this form)
 
-**Company or project name**
-
-Put your company name or project description here
-
 **Describe the unexpected behaviour**
 A clear and concise description of what works not as it is supposed to.
 

.github/ISSUE_TEMPLATE/35_incomplete_implementation.md

@@ -9,10 +9,6 @@ assignees: ''
 
 (you don't have to strictly follow this form)
 
-**Company or project name**
-
-Put your company name or project description here
-
 **Describe the unexpected behaviour**
 A clear and concise description of what works not as it is supposed to.
 

.github/ISSUE_TEMPLATE/45_usability-issue.md

@@ -9,9 +9,6 @@ assignees: ''
 
 (you don't have to strictly follow this form)
 
-**Company or project name**
-Put your company name or project description here
-
 **Describe the issue**
 A clear and concise description of what works not as it is supposed to.
 

.github/ISSUE_TEMPLATE/50_build-issue.md

@@ -9,10 +9,6 @@ assignees: ''
 
 > Make sure that `git diff` result is empty and you've just pulled fresh master. Try cleaning up cmake cache. Just in case, official build instructions are published here: https://clickhouse.com/docs/en/development/build/
 
-**Company or project name**
-
-> Put your company name or project description here
-
 **Operating system**
 
 > OS kind or distribution, specific version/release, non-standard kernel if any. If you are trying to build inside virtual machine, please mention it too.

.github/ISSUE_TEMPLATE/60_documentation-issue.md

@@ -8,9 +8,6 @@ labels: comp-documentation
 
 (you don't have to strictly follow this form)
 
-**Company or project name**
-Put your company name or project description here
-
 **Describe the issue**
 A clear and concise description of what's wrong in documentation.
 

.github/ISSUE_TEMPLATE/70_performance-issue.md

@@ -9,9 +9,6 @@ assignees: ''
 
 (you don't have to strictly follow this form)
 
-**Company or project name**
-Put your company name or project description here
-
 **Describe the situation**
 What exactly works slower than expected?
 

.github/ISSUE_TEMPLATE/80_backward-compatibility.md

@@ -9,9 +9,6 @@ assignees: ''
 
 (you don't have to strictly follow this form)
 
-**Company or project name**
-Put your company name or project description here
-
 **Describe the issue**
 A clear and concise description of what works not as it is supposed to.
 

.github/ISSUE_TEMPLATE/85_bug-report.md

@@ -11,10 +11,6 @@ assignees: ''
 
 > You have to provide the following information whenever possible.
 
-**Company or project name**
-
-> Put your company name or project description here
-
 **Describe what's wrong**
 
 > A clear and concise description of what works not as it is supposed to.

.github/ISSUE_TEMPLATE/96_installation-issues.md

@@ -7,10 +7,6 @@ assignees: ''
 
 ---
 
-**Company or project name**
-
-Put your company name or project description here
-
 **I have tried the following solutions**: https://clickhouse.com/docs/en/faq/troubleshooting/#troubleshooting-installation-errors
 
 **Installation type**

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,13 +6,11 @@ tests/ci/cancel_and_rerun_workflow_lambda/app.py
 -->
 ### Changelog category (leave one):
 - New Feature
-- Experimental Feature
 - Improvement
 - Performance Improvement
 - Backward Incompatible Change
 - Build/Testing/Packaging Improvement
 - Documentation (changelog entry is not required)
-- Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
 - Bug Fix (user-visible misbehavior in an official stable release)
 - CI Fix or Improvement (changelog entry is not required)
 - Not for changelog (changelog entry is not required)
@@ -43,27 +41,44 @@ At a minimum, the following information should be added (but add more as needed)
 
 > Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/
 
-#### CI Settings (Only check the boxes if you know what you are doing):
-- [ ] <!---ci_set_required--> Allow: All Required Checks
-- [ ] <!---ci_include_stateless--> Allow: Stateless tests
-- [ ] <!---ci_include_stateful--> Allow: Stateful tests
-- [ ] <!---ci_include_integration--> Allow: Integration Tests
-- [ ] <!---ci_include_performance--> Allow: Performance tests
-- [ ] <!---ci_set_builds--> Allow: All Builds
-- [ ] <!---batch_0_1--> Allow: batch 1, 2 for multi-batch jobs
-- [ ] <!---batch_2_3--> Allow: batch 3, 4, 5, 6 for multi-batch jobs
 ---
-- [ ] <!---ci_exclude_style--> Exclude: Style check
-- [ ] <!---ci_exclude_fast--> Exclude: Fast test
-- [ ] <!---ci_exclude_asan--> Exclude: All with ASAN
-- [ ] <!---ci_exclude_tsan|msan|ubsan|coverage--> Exclude: All with TSAN, MSAN, UBSAN, Coverage
-- [ ] <!---ci_exclude_aarch64|release|debug--> Exclude: All with aarch64, release, debug
----
-- [ ] <!---ci_include_fuzzer--> Run only fuzzers related jobs (libFuzzer fuzzers, AST fuzzers, etc.)
-- [ ] <!---ci_exclude_ast--> Exclude: AST fuzzers
----
-- [ ] <!---do_not_test--> Do not test
-- [ ] <!---woolen_wolfdog--> Woolen Wolfdog
-- [ ] <!---upload_all--> Upload binaries for special builds
-- [ ] <!---no_merge_commit--> Disable merge-commit
-- [ ] <!---no_ci_cache--> Disable CI cache
+### Modify your CI run:
+**NOTE:** If your merge the PR with modified CI you **MUST KNOW** what you are doing
+**NOTE:** Checked options will be applied if set before CI RunConfig/PrepareRunConfig step
+
+#### Include tests (required builds will be added automatically):
+- [ ] <!---ci_include_fast--> Fast test
+- [ ] <!---ci_include_integration--> Integration Tests
+- [ ] <!---ci_include_stateless--> Stateless tests
+- [ ] <!---ci_include_stateful--> Stateful tests
+- [ ] <!---ci_include_unit--> Unit tests
+- [ ] <!---ci_include_performance--> Performance tests
+- [ ] <!---ci_include_asan--> All with ASAN
+- [ ] <!---ci_include_tsan--> All with TSAN
+- [ ] <!---ci_include_analyzer--> All with Analyzer
+- [ ] <!---ci_include_KEYWORD--> Add your option here
+
+#### Exclude tests:
+- [ ] <!---ci_exclude_fast--> Fast test
+- [ ] <!---ci_exclude_integration--> Integration Tests
+- [ ] <!---ci_exclude_stateless--> Stateless tests
+- [ ] <!---ci_exclude_stateful--> Stateful tests
+- [ ] <!---ci_exclude_performance--> Performance tests
+- [ ] <!---ci_exclude_asan--> All with ASAN
+- [ ] <!---ci_exclude_tsan--> All with TSAN
+- [ ] <!---ci_exclude_msan--> All with MSAN
+- [ ] <!---ci_exclude_ubsan--> All with UBSAN
+- [ ] <!---ci_exclude_coverage--> All with Coverage
+- [ ] <!---ci_exclude_aarch64--> All with Aarch64
+- [ ] <!---ci_exclude_KEYWORD--> Add your option here
+
+#### Extra options:
+- [ ] <!---do_not_test--> do not test (only style check)
+- [ ] <!---no_merge_commit--> disable merge-commit (no merge from master before tests)
+- [ ] <!---no_ci_cache--> disable CI cache (job reuse)
+
+#### Only specified batches in multi-batch jobs:
+- [ ] <!---batch_0--> 1
+- [ ] <!---batch_1--> 2
+- [ ] <!---batch_2--> 3
+- [ ] <!---batch_3--> 4

.github/actionlint.yml

@@ -6,4 +6,3 @@ self-hosted-runner:
     - fuzzer-unit-tester
     - style-checker
     - style-checker-aarch64
-    - release-maker

.github/actions/check_workflow/action.yml

@@ -1,21 +0,0 @@
-name: CheckWorkflowResults
-
-description: Check overall workflow status and post error to slack if any
-
-inputs:
-  needs:
-    description: github needs context as a json string
-    required: true
-    type: string
-
-runs:
-  using: "composite"
-  steps:
-    - name: Check Workflow
-      shell: bash
-      run: |
-        export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-        cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-        ${{ inputs.needs }}
-        EOF
-        python3 ./tests/ci/ci_buddy.py --check-wf-status

.github/actions/clean/action.yml

@@ -1,23 +1,11 @@
 name: Clean runner
 description: Clean the runner's temp path on ending
-inputs:
-  images:
-    description: clean docker images
-    default: false
-    type: boolean
 runs:
   using: "composite"
   steps:
-    - name: Clean Temp
+    - name: Clean
       shell: bash
       run: |
-        sudo rm -fr "${{runner.temp}}"
-    - name: Clean Docker Containers
-      shell: bash
-      run: |
-          docker rm -vf $(docker ps -aq) ||:
-    - name: Clean Docker Images
-      if: ${{ inputs.images }}
-      shell: bash
-      run: |
-        docker rmi -f $(docker images -aq) ||:
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "${{runner.temp}}"

.github/workflows/auto_release.yml

@@ -0,0 +1,45 @@
+name: AutoRelease
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
+concurrency:
+  group: auto-release
+on: # yamllint disable-line rule:truthy
+  # schedule:
+  #   - cron: '0 10-16 * * 1-5'
+  workflow_dispatch:
+
+jobs:
+  CherryPick:
+    runs-on: [self-hosted, style-checker-aarch64]
+    steps:
+      - name: Set envs
+        # https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#multiline-strings
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/cherry_pick
+          ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
+          ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
+          RCSK
+          REPO_OWNER=ClickHouse
+          REPO_NAME=ClickHouse
+          REPO_TEAM=core
+          EOF
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+          fetch-depth: 0
+      - name: Auto-release
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 auto_release.py --release-after-days=3
+      - name: Cleanup
+        if: always()
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"

.github/workflows/auto_releases.yml

@@ -1,99 +0,0 @@
-name: AutoReleases
-
-env:
-  PYTHONUNBUFFERED: 1
-
-concurrency:
-  group: autoreleases
-
-on:
-  #  schedule:
-  #    - cron: '0 9 * * *'
-  workflow_dispatch:
-    inputs:
-      dry-run:
-        description: 'Dry run'
-        required: false
-        default: false
-        type: boolean
-
-jobs:
-  AutoReleaseInfo:
-    runs-on: [self-hosted, release-maker]
-    outputs:
-      data: ${{ steps.info.outputs.AUTO_RELEASE_PARAMS }}
-      dry_run: ${{ steps.info.outputs.DRY_RUN }}
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
-          ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
-          RCSK
-          EOF
-          echo "DRY_RUN=true" >> "$GITHUB_ENV"
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          fetch-depth: 0  # full history needed
-      - name: Debug Info
-        uses: ./.github/actions/debug
-      - name: Prepare Info
-        id: info
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 auto_release.py --prepare
-          echo "::group::Auto Release Info"
-          python3 -m json.tool /tmp/autorelease_info.json
-          echo "::endgroup::"
-          {
-              echo 'AUTO_RELEASE_PARAMS<<EOF'
-              cat  /tmp/autorelease_params.json
-              echo 'EOF'
-          } >> "$GITHUB_OUTPUT"
-          if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            echo "DRY_RUN=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "DRY_RUN=${{ github.event.inputs.dry-run }}" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Post Release Branch statuses
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 auto_release.py --post-status
-      - name: Clean up
-        uses: ./.github/actions/clean
-
-  Releases:
-    needs: AutoReleaseInfo
-    strategy:
-      matrix:
-        release_params: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases }}
-      max-parallel: 1
-    name: Release ${{ matrix.release_params.release_branch }}
-    uses: ./.github/workflows/create_release.yml
-    with:
-      ref: ${{ matrix.release_params.commit_sha }}
-      type: patch
-      dry-run: ${{ fromJson(needs.AutoReleaseInfo.outputs.dry_run) }}
-    secrets:
-      ROBOT_CLICKHOUSE_COMMIT_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
-
-  CleanUp:
-    needs: [Releases]
-    runs-on: [self-hosted, release-maker]
-    steps:
-      - uses: ./.github/actions/clean
-        with:
-          images: true
-
-#  PostSlackMessage:
-#    needs: [Releases]
-#    runs-on: [self-hosted, release-maker]
-#    if: ${{ !cancelled() }}
-#    steps:
-#      - name: Check out repository code
-#        uses: ClickHouse/checkout@v1
-#      - name: Post
-#        run: |
-#          cd "$GITHUB_WORKSPACE/tests/ci"
-#          python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}

.github/workflows/backport_branches.yml

@@ -9,12 +9,6 @@ on: # yamllint disable-line rule:truthy
   push:
     branches:
       - 'backport/**'
-
-# Cancel the previous wf run in PRs.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   RunConfig:
     runs-on: [self-hosted, style-checker-aarch64]
@@ -38,6 +32,10 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           echo "Testing the main ci directory"
           python3 -m unittest discover -s . -p 'test_*.py'
+          for dir in *_lambda/; do
+            echo "Testing $dir"
+            python3 -m unittest discover -s "$dir" -p 'test_*.py'
+          done
       - name: PrepareRunConfig
         id: runconfig
         run: |
@@ -60,7 +58,7 @@ jobs:
   BuildDockers:
     needs: [RunConfig]
     if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/docker_test_images.yml
+    uses: ./.github/workflows/reusable_docker.yml
     with:
       data: ${{ needs.RunConfig.outputs.data }}
   CompatibilityCheckX86:
@@ -68,7 +66,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Compatibility check (release)
+      test_name: Compatibility check (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
   CompatibilityCheckAarch64:
@@ -157,24 +155,33 @@ jobs:
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
 ############################################################################################
-  Builds_Report:
+  BuilderReport:
     # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled() && needs.RunConfig.result == 'success' && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
-    needs: [RunConfig, BuilderDebAarch64, BuilderDebAsan, BuilderDebDebug, BuilderDebRelease, BuilderDebTsan, BuilderBinDarwin, BuilderBinDarwinAarch64]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-      - name: Download reports
-        run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(needs.RunConfig.outputs.data) }} --pre --job-name Builds
-      - name: Builds report
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 ./build_report_check.py --reports package_release package_aarch64 package_asan package_tsan package_debug binary_darwin binary_darwin_aarch64
-      - name: Set status
-        run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(needs.RunConfig.outputs.data) }} --post --job-name Builds
+    if: ${{ !cancelled() }}
+    needs:
+      - RunConfig
+      - BuilderDebAarch64
+      - BuilderDebAsan
+      - BuilderDebDebug
+      - BuilderDebRelease
+      - BuilderDebTsan
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse build check
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderSpecialReport:
+    # run report check for failed builds to indicate the CI error
+    if: ${{ !cancelled() }}
+    needs:
+      - RunConfig
+      - BuilderBinDarwin
+      - BuilderBinDarwinAarch64
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse special build check
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
 ############################################################################################
 #################################### INSTALL PACKAGES ######################################
 ############################################################################################
@@ -183,7 +190,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Install packages (release)
+      test_name: Install packages (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
       run_command: |
@@ -193,7 +200,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Install packages (aarch64)
+      test_name: Install packages (arm64)
       runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
       run_command: |
@@ -251,10 +258,10 @@ jobs:
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
   FinishCheck:
-    if: ${{ !cancelled() }}
+    if: ${{ !failure() && !cancelled() }}
     needs:
-      - RunConfig
-      - Builds_Report
+      - BuilderReport
+      - BuilderSpecialReport
       - FunctionalStatelessTestAsan
       - FunctionalStatefulTestDebug
       - StressTestTsan
@@ -269,23 +276,7 @@ jobs:
         with:
           clear-repository: true
       - name: Finish label
-        if: ${{ !failure() }}
         run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          # update mergeable check
-          python3 merge_pr.py --set-ci-status
-          # update overall ci report
-          python3 finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
+          python3 finish_check.py
           python3 merge_pr.py
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status

.github/workflows/cancel.yml

@@ -0,0 +1,19 @@
+name: Cancel
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
+on: # yamllint disable-line rule:truthy
+  workflow_run:
+    workflows: ["PullRequestCI", "ReleaseBranchCI", "DocsCheck", "BackportPR"]
+    types:
+      - requested
+jobs:
+  cancel:
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          all_but_latest: true
+          workflow_id: ${{ github.event.workflow.id }}

.github/workflows/create_release.yml

@@ -1,229 +0,0 @@
-name: CreateRelease
-
-concurrency:
-  group: release
-
-env:
-  PYTHONUNBUFFERED: 1
-
-'on':
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'Git reference (branch or commit sha) from which to create the release'
-        required: true
-        type: string
-      type:
-        description: 'The type of release: "new" for a new release or "patch" for a patch release'
-        required: true
-        type: choice
-        options:
-          - patch
-          - new
-      only-repo:
-        description: 'Run only repos updates including docker (repo-recovery, tests)'
-        required: false
-        default: false
-        type: boolean
-      dry-run:
-        description: 'Dry run'
-        required: false
-        default: false
-        type: boolean
-  workflow_call:
-    inputs:
-      ref:
-        description: 'Git reference (branch or commit sha) from which to create the release'
-        required: true
-        type: string
-      type:
-        description: 'The type of release: "new" for a new release or "patch" for a patch release'
-        required: true
-        type: string
-      only-repo:
-        description: 'Run only repos updates including docker (repo-recovery, tests)'
-        required: false
-        default: false
-        type: boolean
-      dry-run:
-        description: 'Dry run'
-        required: false
-        default: false
-        type: boolean
-    secrets:
-      ROBOT_CLICKHOUSE_COMMIT_TOKEN:
-
-jobs:
-  CreateRelease:
-    env:
-      GH_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
-    runs-on: [self-hosted, release-maker]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
-          fetch-depth: 0
-      - name: Debug Info
-        uses: ./.github/actions/debug
-      - name: Prepare Release Info
-        shell: bash
-        run: |
-          if [ ${{ inputs.only-repo }} == "true" ]; then
-              git tag -l ${{ inputs.ref }} || { echo "With only-repo option ref must be a valid release tag"; exit 1; }
-          fi
-          python3 ./tests/ci/create_release.py --prepare-release-info \
-            --ref ${{ inputs.ref }} --release-type ${{ inputs.type }} \
-            ${{ inputs.dry-run == true && '--dry-run' || '' }} \
-            ${{ inputs.only-repo == true && '--skip-tag-check' || '' }}
-          echo "::group::Release Info"
-          python3 -m json.tool /tmp/release_info.json
-          echo "::endgroup::"
-          release_tag=$(jq -r '.release_tag' /tmp/release_info.json)
-          commit_sha=$(jq -r '.commit_sha' /tmp/release_info.json)
-          is_latest=$(jq -r '.latest' /tmp/release_info.json)
-          echo "Release Tag: $release_tag"
-          echo "RELEASE_TAG=$release_tag" >> "$GITHUB_ENV"
-          echo "COMMIT_SHA=$commit_sha" >> "$GITHUB_ENV"
-          if [ "$is_latest" == "true" ]; then
-            echo "DOCKER_TAG_TYPE=release-latest" >> "$GITHUB_ENV"
-          else
-            echo "DOCKER_TAG_TYPE=release" >> "$GITHUB_ENV"
-          fi
-      - name: Download All Release Artifacts
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --download-packages ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Push Git Tag for the Release
-        if: ${{ ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --push-release-tag ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Push New Release Branch
-        if: ${{ inputs.type == 'new' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --push-new-release-branch ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Bump CH Version and Update Contributors' List
-        if: ${{ ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --create-bump-version-pr ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Bump Docker versions, Changelog, Security
-        if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --set-progress-started --progress "update changelog, docker version, security"
-
-          git checkout master  # in case WF started from feature branch
-          echo "List versions"
-          ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
-          echo "Update docker version"
-          ./utils/list-versions/update-docker-version.sh
-          echo "Generate ChangeLog"
-          export CI=1
-          docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 -e CI=1 --network=host \
-            --volume=".:/wd" --workdir="/wd" \
-            clickhouse/style-test \
-            ./tests/ci/changelog.py -v --debug-helpers \
-            --gh-user-or-token ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }} \
-            --jobs=5 \
-            --output="./docs/changelogs/${{ env.RELEASE_TAG }}.md" ${{ env.RELEASE_TAG }}
-          git add ./docs/changelogs/${{ env.RELEASE_TAG }}.md
-          echo "Generate Security"
-          python3 ./utils/security-generator/generate_security.py > SECURITY.md
-          git diff HEAD
-      - name: Create ChangeLog PR
-        if: ${{ inputs.type == 'patch' && ! inputs.dry-run && ! inputs.only-repo }}
-        uses: peter-evans/create-pull-request@v6
-        with:
-          author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
-          token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
-          committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
-          commit-message: Update version_date.tsv and changelogs after ${{ env.RELEASE_TAG }}
-          branch: auto/${{ env.RELEASE_TAG }}
-          base: master
-          assignees: ${{ github.event.sender.login }}  # assign the PR to the tag pusher
-          delete-branch: true
-          title: Update version_date.tsv and changelog after ${{ env.RELEASE_TAG }}
-          labels: do not test
-          body: |
-            Update version_date.tsv and changelogs after ${{ env.RELEASE_TAG }}
-            ### Changelog category (leave one):
-            - Not for changelog (changelog entry is not required)
-      - name: Complete previous steps and Restore git state
-        if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          git reset --hard HEAD
-          git checkout "$GITHUB_REF_NAME"
-          python3 ./tests/ci/create_release.py --set-progress-completed
-      - name: Create GH Release
-        if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --create-gh-release ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Export TGZ Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --export-tgz ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Test TGZ Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --test-tgz ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Export RPM Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --export-rpm ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Test RPM Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --test-rpm ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Export Debian Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --export-debian ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Test Debian Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --test-debian ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Docker clickhouse/clickhouse-server building
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          cd "./tests/ci"
-          python3 ./create_release.py --set-progress-started --progress "docker server release"
-          export CHECK_NAME="Docker server image"
-          python3 docker_server.py --tag-type ${{ env.DOCKER_TAG_TYPE }} --version ${{ env.RELEASE_TAG }} --check-name "$CHECK_NAME" --sha ${{ env.COMMIT_SHA }} ${{ ! inputs.dry-run && '--push' || '' }}
-          python3 ./create_release.py --set-progress-completed
-      - name: Docker clickhouse/clickhouse-keeper building
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          cd "./tests/ci"
-          python3 ./create_release.py --set-progress-started --progress "docker keeper release"
-          export CHECK_NAME="Docker keeper image"
-          python3 docker_server.py --tag-type ${{ env.DOCKER_TAG_TYPE }} --version ${{ env.RELEASE_TAG }} --check-name "$CHECK_NAME" --sha ${{ env.COMMIT_SHA }} ${{ ! inputs.dry-run && '--push'  || '' }}
-          python3 ./create_release.py --set-progress-completed
-      - name: Update release info. Merge created PRs
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --merge-prs ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Set current Release progress to Completed with OK
-        shell: bash
-        run: |
-          # dummy stage to finalize release info with "progress: completed; status: OK"
-          python3 ./tests/ci/create_release.py --set-progress-started --progress "completed"
-          python3 ./tests/ci/create_release.py --set-progress-completed
-      - name: Post Slack Message
-        if: ${{ !cancelled() }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --post-status ${{ inputs.dry-run == true && '--dry-run' || '' }}

.github/workflows/debug.yml

@@ -0,0 +1,11 @@
+# The CI for each commit, prints envs and content of GITHUB_EVENT_PATH
+name: Debug
+
+'on':
+  [push, pull_request, pull_request_review, release, workflow_dispatch, workflow_call]
+
+jobs:
+  DebugInfo:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6

.github/workflows/docker_test_images.yml

@@ -1,71 +0,0 @@
-name: Build docker images
-
-'on':
-  workflow_call:
-    inputs:
-      data:
-        description: json with ci data from todo job
-        required: true
-        type: string
-      set_latest:
-        description: set latest tag for resulting multiarch manifest
-        required: false
-        type: boolean
-        default: false
-
-env:
-  PYTHONUNBUFFERED: 1
-
-jobs:
-  DockerBuildAarch64:
-    runs-on: [self-hosted, style-checker-aarch64]
-    if: |
-      !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]'
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          ref: ${{ fromJson(inputs.data).git_ref }}
-      - name: Build images
-        run: |
-          python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \
-            --suffix aarch64 \
-            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
-            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}'
-  DockerBuildAmd64:
-    runs-on: [self-hosted, style-checker]
-    if: |
-      !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]'
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          ref: ${{ fromJson(inputs.data).git_ref }}
-      - name: Build images
-        run: |
-          python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \
-            --suffix amd64 \
-            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
-            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}'
-  DockerMultiArchManifest:
-    needs: [DockerBuildAmd64, DockerBuildAarch64]
-    runs-on: [self-hosted, style-checker]
-    if: |
-      !failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          ref: ${{ fromJson(inputs.data).git_ref }}
-      - name: Build images
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          FLAG_LATEST=''
-          if [ "${{ inputs.set_latest }}" == "true" ]; then
-            FLAG_LATEST='--set-latest'
-            echo "latest tag will be set for resulting manifests"
-          fi
-          python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64 \
-            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
-            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_multi) }}' \
-            $FLAG_LATEST

.github/workflows/jepsen.yml

@@ -8,67 +8,20 @@ on: # yamllint disable-line rule:truthy
   schedule:
     - cron: '0 */6 * * *'
   workflow_dispatch:
-
 jobs:
-  RunConfig:
-    runs-on: [self-hosted, style-checker-aarch64]
-    outputs:
-      data: ${{ steps.runconfig.outputs.CI_DATA }}
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true # to ensure correct digests
-          fetch-depth: 0 # to get version
-          filter: tree:0
-      - name: Debug Info
-        uses: ./.github/actions/debug
-      - name: PrepareRunConfig
-        id: runconfig
-        run: |
-          echo "::group::configure CI run"
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --workflow "$GITHUB_WORKFLOW" --outfile ${{ runner.temp }}/ci_run_data.json
-          echo "::endgroup::"
-
-          echo "::group::CI run configure results"
-          python3 -m json.tool ${{ runner.temp }}/ci_run_data.json
-          echo "::endgroup::"
-          {
-            echo 'CI_DATA<<EOF'
-            cat  ${{ runner.temp }}/ci_run_data.json
-            echo 'EOF'
-          } >> "$GITHUB_OUTPUT"
   KeeperJepsenRelease:
-    needs: [RunConfig]
-    uses: ./.github/workflows/reusable_test.yml
+    uses: ./.github/workflows/reusable_simple_job.yml
     with:
-      test_name: ClickHouse Keeper Jepsen
-      runner_type: style-checker-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
+      test_name: Jepsen keeper check
+      runner_type: style-checker
+      report_required: true
       run_command: |
         python3 jepsen_check.py keeper
-  ServerJepsenRelease:
-    if: false  # skip for server
-    needs: [RunConfig]
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: ClickHouse Server Jepsen
-      runner_type: style-checker-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 jepsen_check.py server
-  CheckWorkflow:
-    if: ${{ !cancelled() }}
-    needs: [RunConfig, ServerJepsenRelease, KeeperJepsenRelease]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status
+  # ServerJepsenRelease:
+  #   uses: ./.github/workflows/reusable_simple_job.yml
+  #   with:
+  #     test_name: Jepsen server check
+  #     runner_type: style-checker
+  #     run_command: |
+  #       cd "$REPO_COPY/tests/ci"
+  #       python3 jepsen_check.py server

.github/workflows/master.yml

@@ -23,16 +23,15 @@ jobs:
           filter: tree:0
       - name: Debug Info
         uses: ./.github/actions/debug
-      - name: Merge sync PR
+      - name: Python unit tests
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 sync_pr.py --merge || :
-# Runs in MQ:
-#      - name: Python unit tests
-#        run: |
-#          cd "$GITHUB_WORKSPACE/tests/ci"
-#          echo "Testing the main ci directory"
-#          python3 -m unittest discover -s . -p 'test_*.py'
+          echo "Testing the main ci directory"
+          python3 -m unittest discover -s . -p 'test_*.py'
+          for dir in *_lambda/; do
+            echo "Testing $dir"
+            python3 -m unittest discover -s "$dir" -p 'test_*.py'
+          done
       - name: PrepareRunConfig
         id: runconfig
         run: |
@@ -50,93 +49,815 @@ jobs:
       - name: Re-create GH statuses for skipped jobs if any
         run: |
             python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --update-gh-statuses
-# Runs in MQ:
-#  BuildDockers:
-#    needs: [RunConfig]
-#    if: ${{ !failure() && !cancelled() }}
-#    uses: ./.github/workflows/docker_test_images.yml
-#    with:
-#      data: ${{ needs.RunConfig.outputs.data }}
-  # StyleCheck:
-  #   needs: [RunConfig, BuildDockers]
-  #   if: ${{ !failure() && !cancelled() }}
-  #   uses: ./.github/workflows/reusable_test.yml
-  #   with:
-  #     test_name: Style check
-  #     runner_type: style-checker
-  #     data: ${{ needs.RunConfig.outputs.data }}
-  #     run_command: |
-  #         python3 style_check.py --no-push
-
-  ################################# Main stages #################################
-  # for main CI chain
-  #
-  Builds_1:
+  BuildDockers:
     needs: [RunConfig]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_1') }}
-    # using callable wf (reusable_stage.yml) allows grouping all nested jobs under a tab
-    uses: ./.github/workflows/reusable_build_stage.yml
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_docker.yml
     with:
-      stage: Builds_1
       data: ${{ needs.RunConfig.outputs.data }}
-  Tests_1:
-    needs: [RunConfig, Builds_1]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_1') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_1
-      data: ${{ needs.RunConfig.outputs.data }}
-  Builds_2:
-    needs: [RunConfig, Builds_1]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_2') }}
-    uses: ./.github/workflows/reusable_build_stage.yml
-    with:
-      stage: Builds_2
-      data: ${{ needs.RunConfig.outputs.data }}
-  Tests_2_ww:
-    needs: [RunConfig, Builds_2]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2_ww') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_2_ww
-      data: ${{ needs.RunConfig.outputs.data }}
-  Tests_2:
-    # Test_3 should not wait for Test_1/Test_2 and should not be blocked by them on master branch since all jobs need to run there.
-    needs: [RunConfig, Builds_1]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_2
-      data: ${{ needs.RunConfig.outputs.data }}
-
-  ################################# Reports #################################
-  # Reports should run even if Builds_1/2 fail - run them separately, not in Tests_1/2/3
-  Builds_Report:
-    # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled() && needs.RunConfig.result == 'success' && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
-    needs: [RunConfig, Builds_1, Builds_2]
+  StyleCheck:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Builds
+      test_name: Style check
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+      run_command: |
+          python3 style_check.py --no-push
+  CompatibilityCheckX86:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Compatibility check (amd64)
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+  CompatibilityCheckAarch64:
+    needs: [RunConfig, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Compatibility check (aarch64)
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+#########################################################################################
+#################################### ORDINARY BUILDS ####################################
+#########################################################################################
+# TODO: never skip builds!
+  BuilderDebRelease:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_release
+      checkout_depth: 0
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebReleaseCoverage:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_release_coverage
+      checkout_depth: 0
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebAarch64:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_aarch64
+      checkout_depth: 0
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderBinRelease:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_release
+      checkout_depth: 0 # otherwise we will have no info about contributors
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebAsan:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_asan
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebUBsan:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_ubsan
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebTsan:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_tsan
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebMsan:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_msan
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebDebug:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_debug
+      data: ${{ needs.RunConfig.outputs.data }}
+##########################################################################################
+##################################### SPECIAL BUILDS #####################################
+##########################################################################################
+  BuilderBinClangTidy:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_tidy
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderBinDarwin:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_darwin
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinAarch64:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinFreeBSD:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_freebsd
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinDarwinAarch64:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_darwin_aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinPPC64:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_ppc64le
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinAmd64Compat:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_amd64_compat
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinAmd64Musl:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_amd64_musl
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinAarch64V80Compat:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_aarch64_v80compat
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinRISCV64:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_riscv64
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+  BuilderBinS390X:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_s390x
+      data: ${{ needs.RunConfig.outputs.data }}
+      checkout_depth: 0
+############################################################################################
+##################################### Docker images  #######################################
+############################################################################################
+  DockerServerImage:
+    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Docker server image
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+  DockerKeeperImage:
+    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Docker keeper image
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+############################################################################################
+##################################### BUILD REPORTER #######################################
+############################################################################################
+  BuilderReport:
+    # run report check for failed builds to indicate the CI error
+    if: ${{ !cancelled() }}
+    needs:
+      - RunConfig
+      - BuilderDebAarch64
+      - BuilderDebAsan
+      - BuilderDebDebug
+      - BuilderDebMsan
+      - BuilderDebRelease
+      - BuilderDebTsan
+      - BuilderDebUBsan
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse build check
       runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-
-  FinishCheck:
+  BuilderSpecialReport:
+    # run report check for failed builds to indicate the CI error
     if: ${{ !cancelled() }}
-    needs: [RunConfig, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
-    runs-on: [self-hosted, style-checker-aarch64]
+    needs:
+      - RunConfig
+      - BuilderBinAarch64
+      - BuilderBinDarwin
+      - BuilderBinDarwinAarch64
+      - BuilderBinFreeBSD
+      - BuilderBinPPC64
+      - BuilderBinRISCV64
+      - BuilderBinS390X
+      - BuilderBinAmd64Compat
+      - BuilderBinAarch64V80Compat
+      - BuilderBinClangTidy
+      - BuilderBinAmd64Musl
+      - BuilderDebReleaseCoverage
+      - BuilderBinRelease
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse special build check
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+  MarkReleaseReady:
+    if: ${{ !failure() && !cancelled() }}
+    needs:
+      - BuilderBinDarwin
+      - BuilderBinDarwinAarch64
+      - BuilderDebRelease
+      - BuilderDebAarch64
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Debug
+        run: |
+          echo need with different filters
+          cat << 'EOF'
+          ${{ toJSON(needs) }}
+          ${{ toJSON(needs.*.result) }}
+          no failures ${{ !contains(needs.*.result, 'failure') }}
+          no skips ${{ !contains(needs.*.result, 'skipped') }}
+          no both ${{ !(contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
+          EOF
+      - name: Not ready
+        # fail the job to be able restart it
+        if: ${{ contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure') }}
+        run: exit 1
+      - name: Check out repository code
+        if: ${{ ! (contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
+        uses: ClickHouse/checkout@v1
+      - name: Mark Commit Release Ready
+        if: ${{ ! (contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 mark_release_ready.py
+############################################################################################
+#################################### INSTALL PACKAGES ######################################
+############################################################################################
+  InstallPackagesTestRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Install packages (amd64)
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+      run_command: |
+        python3 install_check.py "$CHECK_NAME"
+  InstallPackagesTestAarch64:
+    needs: [RunConfig, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Install packages (arm64)
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+      run_command: |
+        python3 install_check.py "$CHECK_NAME"
+##############################################################################################
+########################### FUNCTIONAl STATELESS TESTS #######################################
+##############################################################################################
+  FunctionalStatelessTestRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (release)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestReleaseAnalyzerS3Replicated:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (release, old analyzer, s3, DatabaseReplicated)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestS3Debug:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (debug, s3 storage)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestS3Tsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (tsan, s3 storage)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestAarch64:
+    needs: [RunConfig, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (aarch64)
+      runner_type: func-tester-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (asan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+
+  FunctionalStatelessTestTsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (tsan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestMsan:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (msan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestUBsan:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (ubsan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatelessTestDebug:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateless tests (debug)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+############################ FUNCTIONAl STATEFUL TESTS #######################################
+##############################################################################################
+  FunctionalStatefulTestRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (release)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestAarch64:
+    needs: [RunConfig, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (aarch64)
+      runner_type: func-tester-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (asan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestTsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (tsan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestMsan:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (msan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestUBsan:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (ubsan)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestDebug:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (debug)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  # Parallel replicas
+  FunctionalStatefulTestDebugParallelReplicas:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (debug, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestUBsanParallelReplicas:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (ubsan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestMsanParallelReplicas:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (msan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestTsanParallelReplicas:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (tsan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestAsanParallelReplicas:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (asan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestReleaseParallelReplicas:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (release, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+########################### ClickBench #######################################################
+##############################################################################################
+  ClickBenchAMD64:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickBench (amd64)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+      run_command: |
+        python3 clickbench.py "$CHECK_NAME"
+  ClickBenchAarch64:
+    needs: [RunConfig, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickBench (aarch64)
+      runner_type: func-tester-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+      run_command: |
+        python3 clickbench.py "$CHECK_NAME"
+##############################################################################################
+######################################### STRESS TESTS #######################################
+##############################################################################################
+  StressTestAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stress test (asan)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  StressTestTsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stress test (tsan)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  StressTestMsan:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stress test (msan)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  StressTestUBsan:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stress test (ubsan)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  StressTestDebug:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stress test (debug)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+#############################################################################################
+############################# INTEGRATION TESTS #############################################
+#############################################################################################
+  IntegrationTestsAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Integration tests (asan)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  IntegrationTestsAnalyzerAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Integration tests (asan, old analyzer)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  IntegrationTestsTsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Integration tests (tsan)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  IntegrationTestsRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Integration tests (release)
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+##################################### AST FUZZERS ############################################
+##############################################################################################
+  ASTFuzzerTestAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: AST fuzzer (asan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  ASTFuzzerTestTsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: AST fuzzer (tsan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  ASTFuzzerTestUBSan:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: AST fuzzer (ubsan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  ASTFuzzerTestMSan:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: AST fuzzer (msan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  ASTFuzzerTestDebug:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: AST fuzzer (debug)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+#############################################################################################
+#################################### UNIT TESTS #############################################
+#############################################################################################
+  UnitTestsAsan:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Unit tests (asan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  UnitTestsReleaseClang:
+    needs: [RunConfig, BuilderBinRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Unit tests (release)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  UnitTestsTsan:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Unit tests (tsan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  UnitTestsMsan:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Unit tests (msan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  UnitTestsUBsan:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Unit tests (ubsan)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+#############################################################################################
+#################################### PERFORMANCE TESTS ######################################
+#############################################################################################
+  PerformanceComparisonX86:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Performance Comparison
+      runner_type: stress-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  PerformanceComparisonAarch:
+    needs: [RunConfig, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Performance Comparison Aarch64
+      runner_type: func-tester-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+############################ SQLLOGIC TEST ###################################################
+##############################################################################################
+  SQLLogicTestRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Sqllogic test (release)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+##################################### SQL TEST ###############################################
+##############################################################################################
+  SQLTest:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: SQLTest
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+###################################### SQLANCER FUZZERS ######################################
+##############################################################################################
+  SQLancerTestRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: SQLancer (release)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  SQLancerTestDebug:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: SQLancer (debug)
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FinishCheck:
+    if: ${{ !failure() && !cancelled() }}
+    needs:
+      - MarkReleaseReady
+      - FunctionalStatelessTestDebug
+      - FunctionalStatelessTestRelease
+      - FunctionalStatelessTestReleaseAnalyzerS3Replicated
+      - FunctionalStatelessTestAarch64
+      - FunctionalStatelessTestAsan
+      - FunctionalStatelessTestTsan
+      - FunctionalStatelessTestMsan
+      - FunctionalStatelessTestUBsan
+      - FunctionalStatelessTestS3Debug
+      - FunctionalStatelessTestS3Tsan
+      - FunctionalStatefulTestDebug
+      - FunctionalStatefulTestRelease
+      - FunctionalStatefulTestAarch64
+      - FunctionalStatefulTestAsan
+      - FunctionalStatefulTestTsan
+      - FunctionalStatefulTestMsan
+      - FunctionalStatefulTestUBsan
+      - FunctionalStatefulTestDebugParallelReplicas
+      - FunctionalStatefulTestUBsanParallelReplicas
+      - FunctionalStatefulTestMsanParallelReplicas
+      - FunctionalStatefulTestTsanParallelReplicas
+      - FunctionalStatefulTestAsanParallelReplicas
+      - FunctionalStatefulTestReleaseParallelReplicas
+      - StressTestDebug
+      - StressTestAsan
+      - StressTestTsan
+      - StressTestMsan
+      - StressTestUBsan
+      - IntegrationTestsAsan
+      - IntegrationTestsAnalyzerAsan
+      - IntegrationTestsTsan
+      - IntegrationTestsRelease
+      - PerformanceComparisonX86
+      - PerformanceComparisonAarch
+      - CompatibilityCheckX86
+      - CompatibilityCheckAarch64
+      - ASTFuzzerTestDebug
+      - ASTFuzzerTestAsan
+      - ASTFuzzerTestTsan
+      - ASTFuzzerTestMSan
+      - ASTFuzzerTestUBSan
+      - UnitTestsAsan
+      - UnitTestsTsan
+      - UnitTestsMsan
+      - UnitTestsUBsan
+      - UnitTestsReleaseClang
+      - SQLancerTestRelease
+      - SQLancerTestDebug
+      - SQLLogicTestRelease
+      - SQLTest
+    runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
       - name: Finish label
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status
+          python3 finish_check.py

.github/workflows/merge_queue.yml

@@ -1,119 +0,0 @@
-# yamllint disable rule:comments-indentation
-name: MergeQueueCI
-
-env:
-  # Force the stdout and stderr streams to be unbuffered
-  PYTHONUNBUFFERED: 1
-
-on:  # yamllint disable-line rule:truthy
-  merge_group:
-
-jobs:
-  RunConfig:
-    runs-on: [self-hosted, style-checker-aarch64]
-    outputs:
-      data: ${{ steps.runconfig.outputs.CI_DATA }}
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true # to ensure correct digests
-          fetch-depth: 0 # to get a version
-          filter: tree:0
-      - name: Debug Info
-        uses: ./.github/actions/debug
-      - name: Cancel PR workflow
-        run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --cancel-previous-run
-      - name: Python unit tests
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          echo "Testing the main ci directory"
-          python3 -m unittest discover -s . -p 'test_*.py'
-      - name: PrepareRunConfig
-        id: runconfig
-        run: |
-            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json
-
-            echo "::group::CI configuration"
-            python3 -m json.tool ${{ runner.temp }}/ci_run_data.json
-            echo "::endgroup::"
-
-            {
-              echo 'CI_DATA<<EOF'
-              cat  ${{ runner.temp }}/ci_run_data.json
-              echo 'EOF'
-            } >> "$GITHUB_OUTPUT"
-  BuildDockers:
-    needs: [RunConfig]
-    if: ${{ !failure() && !cancelled() && toJson(fromJson(needs.RunConfig.outputs.data).docker_data.missing_multi) != '[]' }}
-    uses: ./.github/workflows/docker_test_images.yml
-    with:
-      data: ${{ needs.RunConfig.outputs.data }}
-  StyleCheck:
-    needs: [RunConfig, BuildDockers]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Style check')}}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Style check
-      runner_type: style-checker-aarch64
-      run_command: |
-          python3 style_check.py
-      data: ${{ needs.RunConfig.outputs.data }}
-    secrets:
-      secret_envs: |
-        ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
-        ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
-        RCSK
-  FastTest:
-    needs: [RunConfig, BuildDockers]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Fast test') }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Fast test
-      runner_type: builder
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-          python3 fast_test_check.py
-
-  Builds_1:
-    needs: [RunConfig, BuildDockers]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_1') }}
-    # using callable wf (reusable_stage.yml) allows grouping all nested jobs under a tab
-    uses: ./.github/workflows/reusable_build_stage.yml
-    with:
-      stage: Builds_1
-      data: ${{ needs.RunConfig.outputs.data }}
-  Tests_1:
-    needs: [RunConfig, Builds_1]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_1') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_1
-      data: ${{ needs.RunConfig.outputs.data }}
-
-  CheckReadyForMerge:
-    if: ${{ !cancelled() }}
-    # Test_2 or Test_3 must not have jobs required for Mergeable check
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Tests_1]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-      - name: Check and set merge status
-        if: ${{ needs.StyleCheck.result == 'success' }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 merge_pr.py --set-ci-status
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status

.github/workflows/nightly.yml

@@ -10,6 +10,9 @@ env:
   workflow_dispatch:
 
 jobs:
+  Debug:
+    # The task for having a preserved ENV and event.json for later investigation
+    uses: ./.github/workflows/debug.yml
   RunConfig:
     runs-on: [self-hosted, style-checker-aarch64]
     outputs:
@@ -40,22 +43,7 @@ jobs:
             } >> "$GITHUB_OUTPUT"
   BuildDockers:
     needs: [RunConfig]
-    uses: ./.github/workflows/docker_test_images.yml
+    uses: ./.github/workflows/reusable_docker.yml
     with:
       data: "${{ needs.RunConfig.outputs.data }}"
       set_latest: true
-  CheckWorkflow:
-    if: ${{ !cancelled() }}
-    needs: [RunConfig, BuildDockers]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status

.github/workflows/pull_request.yml

@@ -6,6 +6,7 @@ env:
   PYTHONUNBUFFERED: 1
 
 on:  # yamllint disable-line rule:truthy
+  merge_group:
   pull_request:
     types:
       - synchronize
@@ -14,11 +15,6 @@ on:  # yamllint disable-line rule:truthy
     branches:
       - master
 
-# Cancel the previous wf run in PRs.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   RunConfig:
     runs-on: [self-hosted, style-checker-aarch64]
@@ -29,14 +25,12 @@ jobs:
         uses: ClickHouse/checkout@v1
         with:
           clear-repository: true # to ensure correct digests
-          fetch-depth: 0 # to get a version
+          fetch-depth: 0 # to get version
           filter: tree:0
       - name: Debug Info
         uses: ./.github/actions/debug
-      - name: Set pending Sync status
-        run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --set-pending-status
       - name: Labels check
+        if: ${{ github.event_name != 'merge_group' }}
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 run_check.py
@@ -45,6 +39,10 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           echo "Testing the main ci directory"
           python3 -m unittest discover -s . -p 'test_*.py'
+          for dir in *_lambda/; do
+            echo "Testing $dir"
+            python3 -m unittest discover -s "$dir" -p 'test_*.py'
+          done
       - name: PrepareRunConfig
         id: runconfig
         run: |
@@ -60,12 +58,13 @@ jobs:
               echo 'EOF'
             } >> "$GITHUB_OUTPUT"
       - name: Re-create GH statuses for skipped jobs if any
+        if: ${{ github.event_name != 'merge_group' }}
         run: |
             python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --update-gh-statuses
   BuildDockers:
     needs: [RunConfig]
     if: ${{ !failure() && !cancelled() && toJson(fromJson(needs.RunConfig.outputs.data).docker_data.missing_multi) != '[]' }}
-    uses: ./.github/workflows/docker_test_images.yml
+    uses: ./.github/workflows/reusable_docker.yml
     with:
       data: ${{ needs.RunConfig.outputs.data }}
   StyleCheck:
@@ -74,7 +73,7 @@ jobs:
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: Style check
-      runner_type: style-checker-aarch64
+      runner_type: style-checker
       run_command: |
           python3 style_check.py
       data: ${{ needs.RunConfig.outputs.data }}
@@ -84,7 +83,7 @@ jobs:
         ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
         RCSK
   FastTest:
-    needs: [RunConfig, BuildDockers, StyleCheck]
+    needs: [RunConfig, BuildDockers]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Fast test') }}
     uses: ./.github/workflows/reusable_test.yml
     with:
@@ -94,13 +93,13 @@ jobs:
       run_command: |
           python3 fast_test_check.py
 
-  ################################# Main stages #################################
+  ################################# Main statges #################################
   # for main CI chain
   #
   Builds_1:
-    needs: [RunConfig, StyleCheck, FastTest]
+    needs: [RunConfig, FastTest]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_1') }}
-    # using callable wf (reusable_stage.yml) allows grouping all nested jobs under a tab
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
     uses: ./.github/workflows/reusable_build_stage.yml
     with:
       stage: Builds_1
@@ -108,6 +107,7 @@ jobs:
   Tests_1:
     needs: [RunConfig, Builds_1]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_1') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
     uses: ./.github/workflows/reusable_test_stage.yml
     with:
       stage: Tests_1
@@ -115,83 +115,60 @@ jobs:
   Builds_2:
     needs: [RunConfig, Builds_1]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_2') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
     uses: ./.github/workflows/reusable_build_stage.yml
     with:
       stage: Builds_2
       data: ${{ needs.RunConfig.outputs.data }}
-  # stage for running non-required checks without being blocked by required checks (Test_1) if corresponding settings is selected
-  Tests_2_ww:
-    needs: [RunConfig, Builds_1]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2_ww') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_2_ww
-      data: ${{ needs.RunConfig.outputs.data }}
   Tests_2:
-    needs: [RunConfig, Builds_1, Tests_1]
+    needs: [RunConfig, Builds_2]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
     uses: ./.github/workflows/reusable_test_stage.yml
     with:
       stage: Tests_2
       data: ${{ needs.RunConfig.outputs.data }}
 
   ################################# Reports #################################
-  # Reports should run even if Builds_1/2 fail - run them separately (not in Tests_1/2/3)
-  Builds_Report:
+  # Reports should by run even if Builds_1/2 fail, so put them separatly in wf (not in Tests_1/2)
+  Builds_1_Report:
     # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled()
-      && needs.RunConfig.result == 'success'
-      && needs.StyleCheck.result != 'failure'
-      && needs.FastTest.result != 'failure'
-      && needs.BuildDockers.result != 'failure'
-      && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2]
+    if: ${{ !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'ClickHouse build check') }}
+    needs:
+      - RunConfig
+      - Builds_1
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Builds
+      test_name: ClickHouse build check
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+  Builds_2_Report:
+    # run report check for failed builds to indicate the CI error
+    if: ${{ !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'ClickHouse special build check') }}
+    needs:
+      - RunConfig
+      - Builds_2
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse special build check
       runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-
-  CheckReadyForMerge:
-    if: ${{ !cancelled() }}
-    # Test_2 or Test_3 do not have the jobs required for Mergeable check,
-    #  however, set them as "needs" to get all checks results before the automatic merge occurs.
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          filter: tree:0
-      - name: Check and set merge status
-        if: ${{ needs.StyleCheck.result == 'success' }}
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 merge_pr.py --set-ci-status
-      - name: Check Workflow results
-        uses: ./.github/actions/check_workflow
-        with:
-          needs: ${{ toJson(needs) }}
 
   ################################# Stage Final #################################
   #
   FinishCheck:
     if: ${{ !failure() && !cancelled() }}
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
-    runs-on: [self-hosted, style-checker-aarch64]
+    needs: [Tests_1, Tests_2]
+    runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
-        with:
-          filter: tree:0
       - name: Finish label
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
+          python3 finish_check.py
+          python3 merge_pr.py --check-approved
+
 
 #############################################################################################
 ###################################### JEPSEN TESTS #########################################
@@ -204,9 +181,10 @@ jobs:
     concurrency:
       group: jepsen
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'ClickHouse Keeper Jepsen') }}
-    needs: [RunConfig, Builds_1]
+    # jepsen needs binary_release build which is in Builds_2
+    needs: [RunConfig, Builds_2]
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse Keeper Jepsen
-      runner_type: style-checker-aarch64
+      runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}

.github/workflows/pull_request_approved.yml

@@ -0,0 +1,23 @@
+name: PullRequestApprovedCI
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
+on:  # yamllint disable-line rule:truthy
+  pull_request_review:
+    types:
+      - submitted
+
+jobs:
+  MergeOnApproval:
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+      - name: Merge approved PR
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 merge_pr.py --check-approved

.github/workflows/release.yml

@@ -0,0 +1,69 @@
+name: PublishedReleaseCI
+# - Gets artifacts from S3
+# - Sends it to JFROG Artifactory
+# - Adds them to the release assets
+
+on: # yamllint disable-line rule:truthy
+  release:
+    types:
+    - published
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag'
+        required: true
+        type: string
+
+jobs:
+  ReleasePublish:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Set tag from input
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Set tag from REF
+      if: github.event_name == 'release'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+    - name: Deploy packages and assets
+      run: |
+        curl --silent --data '' --no-buffer \
+          '${{ secrets.PACKAGES_RELEASE_URL }}/release/'"${GITHUB_TAG}"'?binary=binary_darwin&binary=binary_darwin_aarch64&sync=true'
+  ############################################################################################
+  ##################################### Docker images  #######################################
+  ############################################################################################
+  DockerServerImages:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Set tag from input
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Set tag from REF
+      if: github.event_name == 'release'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+    - name: Check out repository code
+      uses: ClickHouse/checkout@v1
+      with:
+        clear-repository: true
+        fetch-depth: 0  # otherwise we will have no version info
+        filter: tree:0
+        ref: ${{ env.GITHUB_TAG }}
+    - name: Check docker clickhouse/clickhouse-server building
+      run: |
+        cd "$GITHUB_WORKSPACE/tests/ci"
+        export CHECK_NAME="Docker server image"
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" --check-name "$CHECK_NAME" --push
+    - name: Check docker clickhouse/clickhouse-keeper building
+      run: |
+        cd "$GITHUB_WORKSPACE/tests/ci"
+        export CHECK_NAME="Docker keeper image"
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" --check-name "$CHECK_NAME" --push
+    - name: Cleanup
+      if: always()
+      run: |
+        docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+        docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+        sudo rm -fr "$TEMP_PATH"

.github/workflows/release_branches.yml

@@ -35,6 +35,10 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           echo "Testing the main ci directory"
           python3 -m unittest discover -s . -p 'test_*.py'
+          for dir in *_lambda/; do
+            echo "Testing $dir"
+            python3 -m unittest discover -s "$dir" -p 'test_*.py'
+          done
       - name: PrepareRunConfig
         id: runconfig
         run: |
@@ -55,7 +59,7 @@ jobs:
   BuildDockers:
     needs: [RunConfig]
     if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/docker_test_images.yml
+    uses: ./.github/workflows/reusable_docker.yml
     with:
       data: ${{ needs.RunConfig.outputs.data }}
   CompatibilityCheckX86:
@@ -63,7 +67,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Compatibility check (release)
+      test_name: Compatibility check (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
   CompatibilityCheckAarch64:
@@ -175,24 +179,35 @@ jobs:
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
 ############################################################################################
-  Builds_Report:
+  BuilderReport:
     # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled() && needs.RunConfig.result == 'success' && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
-    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64, BuilderDebAsan, BuilderDebUBsan, BuilderDebMsan, BuilderDebTsan, BuilderDebDebug, BuilderBinDarwin, BuilderBinDarwinAarch64]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-      - name: Download reports
-        run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(needs.RunConfig.outputs.data) }} --pre --job-name Builds
-      - name: Builds report
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 ./build_report_check.py --reports package_release package_aarch64 package_asan package_msan package_ubsan package_tsan package_debug binary_darwin binary_darwin_aarch64
-      - name: Set status
-        run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(needs.RunConfig.outputs.data) }} --post --job-name Builds
+    if: ${{ !cancelled() }}
+    needs:
+      - RunConfig
+      - BuilderDebRelease
+      - BuilderDebAarch64
+      - BuilderDebAsan
+      - BuilderDebTsan
+      - BuilderDebUBsan
+      - BuilderDebMsan
+      - BuilderDebDebug
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse build check
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
+  BuilderSpecialReport:
+    # run report check for failed builds to indicate the CI error
+    if: ${{ !cancelled() }}
+    needs:
+      - RunConfig
+      - BuilderBinDarwin
+      - BuilderBinDarwinAarch64
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ClickHouse special build check
+      runner_type: style-checker-aarch64
+      data: ${{ needs.RunConfig.outputs.data }}
   MarkReleaseReady:
     if: ${{ !failure() && !cancelled() }}
     needs:
@@ -232,7 +247,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Install packages (release)
+      test_name: Install packages (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
       run_command: |
@@ -242,7 +257,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Install packages (aarch64)
+      test_name: Install packages (arm64)
       runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
       run_command: |
@@ -444,12 +459,12 @@ jobs:
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
   FinishCheck:
-    if: ${{ !cancelled() }}
+    if: ${{ !failure() && !cancelled() }}
     needs:
-      - RunConfig
       - DockerServerImage
       - DockerKeeperImage
-      - Builds_Report
+      - BuilderReport
+      - BuilderSpecialReport
       - MarkReleaseReady
       - FunctionalStatelessTestDebug
       - FunctionalStatelessTestRelease
@@ -482,15 +497,6 @@ jobs:
         with:
           clear-repository: true
       - name: Finish label
-        if: ${{ !failure() }}
         run: |
-          # update overall ci report
-          python3 ./tests/ci/finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 finish_check.py

.github/workflows/reusable_build.yml

@@ -33,10 +33,6 @@ name: Build ClickHouse
       additional_envs:
         description: additional ENV variables to setup the job
         type: string
-    secrets:
-      secret_envs:
-        description: if given, it's passed to the environments
-        required: false
 
 jobs:
   Build:
@@ -58,7 +54,6 @@ jobs:
         run: |
           cat >> "$GITHUB_ENV" << 'EOF'
           ${{inputs.additional_envs}}
-          ${{secrets.secret_envs}}
           DOCKER_TAG<<DOCKER_JSON
           ${{ toJson(fromJson(inputs.data).docker_data.images) }}
           DOCKER_JSON

.github/workflows/reusable_build_stage.yml

@@ -1,11 +1,7 @@
 ### FIXME: merge reusable_test.yml and reusable_build.yml as they are almost identical
 #          and then merge reusable_build_stage.yml and reusable_test_stage.yml
 
-env:
-  PYTHONUNBUFFERED: 1
-
 name: BuildStageWF
-
 'on':
   workflow_call:
     inputs:
@@ -17,10 +13,6 @@ name: BuildStageWF
         description: ci data
         type: string
         required: true
-    secrets:
-      secret_envs:
-        description: if given, it's passed to the environments
-        required: false
 
 jobs:
   s:
@@ -38,5 +30,3 @@ jobs:
       # for now let's do I deep checkout for builds
       checkout_depth: 0
       data: ${{ inputs.data }}
-    secrets:
-      secret_envs: ${{ secrets.secret_envs }}

.github/workflows/reusable_docker.yml

@@ -0,0 +1,67 @@
+name: Build docker images
+'on':
+  workflow_call:
+    inputs:
+      data:
+        description: json with ci data from todo job
+        required: true
+        type: string
+      set_latest:
+        description: set latest tag for resulting multiarch manifest
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  DockerBuildAarch64:
+    runs-on: [self-hosted, style-checker-aarch64]
+    if: |
+      !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]'
+    steps:
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          ref: ${{ fromJson(inputs.data).git_ref }}
+      - name: Build images
+        run: |
+          python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \
+            --suffix aarch64 \
+            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
+            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}'
+  DockerBuildAmd64:
+    runs-on: [self-hosted, style-checker]
+    if: |
+      !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]'
+    steps:
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          ref: ${{ fromJson(inputs.data).git_ref }}
+      - name: Build images
+        run: |
+          python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \
+            --suffix amd64 \
+            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
+            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}'
+  DockerMultiArchManifest:
+    needs: [DockerBuildAmd64, DockerBuildAarch64]
+    runs-on: [self-hosted, style-checker]
+    if: |
+      !failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
+    steps:
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          ref: ${{ fromJson(inputs.data).git_ref }}
+      - name: Build images
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          FLAG_LATEST=''
+          if [ "${{ inputs.set_latest }}" == "true" ]; then
+            FLAG_LATEST='--set-latest'
+            echo "latest tag will be set for resulting manifests"
+          fi
+          python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64 \
+            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
+            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_multi) }}' \
+            $FLAG_LATEST

.github/workflows/reusable_test.yml

@@ -58,7 +58,7 @@ jobs:
     env:
       GITHUB_JOB_OVERRIDDEN: ${{inputs.test_name}}${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].num_batches > 1 && format('-{0}',matrix.batch) || '' }}
     strategy:
-      fail-fast: false  # we always wait for the entire matrix
+      fail-fast: false  # we always wait for entire matrix
       matrix:
         batch: ${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].batches }}
     steps:
@@ -102,8 +102,6 @@ jobs:
             --job-name '${{inputs.test_name}}' \
             --run \
             --run-command '''${{inputs.run_command}}'''
-          # shellcheck disable=SC2319
-          echo "JOB_EXIT_CODE=$?" >> "$GITHUB_ENV"
       - name: Post run
         if: ${{ !cancelled() }}
         run: |

.github/workflows/reusable_test_stage.yml

@@ -1,8 +1,4 @@
-env:
-  PYTHONUNBUFFERED: 1
-
 name: StageWF
-
 'on':
   workflow_call:
     inputs:
@@ -14,10 +10,6 @@ name: StageWF
         description: ci data
         type: string
         required: true
-    secrets:
-      secret_envs:
-        description: if given, it's passed to the environments
-        required: false
 
 jobs:
   s:
@@ -31,5 +23,3 @@ jobs:
       test_name: ${{ matrix.job_name_and_runner_type.job_name }}
       runner_type: ${{ matrix.job_name_and_runner_type.runner_type }}
       data: ${{ inputs.data }}
-    secrets:
-      secret_envs: ${{ secrets.secret_envs }}

.github/workflows/tags_stable.yml

@@ -0,0 +1,73 @@
+name: TagsStableWorkflow
+# - Gets artifacts from S3
+# - Sends it to JFROG Artifactory
+# - Adds them to the release assets
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
+on: # yamllint disable-line rule:truthy
+  push:
+    tags:
+    - 'v*-prestable'
+    - 'v*-stable'
+    - 'v*-lts'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Test tag'
+        required: true
+        type: string
+
+
+jobs:
+  UpdateVersions:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Set test tag
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Get tag name
+      if: github.event_name != 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+    - name: Check out repository code
+      uses: ClickHouse/checkout@v1
+      with:
+        ref: master
+        fetch-depth: 0
+        filter: tree:0
+    - name: Update versions, docker version, changelog, security
+      env:
+        GITHUB_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
+      run: |
+        ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
+        ./utils/list-versions/update-docker-version.sh
+        GID=$(id -g "${UID}")
+        docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 \
+            --volume="${GITHUB_WORKSPACE}:/ClickHouse" clickhouse/style-test \
+                /ClickHouse/utils/changelog/changelog.py -v --debug-helpers \
+                --gh-user-or-token="$GITHUB_TOKEN" --jobs=5 \
+                --output="/ClickHouse/docs/changelogs/${GITHUB_TAG}.md" "${GITHUB_TAG}"
+        git add "./docs/changelogs/${GITHUB_TAG}.md"
+        python3 ./utils/security-generator/generate_security.py > SECURITY.md
+        git diff HEAD
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6
+      with:
+        author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
+        committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        commit-message: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+        branch: auto/${{ env.GITHUB_TAG }}
+        assignees: ${{ github.event.sender.login }}  # assign the PR to the tag pusher
+        delete-branch: true
+        title: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+        labels: do not test
+        body: |
+          Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+
+          ### Changelog category (leave one):
+          - Not for changelog (changelog entry is not required)

.gitignore

@@ -21,9 +21,6 @@
 *.stderr
 *.stdout
 
-# llvm-xray logs
-xray-log.*
-
 /docs/build
 /docs/publish
 /docs/edit
@@ -159,7 +156,6 @@ website/package-lock.json
 /programs/server/store
 /programs/server/uuid
 /programs/server/coordination
-/programs/server/workload
 
 # temporary test files
 tests/queries/0_stateless/test_*

.gitmessage

@@ -0,0 +1,29 @@
+
+
+### CI modificators (add a leading space to apply) ###
+
+## To avoid a merge commit in CI:
+#no_merge_commit
+
+## To discard CI cache:
+#no_ci_cache
+
+## To not test (only style check):
+#do_not_test
+
+## To run specified set of tests in CI:
+#ci_set_<SET_NAME>
+#ci_set_reduced
+#ci_set_arm
+#ci_set_integration
+#ci_set_analyzer
+
+## To run specified job in CI:
+#job_<JOB NAME>
+#job_stateless_tests_release
+#job_package_debug
+#job_integration_tests_asan
+
+## To run only specified batches for multi-batch job(s)
+#batch_2
+#batch_1_2_3

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/facebook/zstd
 [submodule "contrib/lz4"]
 	path = contrib/lz4
-	url = https://github.com/lz4/lz4
+	url = https://github.com/ClickHouse/lz4
 [submodule "contrib/librdkafka"]
 	path = contrib/librdkafka
 	url = https://github.com/ClickHouse/librdkafka
@@ -22,6 +22,9 @@
 [submodule "contrib/capnproto"]
 	path = contrib/capnproto
 	url = https://github.com/ClickHouse/capnproto
+[submodule "contrib/double-conversion"]
+	path = contrib/double-conversion
+	url = https://github.com/google/double-conversion
 [submodule "contrib/re2"]
 	path = contrib/re2
 	url = https://github.com/google/re2
@@ -91,13 +94,13 @@
 [submodule "contrib/aws"]
 	path = contrib/aws
 	url = https://github.com/ClickHouse/aws-sdk-cpp
-[submodule "contrib/aws-c-event-stream"]
+[submodule "aws-c-event-stream"]
 	path = contrib/aws-c-event-stream
 	url = https://github.com/awslabs/aws-c-event-stream
-[submodule "contrib/aws-c-common"]
+[submodule "aws-c-common"]
 	path = contrib/aws-c-common
 	url = https://github.com/awslabs/aws-c-common.git
-[submodule "contrib/aws-checksums"]
+[submodule "aws-checksums"]
 	path = contrib/aws-checksums
 	url = https://github.com/awslabs/aws-checksums
 [submodule "contrib/curl"]
@@ -108,7 +111,7 @@
 	url = https://github.com/ClickHouse/icudata
 [submodule "contrib/icu"]
 	path = contrib/icu
-	url = https://github.com/ClickHouse/icu
+	url = https://github.com/unicode-org/icu
 [submodule "contrib/flatbuffers"]
 	path = contrib/flatbuffers
 	url = https://github.com/ClickHouse/flatbuffers
@@ -163,13 +166,19 @@
 	url = https://github.com/xz-mirror/xz
 [submodule "contrib/abseil-cpp"]
 	path = contrib/abseil-cpp
-	url = https://github.com/ClickHouse/abseil-cpp.git
+	url = https://github.com/abseil/abseil-cpp
 [submodule "contrib/dragonbox"]
 	path = contrib/dragonbox
 	url = https://github.com/ClickHouse/dragonbox
 [submodule "contrib/fast_float"]
 	path = contrib/fast_float
 	url = https://github.com/fastfloat/fast_float
+[submodule "contrib/libpq"]
+	path = contrib/libpq
+	url = https://github.com/ClickHouse/libpq
+[submodule "contrib/boringssl"]
+	path = contrib/boringssl
+	url = https://github.com/ClickHouse/boringssl
 [submodule "contrib/NuRaft"]
 	path = contrib/NuRaft
 	url = https://github.com/ClickHouse/NuRaft
@@ -227,6 +236,15 @@
 [submodule "contrib/minizip-ng"]
 	path = contrib/minizip-ng
 	url = https://github.com/zlib-ng/minizip-ng
+[submodule "contrib/annoy"]
+	path = contrib/annoy
+	url = https://github.com/ClickHouse/annoy
+[submodule "contrib/qpl"]
+	path = contrib/qpl
+	url = https://github.com/intel/qpl
+[submodule "contrib/idxd-config"]
+	path = contrib/idxd-config
+	url = https://github.com/intel/idxd-config
 [submodule "contrib/QAT-ZSTD-Plugin"]
 	path = contrib/QAT-ZSTD-Plugin
 	url = https://github.com/intel/QAT-ZSTD-Plugin
@@ -260,6 +278,9 @@
 [submodule "contrib/crc32-s390x"]
 	path = contrib/crc32-s390x
 	url = https://github.com/linux-on-ibm-z/crc32-s390x
+[submodule "contrib/openssl"]
+	path = contrib/openssl
+	url = https://github.com/openssl/openssl
 [submodule "contrib/google-benchmark"]
 	path = contrib/google-benchmark
 	url = https://github.com/google/benchmark
@@ -305,9 +326,6 @@
 [submodule "contrib/crc32-vpmsum"]
 	path = contrib/crc32-vpmsum
 	url = https://github.com/antonblanchard/crc32-vpmsum.git
-[submodule "contrib/expected"]
-	path = contrib/expected
-	url = https://github.com/TartanLlama/expected
 [submodule "contrib/liburing"]
 	path = contrib/liburing
 	url = https://github.com/axboe/liburing
@@ -329,13 +347,16 @@
 	url = https://github.com/graphitemaster/incbin.git
 [submodule "contrib/usearch"]
 	path = contrib/usearch
-	url = https://github.com/ClickHouse/usearch.git
+	url = https://github.com/unum-cloud/usearch.git
 [submodule "contrib/SimSIMD"]
 	path = contrib/SimSIMD
-	url = https://github.com/ClickHouse/SimSIMD.git
+	url = https://github.com/ashvardanian/SimSIMD.git
 [submodule "contrib/FP16"]
 	path = contrib/FP16
 	url = https://github.com/Maratyszcza/FP16.git
+[submodule "contrib/robin-map"]
+	path = contrib/robin-map
+	url = https://github.com/Tessil/robin-map.git
 [submodule "contrib/aklomp-base64"]
 	path = contrib/aklomp-base64
 	url = https://github.com/aklomp/base64.git
@@ -351,21 +372,3 @@
 [submodule "contrib/rust_vendor"]
 	path = contrib/rust_vendor
 	url = https://github.com/ClickHouse/rust_vendor.git
-[submodule "contrib/openssl"]
-	path = contrib/openssl
-	url = https://github.com/ClickHouse/openssl.git
-[submodule "contrib/double-conversion"]
-	path = contrib/double-conversion
-	url = https://github.com/ClickHouse/double-conversion.git
-[submodule "contrib/mongo-cxx-driver"]
-	path = contrib/mongo-cxx-driver
-	url = https://github.com/ClickHouse/mongo-cxx-driver.git
-[submodule "contrib/mongo-c-driver"]
-	path = contrib/mongo-c-driver
-	url = https://github.com/ClickHouse/mongo-c-driver.git
-[submodule "contrib/numactl"]
-	path = contrib/numactl
-	url = https://github.com/ClickHouse/numactl.git
-[submodule "contrib/postgres"]
-	path = contrib/postgres
-	url = https://github.com/ClickHouse/postgres.git

.yamllint

@@ -5,12 +5,13 @@ rules:
     indentation:
         level: warning
         indent-sequences: consistent
+    line-length:
+        # there are:
+        # - bash -c "", so this is OK
+        # - yaml in tests
+        max: 1000
+        level: warning
     comments:
         min-spaces-from-content: 1
-    document-start: disable
-    colons: disable
-    indentation: disable
-    line-length: disable
-    trailing-spaces: disable
-    truthy: disable
-    new-line-at-end-of-file: disable
+    document-start:
+        present: false

CITATION.cff

@@ -1,31 +0,0 @@
-# This CITATION.cff file was generated with cffinit.
-
-cff-version: 1.2.0
-title: "ClickHouse"
-message: "If you use this software, please cite it as below."
-type: software
-authors:
-  - family-names: "Milovidov"
-    given-names: "Alexey"
-repository-code: 'https://github.com/ClickHouse/ClickHouse'
-url: 'https://clickhouse.com'
-license: Apache-2.0
-preferred-citation:
-  type: article
-  authors:
-  - family-names: "Schulze"
-    given-names: "Robert"
-  - family-names: "Schreiber"
-    given-names: "Tom"
-  - family-names: "Yatsishin"
-    given-names: "Ilya"
-  - family-names: "Dahimene"
-    given-names: "Ryadh"
-  - family-names: "Milovidov"
-    given-names: "Alexey"
-  journal: "Proceedings of the VLDB Endowment"
-  title: "ClickHouse - Lightning Fast Analytics for Everyone"
-  year: 2024
-  volume: 17
-  issue: 12
-  doi: 10.14778/3685800.3685802

CMakeLists.txt

@@ -61,16 +61,13 @@ if (ENABLE_CHECK_HEAVY_BUILDS)
     # set CPU time limit to 1000 seconds
     set (RLIMIT_CPU 1000)
 
-    # Sanitizers are too heavy. Some architectures too.
-    if (SANITIZE OR SANITIZE_COVERAGE OR WITH_COVERAGE OR ARCH_RISCV64 OR ARCH_LOONGARCH64)
-        # Twice as large
-        set (RLIMIT_DATA 10000000000)
-        set (RLIMIT_AS 20000000000)
+    # Sanitizers are too heavy
+    if (SANITIZE OR SANITIZE_COVERAGE OR WITH_COVERAGE)
+       set (RLIMIT_DATA 10000000000) # 10G
     endif()
 
-    # For some files currently building RISCV64/LOONGARCH64 might be too slow.
-    # TODO: Improve compilation times per file
-    if (ARCH_RISCV64 OR ARCH_LOONGARCH64)
+    # For some files currently building RISCV64 might be too slow. TODO: Improve compilation times per file
+    if (ARCH_RISCV64)
         set (RLIMIT_CPU 1800)
     endif()
 
@@ -88,7 +85,6 @@ string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
 list(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
 
 option (ENABLE_FUZZING "Fuzzy testing using libfuzzer" OFF)
-option (ENABLE_FUZZER_TEST "Build testing fuzzers in order to test libFuzzer functionality" OFF)
 
 if (ENABLE_FUZZING)
     # Also set WITH_COVERAGE=1 for better fuzzing process
@@ -123,8 +119,6 @@ add_library(global-libs INTERFACE)
 
 include (cmake/sanitize.cmake)
 
-include (cmake/xray_instrumentation.cmake)
-
 option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
 
 set (CMAKE_COLOR_MAKEFILE ${ENABLE_COLORED_BUILD}) # works only for the makefile generator
@@ -141,21 +135,23 @@ endif ()
 include (cmake/check_flags.cmake)
 include (cmake/add_warning.cmake)
 
-# generate ranges for fast "addr2line" search
-if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
-    # NOTE: that clang has a bug because of it does not emit .debug_aranges
-    # with ThinLTO, so custom ld.lld wrapper is shipped in docker images.
-    set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
+if (COMPILER_CLANG)
+    # generate ranges for fast "addr2line" search
+    if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
+        # NOTE: that clang has a bug because of it does not emit .debug_aranges
+        # with ThinLTO, so custom ld.lld wrapper is shipped in docker images.
+        set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
+    endif ()
+
+    # See https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
+    if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
+    endif()
+
+    no_warning(enum-constexpr-conversion) # breaks Protobuf in clang-16
 endif ()
 
-# See https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
-if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
-endif()
-
-no_warning(enum-constexpr-conversion) # breaks Protobuf in clang-16
-
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
 option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)
 option(ENABLE_BENCHMARKS "Build all benchmark programs in 'benchmarks' subdirectories" OFF)
@@ -188,6 +184,14 @@ else ()
     set(NO_WHOLE_ARCHIVE --no-whole-archive)
 endif ()
 
+if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
+    # Can be lld or ld-lld or lld-13 or /path/to/lld.
+    if (LINKER_NAME MATCHES "lld")
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
+        message (STATUS "Adding .gdb-index via --gdb-index linker option.")
+    endif ()
+endif()
+
 if (NOT (SANITIZE_COVERAGE OR WITH_COVERAGE)
     AND (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE"
         OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
@@ -203,6 +207,8 @@ option(OMIT_HEAVY_DEBUG_SYMBOLS
     "Do not generate debugger info for heavy modules (ClickHouse functions and dictionaries, some contrib)"
     ${OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT})
 
+option(USE_DEBUG_HELPERS "Enable debug helpers" ${USE_DEBUG_HELPERS})
+
 option(BUILD_STANDALONE_KEEPER "Build keeper as small standalone binary" OFF)
 if (NOT BUILD_STANDALONE_KEEPER)
     option(CREATE_KEEPER_SYMLINK "Create symlink for clickhouse-keeper to main server binary" ON)
@@ -278,12 +284,16 @@ endif ()
 
 option (ENABLE_BUILD_PROFILING "Enable profiling of build time" OFF)
 if (ENABLE_BUILD_PROFILING)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -ftime-trace")
+     if (COMPILER_CLANG)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -ftime-trace")
 
-    if (LINKER_NAME MATCHES "lld")
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--time-trace")
-        set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--time-trace")
-    endif ()
+        if (LINKER_NAME MATCHES "lld")
+            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--time-trace")
+            set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--time-trace")
+        endif ()
+     else ()
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Build profiling is only available with CLang")
+     endif ()
 endif ()
 
 set (CMAKE_CXX_STANDARD 23)
@@ -294,24 +304,27 @@ set (CMAKE_C_STANDARD 11)
 set (CMAKE_C_EXTENSIONS ON) # required by most contribs written in C
 set (CMAKE_C_STANDARD_REQUIRED ON)
 
-# Enable C++14 sized global deallocation functions. It should be enabled by setting -std=c++14 but I'm not sure.
-# See https://reviews.llvm.org/D112921
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
+if (COMPILER_CLANG)
+    # Enable C++14 sized global deallocation functions. It should be enabled by setting -std=c++14 but I'm not sure.
+    # See https://reviews.llvm.org/D112921
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
 
-# falign-functions=32 prevents from random performance regressions with the code change. Thus, providing more stable
-# benchmarks.
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
+    # falign-functions=32 prevents from random performance regressions with the code change. Thus, providing more stable
+    # benchmarks.
+    set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
 
-if (ARCH_AMD64)
-    # align branches within a 32-Byte boundary to avoid the potential performance loss when code layout change,
-    # which makes benchmark results more stable.
-    set(BRANCHES_WITHIN_32B_BOUNDARIES "-mbranches-within-32B-boundaries")
-    set(COMPILER_FLAGS "${COMPILER_FLAGS} ${BRANCHES_WITHIN_32B_BOUNDARIES}")
-endif()
+    if (ARCH_AMD64)
+        # align branches within a 32-Byte boundary to avoid the potential performance loss when code layout change,
+        # which makes benchmark results more stable.
+        set(BRANCHES_WITHIN_32B_BOUNDARIES "-mbranches-within-32B-boundaries")
+        set(COMPILER_FLAGS "${COMPILER_FLAGS} ${BRANCHES_WITHIN_32B_BOUNDARIES}")
+    endif()
+endif ()
 
 # Disable floating-point expression contraction in order to get consistent floating point calculation results across platforms
 set (COMPILER_FLAGS "${COMPILER_FLAGS} -ffp-contract=off")
 
+# Our built-in unwinder only supports DWARF version up to 4.
 set (DEBUG_INFO_FLAGS "-g")
 
 # Disable omit frame pointer compiler optimization using -fno-omit-frame-pointer
@@ -323,49 +336,51 @@ if (DISABLE_OMIT_FRAME_POINTER)
     set (CMAKE_ASM_FLAGS_ADD "${CMAKE_ASM_FLAGS_ADD} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer")
 endif()
 
-# Before you start hating your debugger because it refuses to show variables ('<optimized out>'), try building with -DDEBUG_O_LEVEL="0"
-# https://stackoverflow.com/questions/63386189/whats-the-difference-between-a-compilers-o0-option-and-og-option/63386263#63386263
-set(DEBUG_O_LEVEL "g" CACHE STRING "The -Ox level used for debug builds")
-
 set (CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
-set (CMAKE_CXX_FLAGS_DEBUG               "${CMAKE_CXX_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
+set (CMAKE_CXX_FLAGS_DEBUG               "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
 
 set (CMAKE_C_FLAGS                       "${CMAKE_C_FLAGS} ${COMPILER_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 set (CMAKE_C_FLAGS_RELWITHDEBINFO        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
-set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
+set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 
 set (CMAKE_ASM_FLAGS                     "${CMAKE_ASM_FLAGS} ${COMPILER_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
 set (CMAKE_ASM_FLAGS_RELWITHDEBINFO      "${CMAKE_ASM_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
-set (CMAKE_ASM_FLAGS_DEBUG               "${CMAKE_ASM_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
+set (CMAKE_ASM_FLAGS_DEBUG               "${CMAKE_ASM_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
 
-if (OS_DARWIN)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-U,_inside_main")
-endif()
+if (COMPILER_CLANG)
+    if (OS_DARWIN)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-U,_inside_main")
+    endif()
 
-# Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-absolute-paths")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-absolute-paths")
+    # Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-absolute-paths")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-absolute-paths")
 
-if (NOT ENABLE_TESTS AND NOT SANITIZE AND NOT SANITIZE_COVERAGE AND OS_LINUX)
-    # https://clang.llvm.org/docs/ThinLTO.html
-    # Applies to clang and linux only.
-    # Disabled when building with tests or sanitizers.
-    option(ENABLE_THINLTO "Clang-specific link time optimization" ON)
-endif()
+    if (NOT ENABLE_TESTS AND NOT SANITIZE AND NOT SANITIZE_COVERAGE AND OS_LINUX)
+        # https://clang.llvm.org/docs/ThinLTO.html
+        # Applies to clang and linux only.
+        # Disabled when building with tests or sanitizers.
+        option(ENABLE_THINLTO "Clang-specific link time optimization" ON)
+    endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-vtable-pointers")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-vtable-pointers")
+
+    # We cannot afford to use LTO when compiling unit tests, and it's not enough
+    # to only supply -fno-lto at the final linking stage. So we disable it
+    # completely.
+    if (ENABLE_THINLTO AND NOT ENABLE_TESTS AND NOT SANITIZE)
+        # Link time optimization
+        set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -flto=thin -fwhole-program-vtables")
+        set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -flto=thin -fwhole-program-vtables")
+        set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -flto=thin -fwhole-program-vtables")
+    elseif (ENABLE_THINLTO)
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable ThinLTO")
+    endif ()
 
-# We cannot afford to use LTO when compiling unit tests, and it's not enough
-# to only supply -fno-lto at the final linking stage. So we disable it
-# completely.
-if (ENABLE_THINLTO AND NOT ENABLE_TESTS AND NOT SANITIZE)
-    # Link time optimization
-    set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -flto=thin -fwhole-program-vtables")
-    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -flto=thin -fwhole-program-vtables")
-    set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -flto=thin -fwhole-program-vtables")
 elseif (ENABLE_THINLTO)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable ThinLTO")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "ThinLTO is only available with Clang")
 endif ()
 
 # Turns on all external libs like s3, kafka, ODBC, ...
@@ -394,11 +409,11 @@ option (ENABLE_GWP_ASAN "Enable Gwp-Asan" ON)
 # but GWP-ASan also wants to use mmap frequently,
 # and due to a large number of memory mappings,
 # it does not work together well.
-if ((NOT OS_LINUX AND NOT OS_ANDROID) OR (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG") OR SANITIZE)
+if ((NOT OS_LINUX AND NOT OS_ANDROID) OR (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG"))
     set(ENABLE_GWP_ASAN OFF)
 endif ()
 
-option (ENABLE_LIBFIU "Enable libfiu" ON)
+option (ENABLE_FIU "Enable Fiu" ON)
 
 option(WERROR "Enable -Werror compiler option" ON)
 
@@ -424,17 +439,12 @@ if (NOT SANITIZE)
     set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
 endif()
 
-if (NOT OS_ANDROID AND OS_LINUX AND NOT ARCH_S390X AND NOT SANITIZE)
-    # Using '-no-pie' builds executables with fixed addresses, resulting in slightly more efficient code
-    # and keeping binary addresses constant even with ASLR enabled.
-    # Disabled on Android as it requires PIE: https://source.android.com/docs/security/enhancements#android-5
-    # Disabled on IBM S390X due to build issues with 'no-pie'
-    # Disabled with sanitizers to avoid issues with maximum relocation size: https://github.com/ClickHouse/ClickHouse/pull/49145
+if (OS_LINUX AND NOT (ARCH_AARCH64 OR ARCH_S390X) AND NOT SANITIZE)
+    # Slightly more efficient code can be generated
+    # It's disabled for ARM because otherwise ClickHouse cannot run on Android.
     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-pie")
     set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-pie")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie -Wl,-no-pie")
-else ()
-    message (WARNING "ClickHouse is built as PIE, system.trace_log will contain invalid addresses after server restart.")
 endif ()
 
 if (ENABLE_TESTS)
@@ -445,6 +455,8 @@ endif ()
 
 enable_testing() # Enable for tests without binary
 
+option(ENABLE_OPENSSL "This option performs a build with OpenSSL. NOTE! This option is insecure and should never be used. By default, ClickHouse uses and only supports BoringSSL" OFF)
+
 if (ARCH_S390X)
     set(ENABLE_OPENSSL_DYNAMIC_DEFAULT ON)
 else ()
@@ -546,7 +558,7 @@ endif()
 
 if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
     AND NOT SANITIZE AND NOT SANITIZE_COVERAGE AND NOT ENABLE_FUZZING
-    AND OMIT_HEAVY_DEBUG_SYMBOLS AND OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64))
+    AND OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64))
     set(CHECK_LARGE_OBJECT_SIZES_DEFAULT ON)
 else ()
     set(CHECK_LARGE_OBJECT_SIZES_DEFAULT OFF)
@@ -605,9 +617,7 @@ if (NATIVE_BUILD_TARGETS
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} -E make_directory "${NATIVE_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND}
@@ -619,13 +629,9 @@ if (NATIVE_BUILD_TARGETS
             "-DENABLE_CLICKHOUSE_SELF_EXTRACTING=${ENABLE_CLICKHOUSE_SELF_EXTRACTING}"
         ${PROJECT_SOURCE_DIR}
         WORKING_DIRECTORY "${NATIVE_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} --build "${NATIVE_BUILD_DIR}" --target ${NATIVE_BUILD_TARGETS}
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 endif ()

PreLoad.cmake

@@ -51,14 +51,8 @@ if (NOT "$ENV{CFLAGS}" STREQUAL ""
 endif()
 
 # Default toolchain - this is needed to avoid dependency on OS files.
-execute_process(COMMAND uname -s
-    OUTPUT_VARIABLE OS
-    COMMAND_ERROR_IS_FATAL ANY
-)
-execute_process(COMMAND uname -m
-    OUTPUT_VARIABLE ARCH
-    COMMAND_ERROR_IS_FATAL ANY
-)
+execute_process(COMMAND uname -s OUTPUT_VARIABLE OS)
+execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH)
 
 # By default, prefer clang on Linux
 # But note, that you still may change the compiler with -DCMAKE_C_COMPILER/-DCMAKE_CXX_COMPILER.
@@ -99,8 +93,6 @@ if (OS MATCHES "Linux"
         set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-ppc64le.cmake" CACHE INTERNAL "")
     elseif (ARCH MATCHES "^(s390x.*|S390X.*)")
         set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-s390x.cmake" CACHE INTERNAL "")
-    elseif (ARCH MATCHES "^(loongarch64.*|LOONGARCH64.*)")
-        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-loongarch64.cmake" CACHE INTERNAL "")
     else ()
         message (FATAL_ERROR "Unsupported architecture: ${ARCH}")
     endif ()

README.md

@@ -34,31 +34,26 @@ curl https://clickhouse.com/ | sh
 
 Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release. If you are interested in sharing what you've built on ClickHouse, let us know.
 
-* [v24.10 Community Call](https://clickhouse.com/company/events/v24-10-community-release-call) - October 31
+* [v24.3 Community Call](https://clickhouse.com/company/events/v24-3-community-release-call) - Mar 26
+* [v24.4 Community Call](https://clickhouse.com/company/events/v24-4-community-release-call) - Apr 30
 
 ## Upcoming Events
 
-Keep an eye out for upcoming meetups and events around the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com. You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
+Keep an eye out for upcoming meetups and eventsaround the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com. You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
 
-Upcoming meetups
+* [ClickHouse Meetup in Bellevue](https://www.meetup.com/clickhouse-seattle-user-group/events/298650371/) - Mar 11
+* [ClickHouse Meetup at Ramp's Offices in NYC](https://www.meetup.com/clickhouse-new-york-user-group/events/298640542/) - Mar 19
+* [ClickHouse Melbourne Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/299479750/) - Mar 20
+* [ClickHouse Meetup in Paris](https://www.meetup.com/clickhouse-france-user-group/events/298997115/) - Mar 21
+* [ClickHouse Meetup in Bengaluru](https://www.meetup.com/clickhouse-bangalore-user-group/events/299479850/) - Mar 23
+* [ClickHouse Meetup in Zurich](https://www.meetup.com/clickhouse-switzerland-meetup-group/events/299628922/) - Apr 16
+* [ClickHouse Meetup in Copenhagen](https://www.meetup.com/clickhouse-denmark-meetup-group/events/299629133/) - Apr 23
+* [ClickHouse Meetup in Dubai](https://www.meetup.com/clickhouse-dubai-meetup-group/events/299629189/) - May 28
 
-* [Barcelona Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/303096876/) - November 12
-* [Ghent Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/303049405/) - November 19
-* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - November 21
-* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/303096434) - November 26
-* [Amsterdam Meetup](https://www.meetup.com/clickhouse-netherlands-user-group/events/303638814) - December 3
-* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/304268174) - December 9
-* [San Francisco Meetup](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/304286951/) - December 12
-
-Recently completed meetups
-
-* [Madrid Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/303096564/) - October 22
-* [Singapore Meetup](https://www.meetup.com/clickhouse-singapore-meetup-group/events/303212064/) - October 3
-* [Jakarta Meetup](https://www.meetup.com/clickhouse-indonesia-user-group/events/303191359/) - October 1
 
 ## Recent Recordings
 * **Recent Meetup Videos**: [Meetup Playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3iNDUzpY1S3L_iV4nARda_U) Whenever possible recordings of the ClickHouse Community Meetups are edited and presented as individual talks. Current featuring "Modern SQL in 2023", "Fast, Concurrent, and Consistent Asynchronous INSERTS in ClickHouse", and "Full-Text Indices: Design and Experiments"
-* **Recording available**: [**v24.8 LTS Release Call**](https://www.youtube.com/watch?v=AeLmp2jc51k) All the features of 24.8 LTS, one convenient video! Watch it now!
+* **Recording available**: [**v24.2 Release Call**](https://www.youtube.com/watch?v=iN2y-TK8f3A) All the features of 24.2, one convenient video! Watch it now!
   
  ## Interested in joining ClickHouse and making it your full-time job? 
   

SECURITY.md

@@ -2,29 +2,31 @@
 the file is autogenerated by utils/security-generator/generate_security.py
 -->
 
-# ClickHouse Security Vulnerability Response Policy
+# Security Policy
 
-## Security Change Log and Support
+## Security Announcements
+Security fixes will be announced by posting them in the [security changelog](https://clickhouse.com/docs/en/whats-new/security-changelog/).
 
-Details regarding security fixes are publicly reported in our [security changelog](https://clickhouse.com/docs/en/whats-new/security-changelog/). A summary of known security vulnerabilities is shown at the bottom of this page.
+## Scope and Supported Versions
 
-Vulnerability notifications pre-release or during embargo periods are available to open source users and support customers registered for vulnerability alerts. Refer to our [Embargo Policy](#embargo-policy) below.
-
-The following versions of ClickHouse server are currently supported with security updates:
+The following versions of ClickHouse server are currently being supported with security updates:
 
 | Version | Supported |
 |:-|:-|
-| 24.10 | ✔️ |
-| 24.9 | ✔️ |
-| 24.8 | ✔️ |
-| 24.7 | ❌ |
-| 24.6 | ❌ |
-| 24.5 | ❌ |
-| 24.4 | ❌ |
-| 24.3 | ✔️ |
-| 24.2 | ❌ |
-| 24.1 | ❌ |
-| 23.* | ❌ |
+| 24.2 | ✔️ |
+| 24.1 | ✔️ |
+| 23.12 | ✔️ |
+| 23.11 | ❌ |
+| 23.10 | ❌ |
+| 23.9 | ❌ |
+| 23.8 | ✔️ |
+| 23.7 | ❌ |
+| 23.6 | ❌ |
+| 23.5 | ❌ |
+| 23.4 | ❌ |
+| 23.3 | ✔️ |
+| 23.2 | ❌ |
+| 23.1 | ❌ |
 | 22.* | ❌ |
 | 21.* | ❌ |
 | 20.* | ❌ |
@@ -36,7 +38,7 @@ The following versions of ClickHouse server are currently supported with securit
 
 We're extremely grateful for security researchers and users that report vulnerabilities to the ClickHouse Open Source Community. All reports are thoroughly investigated by developers.
 
-To report a potential vulnerability in ClickHouse please send the details about it through our public bug bounty program hosted by [Bugcrowd](https://bugcrowd.com/clickhouse) and be rewarded for it as per the program scope and rules of engagement.
+To report a potential vulnerability in ClickHouse please send the details about it to [security@clickhouse.com](mailto:security@clickhouse.com). We do not offer any financial rewards for reporting issues to us using this method. Alternatively, you can also submit your findings through our public bug bounty program hosted by [Bugcrowd](https://bugcrowd.com/clickhouse) and be rewarded for it as per the program scope and rules of engagement.
 
 ### When Should I Report a Vulnerability?
 
@@ -58,21 +60,3 @@ As the security issue moves from triage, to identified fix, to release planning
 
 A public disclosure date is negotiated by the ClickHouse maintainers and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to 90 days. For a vulnerability with a straightforward mitigation, we expect the report date to disclosure date to be on the order of 7 days.
 
-## Embargo Policy
-
-Open source users and support customers may subscribe to receive alerts during the embargo period by visiting [https://trust.clickhouse.com/?product=clickhouseoss](https://trust.clickhouse.com/?product=clickhouseoss), requesting access and subscribing for alerts. Subscribers agree not to make these notifications public, issue communications, share this information with others, or issue public patches before the disclosure date. Accidental disclosures must be reported immediately to trust@clickhouse.com. Failure to follow this policy or repeated leaks may result in removal from the subscriber list.
-
-Participation criteria:
-1. Be a current open source user or support customer with a valid corporate email domain (no @gmail.com, @azure.com, etc.).
-1. Sign up to the ClickHouse OSS Trust Center at [https://trust.clickhouse.com](https://trust.clickhouse.com).
-1. Accept the ClickHouse Security Vulnerability Response Policy as outlined above.
-1. Subscribe to ClickHouse OSS Trust Center alerts.
-
-Removal criteria:
-1. Members may be removed for failure to follow this policy or repeated leaks.
-1. Members may be removed for bounced messages (mail delivery failure).
-1. Members may unsubscribe at any time.
-
-Notification process:
-ClickHouse will post notifications within our OSS Trust Center and notify subscribers. Subscribers must log in to the Trust Center to download the notification. The notification will include the timeframe for public disclosure.
-

base/base/BorrowedObjectPool.h

@@ -86,7 +86,7 @@ public:
     }
 
     /// Return object into pool. Client must return same object that was borrowed.
-    void returnObject(T && object_to_return)
+    inline void returnObject(T && object_to_return)
     {
         {
             std::lock_guard lock(objects_mutex);
@@ -99,20 +99,20 @@ public:
     }
 
     /// Max pool size
-    size_t maxSize() const
+    inline size_t maxSize() const
     {
         return max_size;
     }
 
     /// Allocated objects size by the pool. If allocatedObjectsSize == maxSize then pool is full.
-    size_t allocatedObjectsSize() const
+    inline size_t allocatedObjectsSize() const
     {
         std::lock_guard lock(objects_mutex);
         return allocated_objects_size;
     }
 
     /// Returns allocatedObjectsSize == maxSize
-    bool isFull() const
+    inline bool isFull() const
     {
         std::lock_guard lock(objects_mutex);
         return allocated_objects_size == max_size;
@@ -120,7 +120,7 @@ public:
 
     /// Borrowed objects size. If borrowedObjectsSize == allocatedObjectsSize and pool is full.
     /// Then client will wait during borrowObject function call.
-    size_t borrowedObjectsSize() const
+    inline size_t borrowedObjectsSize() const
     {
         std::lock_guard lock(objects_mutex);
         return borrowed_objects_size;
@@ -129,7 +129,7 @@ public:
 private:
 
     template <typename FactoryFunc>
-    T allocateObjectForBorrowing(const std::unique_lock<std::mutex> &, FactoryFunc && func)
+    inline T allocateObjectForBorrowing(const std::unique_lock<std::mutex> &, FactoryFunc && func)
     {
         ++allocated_objects_size;
         ++borrowed_objects_size;
@@ -137,7 +137,7 @@ private:
         return std::forward<FactoryFunc>(func)();
     }
 
-    T borrowFromObjects(const std::unique_lock<std::mutex> &)
+    inline T borrowFromObjects(const std::unique_lock<std::mutex> &)
     {
         T dst;
         detail::moveOrCopyIfThrow(std::move(objects.back()), dst);

base/base/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_compile_options("$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>")
+add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>)
 
 if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
@@ -8,8 +8,6 @@ endif ()
 # when instantiated from JSON.cpp. Try again when libcxx(abi) and Clang are upgraded to 16.
 set (CMAKE_CXX_STANDARD 20)
 
-configure_file(GitHash.cpp.in GitHash.generated.cpp)
-
 set (SRCS
     argsToConfig.cpp
     cgroupsv2.cpp
@@ -34,10 +32,17 @@ set (SRCS
     StringRef.cpp
     safeExit.cpp
     throwError.cpp
-    Numa.cpp
-    GitHash.generated.cpp
 )
 
+if (USE_DEBUG_HELPERS)
+    get_target_property(MAGIC_ENUM_INCLUDE_DIR ch_contrib::magic_enum INTERFACE_INCLUDE_DIRECTORIES)
+    # CMake generator expression will do insane quoting when it encounters special character like quotes, spaces, etc.
+    # Prefixing "SHELL:" will force it to use the original text.
+    set (INCLUDE_DEBUG_HELPERS "SHELL:-I\"${MAGIC_ENUM_INCLUDE_DIR}\" -include \"${ClickHouse_SOURCE_DIR}/base/base/iostream_debug_helpers.h\"")
+    # Use generator expression as we don't want to pollute CMAKE_CXX_FLAGS, which will interfere with CMake check system.
+    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:${INCLUDE_DEBUG_HELPERS}>)
+endif ()
+
 add_library (common ${SRCS})
 
 if (WITH_COVERAGE)
@@ -50,10 +55,6 @@ if (TARGET ch_contrib::crc32_s390x)
     target_link_libraries(common PUBLIC ch_contrib::crc32_s390x)
 endif()
 
-if (TARGET ch_contrib::numactl)
-    target_link_libraries(common PUBLIC ch_contrib::numactl)
-endif()
-
 target_include_directories(common PUBLIC .. "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 target_link_libraries (common

base/base/Decimal_fwd.h

@@ -44,10 +44,6 @@ concept is_over_big_int =
     || std::is_same_v<T, UInt256>
     || std::is_same_v<T, Decimal128>
     || std::is_same_v<T, Decimal256>;
-
-template <class T>
-concept is_over_big_decimal = is_decimal<T> && is_over_big_int<typename T::NativeType>;
-
 }
 
 template <> struct is_signed<DB::Decimal32> { static constexpr bool value = true; };

base/base/DecomposedFloat.h

@@ -51,9 +51,11 @@ struct DecomposedFloat
     /// Returns 0 for both +0. and -0.
     int sign() const
     {
-        if (exponent() == 0 && mantissa() == 0)
-            return 0;
-        return isNegative() ? -1 : 1;
+        return (exponent() == 0 && mantissa() == 0)
+            ? 0
+            : (isNegative()
+                ? -1
+                : 1);
     }
 
     uint16_t exponent() const
@@ -110,7 +112,8 @@ struct DecomposedFloat
         {
             if (!isNegative())
                 return rhs > 0 ? -1 : 1;
-            return rhs >= 0 ? -1 : 1;
+            else
+                return rhs >= 0 ? -1 : 1;
         }
 
         /// The case of the most negative integer
@@ -127,7 +130,8 @@ struct DecomposedFloat
 
                 if (mantissa() == 0)
                     return 0;
-                return -1;
+                else
+                    return -1;
             }
         }
 
@@ -167,8 +171,9 @@ struct DecomposedFloat
         /// Float has no fractional part means that the numbers are equal.
         if (large_and_always_integer || (mantissa() & ((1ULL << (Traits::mantissa_bits - normalizedExponent())) - 1)) == 0)
             return 0;
-        /// Float has fractional part means its abs value is larger.
-        return isNegative() ? -1 : 1;
+        else
+            /// Float has fractional part means its abs value is larger.
+            return isNegative() ? -1 : 1;
     }
 
 

base/base/EnumReflection.h

@@ -11,7 +11,7 @@ namespace detail
 template <is_enum E, class F, size_t ...I>
 constexpr void static_for(F && f, std::index_sequence<I...>)
 {
-    (f(std::integral_constant<E, magic_enum::enum_value<E>(I)>()) , ...);
+    (std::forward<F>(f)(std::integral_constant<E, magic_enum::enum_value<E>(I)>()) , ...);
 }
 }
 
@@ -32,7 +32,7 @@ constexpr void static_for(F && f)
 template <is_enum T>
 struct fmt::formatter<T> : fmt::formatter<std::string_view>
 {
-    constexpr auto format(T value, auto& format_context) const
+    constexpr auto format(T value, auto& format_context)
     {
         return formatter<string_view>::format(magic_enum::enum_name(value), format_context);
     }

base/base/JSON.cpp

@@ -205,7 +205,8 @@ JSON::ElementType JSON::getType() const
             Pos after_string = skipString();
             if (after_string < ptr_end && *after_string == ':')
                 return TYPE_NAME_VALUE_PAIR;
-            return TYPE_STRING;
+            else
+                return TYPE_STRING;
         }
         default:
             throw JSONException(std::string("JSON: unexpected char ") + *ptr_begin + ", expected one of '{[tfn-0123456789\"'");
@@ -473,7 +474,8 @@ JSON::Pos JSON::searchField(const char * data, size_t size) const
 
     if (it == end())
         return nullptr;
-    return it->data();
+    else
+        return it->data();
 }
 
 
@@ -485,7 +487,7 @@ bool JSON::hasEscapes() const
 
     if (*pos == '"')
         return false;
-    if (*pos == '\\')
+    else if (*pos == '\\')
         return true;
     throw JSONException("JSON: unexpected end of data.");
 }
@@ -501,7 +503,7 @@ bool JSON::hasSpecialChars() const
 
     if (*pos == '"')
         return false;
-    if (pos < ptr_end)
+    else if (pos < ptr_end)
         return true;
     throw JSONException("JSON: unexpected end of data.");
 }
@@ -649,9 +651,7 @@ std::string_view JSON::getRawString() const
     Pos s = ptr_begin;
     if (*s != '"')
         throw JSONException(std::string("JSON: expected \", got ") + *s);
-    ++s;
-    while (s != ptr_end && *s != '"')
-        ++s;
+    while (++s != ptr_end && *s != '"');
     if (s != ptr_end)
         return std::string_view(ptr_begin + 1, s - ptr_begin - 1);
     throw JSONException("JSON: incorrect syntax (expected end of string, found end of JSON).");
@@ -680,9 +680,10 @@ double JSON::toDouble() const
 
     if (type == TYPE_NUMBER)
         return getDouble();
-    if (type == TYPE_STRING)
+    else if (type == TYPE_STRING)
         return JSON(ptr_begin + 1, ptr_end, level + 1).getDouble();
-    throw JSONException("JSON: cannot convert value to double.");
+    else
+        throw JSONException("JSON: cannot convert value to double.");
 }
 
 Int64 JSON::toInt() const
@@ -691,9 +692,10 @@ Int64 JSON::toInt() const
 
     if (type == TYPE_NUMBER)
         return getInt();
-    if (type == TYPE_STRING)
+    else if (type == TYPE_STRING)
         return JSON(ptr_begin + 1, ptr_end, level + 1).getInt();
-    throw JSONException("JSON: cannot convert value to signed integer.");
+    else
+        throw JSONException("JSON: cannot convert value to signed integer.");
 }
 
 UInt64 JSON::toUInt() const
@@ -702,9 +704,10 @@ UInt64 JSON::toUInt() const
 
     if (type == TYPE_NUMBER)
         return getUInt();
-    if (type == TYPE_STRING)
+    else if (type == TYPE_STRING)
         return JSON(ptr_begin + 1, ptr_end, level + 1).getUInt();
-    throw JSONException("JSON: cannot convert value to unsigned integer.");
+    else
+        throw JSONException("JSON: cannot convert value to unsigned integer.");
 }
 
 std::string JSON::toString() const
@@ -713,9 +716,11 @@ std::string JSON::toString() const
 
     if (type == TYPE_STRING)
         return getString();
-
-    Pos pos = skipElement();
-    return std::string(ptr_begin, pos - ptr_begin);
+    else
+    {
+        Pos pos = skipElement();
+        return std::string(ptr_begin, pos - ptr_begin);
+    }
 }
 
 

base/base/JSON.h

@@ -74,7 +74,7 @@ public:
     const char * data() const { return ptr_begin; }
     const char * dataEnd() const { return ptr_end; }
 
-    enum ElementType : uint8_t
+    enum ElementType
     {
         TYPE_OBJECT,
         TYPE_ARRAY,
@@ -203,7 +203,9 @@ T JSON::getWithDefault(const std::string & key, const T & default_) const
 
         if (key_json.isType<T>())
             return key_json.get<T>();
-        return default_;
+        else
+            return default_;
     }
-    return default_;
+    else
+        return default_;
 }

base/base/Numa.cpp

@@ -1,37 +0,0 @@
-#include <base/Numa.h>
-
-#include "config.h"
-
-#if USE_NUMACTL
-#    include <numa.h>
-#endif
-
-namespace DB
-{
-
-std::optional<size_t> getNumaNodesTotalMemory()
-{
-    std::optional<size_t> total_memory;
-#if USE_NUMACTL
-    if (numa_available() != -1)
-    {
-        auto * membind = numa_get_membind();
-        if (!numa_bitmask_equal(membind, numa_all_nodes_ptr))
-        {
-            total_memory.emplace(0);
-            auto max_node = numa_max_node();
-            for (int i = 0; i <= max_node; ++i)
-            {
-                if (numa_bitmask_isbitset(membind, i))
-                    *total_memory += numa_node_size(i, nullptr);
-            }
-        }
-
-        numa_bitmask_free(membind);
-    }
-
-#endif
-    return total_memory;
-}
-
-}

base/base/Numa.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <optional>
-
-namespace DB
-{
-
-/// return total memory of NUMA nodes the process is bound to
-/// if NUMA is not supported or process can use all nodes, std::nullopt is returned
-std::optional<size_t> getNumaNodesTotalMemory();
-
-}

base/base/StringRef.h

@@ -12,8 +12,6 @@
 #include <base/types.h>
 #include <base/unaligned.h>
 #include <base/simd.h>
-#include <fmt/core.h>
-#include <fmt/ostream.h>
 
 #include <city.h>
 
@@ -86,7 +84,7 @@ using StringRefs = std::vector<StringRef>;
   * For more information, see hash_map_string_2.cpp
   */
 
-inline bool compare16(const char * p1, const char * p2)
+inline bool compare8(const char * p1, const char * p2)
 {
     return 0xFFFF == _mm_movemask_epi8(_mm_cmpeq_epi8(
         _mm_loadu_si128(reinterpret_cast<const __m128i *>(p1)),
@@ -115,7 +113,7 @@ inline bool compare64(const char * p1, const char * p2)
 
 #elif defined(__aarch64__) && defined(__ARM_NEON)
 
-inline bool compare16(const char * p1, const char * p2)
+inline bool compare8(const char * p1, const char * p2)
 {
     uint64_t mask = getNibbleMask(vceqq_u8(
             vld1q_u8(reinterpret_cast<const unsigned char *>(p1)), vld1q_u8(reinterpret_cast<const unsigned char *>(p2))));
@@ -151,19 +149,19 @@ inline bool memequalWide(const char * p1, const char * p2, size_t size)
             return unalignedLoad<uint64_t>(p1) == unalignedLoad<uint64_t>(p2)
                 && unalignedLoad<uint64_t>(p1 + size - 8) == unalignedLoad<uint64_t>(p2 + size - 8);
         }
-        if (size >= 4)
+        else if (size >= 4)
         {
             /// Chunks of 4..7 bytes.
             return unalignedLoad<uint32_t>(p1) == unalignedLoad<uint32_t>(p2)
                 && unalignedLoad<uint32_t>(p1 + size - 4) == unalignedLoad<uint32_t>(p2 + size - 4);
         }
-        if (size >= 2)
+        else if (size >= 2)
         {
             /// Chunks of 2..3 bytes.
             return unalignedLoad<uint16_t>(p1) == unalignedLoad<uint16_t>(p2)
                 && unalignedLoad<uint16_t>(p1 + size - 2) == unalignedLoad<uint16_t>(p2 + size - 2);
         }
-        if (size >= 1)
+        else if (size >= 1)
         {
             /// A single byte.
             return *p1 == *p2;
@@ -185,22 +183,13 @@ inline bool memequalWide(const char * p1, const char * p2, size_t size)
 
     switch (size / 16) // NOLINT(bugprone-switch-missing-default-case)
     {
-        case 3:
-            if (!compare16(p1 + 32, p2 + 32))
-                return false;
-            [[fallthrough]];
-        case 2:
-            if (!compare16(p1 + 16, p2 + 16))
-                return false;
-            [[fallthrough]];
-        case 1:
-            if (!compare16(p1, p2))
-                return false;
-            [[fallthrough]];
+        case 3: if (!compare8(p1 + 32, p2 + 32)) return false; [[fallthrough]];
+        case 2: if (!compare8(p1 + 16, p2 + 16)) return false; [[fallthrough]];
+        case 1: if (!compare8(p1, p2)) return false; [[fallthrough]];
         default: ;
     }
 
-    return compare16(p1 + size - 16, p2 + size - 16);
+    return compare8(p1 + size - 16, p2 + size - 16);
 }
 
 #endif
@@ -391,5 +380,3 @@ namespace PackedZeroTraits
 
 
 std::ostream & operator<<(std::ostream & os, const StringRef & str);
-
-template<> struct fmt::formatter<StringRef> : fmt::ostream_formatter {};

base/base/TypeList.h

@@ -27,7 +27,7 @@ namespace TypeListUtils /// In some contexts it's more handy to use functions in
     constexpr Root<Args...> changeRoot(TypeList<Args...>) { return {}; }
 
     template <typename F, typename ...Args>
-    constexpr void forEach(TypeList<Args...>, F && f) { (f(TypeList<Args>{}), ...); }
+    constexpr void forEach(TypeList<Args...>, F && f) { (std::forward<F>(f)(TypeList<Args>{}), ...); }
 }
 
 template <typename TypeListLeft, typename TypeListRight>

base/base/argsToConfig.cpp

@@ -53,9 +53,10 @@ void argsToConfig(const Poco::Util::Application::ArgVec & argv,
                 key = arg.substr(key_start);
             continue;
         }
-
-        key = "";
-
+        else
+        {
+            key = "";
+        }
 
         if (key_start == std::string::npos)
             continue;

base/base/cgroupsv2.cpp

@@ -5,29 +5,42 @@
 #include <fstream>
 #include <string>
 
-namespace fs = std::filesystem;
 
 bool cgroupsV2Enabled()
 {
 #if defined(OS_LINUX)
-    try
-    {
-        /// This file exists iff the host has cgroups v2 enabled.
-        auto controllers_file = default_cgroups_mount / "cgroup.controllers";
-        if (!fs::exists(controllers_file))
-            return false;
-        return true;
-    }
-    catch (const fs::filesystem_error &) /// all "underlying OS API errors", typically: permission denied
-    {
-        return false; /// not logging the exception as most callers fall back to cgroups v1
-    }
+    /// This file exists iff the host has cgroups v2 enabled.
+    auto controllers_file = default_cgroups_mount / "cgroup.controllers";
+    if (!std::filesystem::exists(controllers_file))
+        return false;
+    return true;
 #else
     return false;
 #endif
 }
 
-fs::path cgroupV2PathOfProcess()
+bool cgroupsV2MemoryControllerEnabled()
+{
+#if defined(OS_LINUX)
+    chassert(cgroupsV2Enabled());
+    /// According to https://docs.kernel.org/admin-guide/cgroup-v2.html:
+    /// - file 'cgroup.controllers' defines which controllers *can* be enabled
+    /// - file 'cgroup.subtree_control' defines which controllers *are* enabled
+    /// Caveat: nested groups may disable controllers. For simplicity, check only the top-level group.
+    std::ifstream subtree_control_file(default_cgroups_mount / "cgroup.subtree_control");
+    if (!subtree_control_file.is_open())
+        return false;
+    std::string controllers;
+    std::getline(subtree_control_file, controllers);
+    if (controllers.find("memory") == std::string::npos)
+        return false;
+    return true;
+#else
+    return false;
+#endif
+}
+
+std::filesystem::path cgroupV2PathOfProcess()
 {
 #if defined(OS_LINUX)
     chassert(cgroupsV2Enabled());
@@ -50,28 +63,3 @@ fs::path cgroupV2PathOfProcess()
     return {};
 #endif
 }
-
-std::optional<std::string> getCgroupsV2PathContainingFile([[maybe_unused]] std::string_view file_name)
-{
-#if defined(OS_LINUX)
-    if (!cgroupsV2Enabled())
-        return {};
-
-    fs::path current_cgroup = cgroupV2PathOfProcess();
-    if (current_cgroup.empty())
-        return {};
-
-    /// Return the bottom-most nested file. If there is no such file at the current
-    /// level, try again at the parent level as settings are inherited.
-    while (current_cgroup != default_cgroups_mount.parent_path())
-    {
-        const auto path = current_cgroup / file_name;
-        if (fs::exists(path))
-            return {current_cgroup};
-        current_cgroup = current_cgroup.parent_path();
-    }
-    return {};
-#else
-    return {};
-#endif
-}

base/base/cgroupsv2.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <filesystem>
-#include <string_view>
 
 #if defined(OS_LINUX)
 /// I think it is possible to mount the cgroups hierarchy somewhere else (e.g. when in containers).
@@ -12,11 +11,11 @@ static inline const std::filesystem::path default_cgroups_mount = "/sys/fs/cgrou
 /// Is cgroups v2 enabled on the system?
 bool cgroupsV2Enabled();
 
+/// Is the memory controller of cgroups v2 enabled on the system?
+/// Assumes that cgroupsV2Enabled() is enabled.
+bool cgroupsV2MemoryControllerEnabled();
+
 /// Detects which cgroup v2 the process belongs to and returns the filesystem path to the cgroup.
 /// Returns an empty path the cgroup cannot be determined.
 /// Assumes that cgroupsV2Enabled() is enabled.
 std::filesystem::path cgroupV2PathOfProcess();
-
-/// Returns the most nested cgroup dir containing the specified file.
-/// If cgroups v2 is not enabled - returns an empty optional.
-std::optional<std::string> getCgroupsV2PathContainingFile([[maybe_unused]] std::string_view file_name);

base/base/chrono_io.h

@@ -4,7 +4,6 @@
 #include <string>
 #include <sstream>
 #include <cctz/time_zone.h>
-#include <fmt/core.h>
 
 
 inline std::string to_string(const std::time_t & time)
@@ -12,6 +11,18 @@ inline std::string to_string(const std::time_t & time)
     return cctz::format("%Y-%m-%d %H:%M:%S", std::chrono::system_clock::from_time_t(time), cctz::local_time_zone());
 }
 
+template <typename Clock, typename Duration = typename Clock::duration>
+std::string to_string(const std::chrono::time_point<Clock, Duration> & tp)
+{
+    // Don't use DateLUT because it shows weird characters for
+    // TimePoint::max(). I wish we could use C++20 format, but it's not
+    // there yet.
+    // return DateLUT::instance().timeToString(std::chrono::system_clock::to_time_t(tp));
+
+    auto in_time_t = std::chrono::system_clock::to_time_t(tp);
+    return to_string(in_time_t);
+}
+
 template <typename Rep, typename Period = std::ratio<1>>
 std::string to_string(const std::chrono::duration<Rep, Period> & duration)
 {
@@ -22,20 +33,6 @@ std::string to_string(const std::chrono::duration<Rep, Period> & duration)
     return std::to_string(seconds_as_double.count()) + "s";
 }
 
-template <typename Clock, typename Duration = typename Clock::duration>
-std::string to_string(const std::chrono::time_point<Clock, Duration> & tp)
-{
-    // Don't use DateLUT because it shows weird characters for
-    // TimePoint::max(). I wish we could use C++20 format, but it's not
-    // there yet.
-    // return DateLUT::instance().timeToString(std::chrono::system_clock::to_time_t(tp));
-
-    if constexpr (std::is_same_v<Clock, std::chrono::system_clock>)
-        return to_string(std::chrono::system_clock::to_time_t(tp));
-    else
-        return to_string(tp.time_since_epoch());
-}
-
 template <typename Clock, typename Duration = typename Clock::duration>
 std::ostream & operator<<(std::ostream & o, const std::chrono::time_point<Clock, Duration> & tp)
 {
@@ -47,23 +44,3 @@ std::ostream & operator<<(std::ostream & o, const std::chrono::duration<Rep, Per
 {
     return o << to_string(duration);
 }
-
-template <typename Clock, typename Duration>
-struct fmt::formatter<std::chrono::time_point<Clock, Duration>> : fmt::formatter<std::string>
-{
-    template <typename FormatCtx>
-    auto format(const std::chrono::time_point<Clock, Duration> & tp, FormatCtx & ctx) const
-    {
-        return fmt::formatter<std::string>::format(::to_string(tp), ctx);
-    }
-};
-
-template <typename Rep, typename Period>
-struct fmt::formatter<std::chrono::duration<Rep, Period>> : fmt::formatter<std::string>
-{
-    template <typename FormatCtx>
-    auto format(const std::chrono::duration<Rep, Period> & duration, FormatCtx & ctx) const
-    {
-        return fmt::formatter<std::string>::format(::to_string(duration), ctx);
-    }
-};

base/base/constexpr_helpers.h

@@ -21,7 +21,7 @@ bool func_wrapper(Func && func, Arg && arg)
 template <typename T, T Begin, typename Func, T... Is>
 constexpr bool static_for_impl(Func && f, std::integer_sequence<T, Is...>)
 {
-    return (func_wrapper(f, std::integral_constant<T, Begin + Is>{}) || ...);
+    return (func_wrapper(std::forward<Func>(f), std::integral_constant<T, Begin + Is>{}) || ...);
 }
 
 template <auto Begin, decltype(Begin) End, typename Func>

base/base/defines.h

@@ -28,8 +28,8 @@
 #define NO_INLINE __attribute__((__noinline__))
 #define MAY_ALIAS __attribute__((__may_alias__))
 
-#if !defined(__x86_64__) && !defined(__aarch64__) && !defined(__PPC__) && !defined(__s390x__) && !(defined(__loongarch64)) && !(defined(__riscv) && (__riscv_xlen == 64))
-#    error "The only supported platforms are x86_64 and AArch64, PowerPC (work in progress), s390x (work in progress), loongarch64 (experimental) and RISC-V 64 (experimental)"
+#if !defined(__x86_64__) && !defined(__aarch64__) && !defined(__PPC__) && !defined(__s390x__) && !(defined(__riscv) && (__riscv_xlen == 64))
+#    error "The only supported platforms are x86_64 and AArch64, PowerPC (work in progress), s390x (work in progress) and RISC-V 64 (experimental)"
 #endif
 
 /// Check for presence of address sanitizer
@@ -87,13 +87,10 @@
 #   define ASAN_POISON_MEMORY_REGION(a, b)
 #endif
 
-/// We used to have only ABORT_ON_LOGICAL_ERROR macro, but most of its uses were actually in places where we didn't care about logical errors
-/// but wanted to check exactly if the current build type is debug or with sanitizer. This new macro is introduced to fix those places.
-#if !defined(DEBUG_OR_SANITIZER_BUILD)
-#    if !defined(NDEBUG) || defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) \
-        || defined(UNDEFINED_BEHAVIOR_SANITIZER)
-#        define DEBUG_OR_SANITIZER_BUILD
-#    endif
+#if !defined(ABORT_ON_LOGICAL_ERROR)
+    #if !defined(NDEBUG) || defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || defined(UNDEFINED_BEHAVIOR_SANITIZER)
+        #define ABORT_ON_LOGICAL_ERROR
+    #endif
 #endif
 
 /// chassert(x) is similar to assert(x), but:
@@ -104,7 +101,7 @@
 /// Also it makes sense to call abort() instead of __builtin_unreachable() in debug builds,
 /// because SIGABRT is easier to debug than SIGTRAP (the second one makes gdb crazy)
 #if !defined(chassert)
-#    if defined(DEBUG_OR_SANITIZER_BUILD)
+    #if defined(ABORT_ON_LOGICAL_ERROR)
         // clang-format off
         #include <base/types.h>
         namespace DB

base/base/demangle.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstdlib>
 #include <memory>
 #include <string>
 

base/base/extended_types.h

@@ -108,14 +108,6 @@ struct make_unsigned // NOLINT(readability-identifier-naming)
     using type = std::make_unsigned_t<T>;
 };
 
-template <> struct make_unsigned<Int8> { using type = UInt8; };
-template <> struct make_unsigned<UInt8> { using type = UInt8; };
-template <> struct make_unsigned<Int16> { using type = UInt16; };
-template <> struct make_unsigned<UInt16> { using type = UInt16; };
-template <> struct make_unsigned<Int32> { using type = UInt32; };
-template <> struct make_unsigned<UInt32> { using type = UInt32; };
-template <> struct make_unsigned<Int64> { using type = UInt64; };
-template <> struct make_unsigned<UInt64> { using type = UInt64; };
 template <> struct make_unsigned<Int128> { using type = UInt128; };
 template <> struct make_unsigned<UInt128> { using type = UInt128; };
 template <> struct make_unsigned<Int256>  { using type = UInt256; };
@@ -129,14 +121,6 @@ struct make_signed // NOLINT(readability-identifier-naming)
     using type = std::make_signed_t<T>;
 };
 
-template <> struct make_signed<Int8> { using type = Int8; };
-template <> struct make_signed<UInt8> { using type = Int8; };
-template <> struct make_signed<Int16> { using type = Int16; };
-template <> struct make_signed<UInt16> { using type = Int16; };
-template <> struct make_signed<Int32> { using type = Int32; };
-template <> struct make_signed<UInt32> { using type = Int32; };
-template <> struct make_signed<Int64> { using type = Int64; };
-template <> struct make_signed<UInt64> { using type = Int64; };
 template <> struct make_signed<Int128>  { using type = Int128; };
 template <> struct make_signed<UInt128> { using type = Int128; };
 template <> struct make_signed<Int256>  { using type = Int256; };

base/base/find_symbols.h

@@ -147,7 +147,7 @@ constexpr uint16_t maybe_negate(uint16_t x)
         return ~x;
 }
 
-enum class ReturnMode : uint8_t
+enum class ReturnMode
 {
     End,
     Nullptr,
@@ -330,8 +330,9 @@ inline const char * find_first_symbols_dispatch(const char * begin, const char *
 #if defined(__SSE4_2__)
     if (sizeof...(symbols) >= 5)
         return find_first_symbols_sse42<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
+    else
 #endif
-    return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
+        return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
 }
 
 template <bool positive, ReturnMode return_mode>
@@ -340,8 +341,9 @@ inline const char * find_first_symbols_dispatch(const std::string_view haystack,
 #if defined(__SSE4_2__)
     if (symbols.str.size() >= 5)
         return find_first_symbols_sse42<positive, return_mode>(haystack.begin(), haystack.end(), symbols);
+    else
 #endif
-    return find_first_symbols_sse2<positive, return_mode>(haystack.begin(), haystack.end(), symbols.str.data(), symbols.str.size());
+        return find_first_symbols_sse2<positive, return_mode>(haystack.begin(), haystack.end(), symbols.str.data(), symbols.str.size());
 }
 
 }

base/base/getFQDNOrHostName.cpp

@@ -6,9 +6,6 @@ namespace
 {
     std::string getFQDNOrHostNameImpl()
     {
-#if defined(OS_DARWIN)
-        return Poco::Net::DNS::hostName();
-#else
         try
         {
             return Poco::Net::DNS::thisHost().name();
@@ -17,7 +14,6 @@ namespace
         {
             return Poco::Net::DNS::hostName();
         }
-#endif
     }
 }
 

base/base/getMemoryAmount.cpp

@@ -2,14 +2,15 @@
 
 #include <base/cgroupsv2.h>
 #include <base/getPageSize.h>
-#include <base/Numa.h>
 
 #include <fstream>
+#include <stdexcept>
 
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 
+
 namespace
 {
 
@@ -19,6 +20,9 @@ std::optional<uint64_t> getCgroupsV2MemoryLimit()
     if (!cgroupsV2Enabled())
         return {};
 
+    if (!cgroupsV2MemoryControllerEnabled())
+        return {};
+
     std::filesystem::path current_cgroup = cgroupV2PathOfProcess();
     if (current_cgroup.empty())
         return {};
@@ -33,7 +37,8 @@ std::optional<uint64_t> getCgroupsV2MemoryLimit()
             uint64_t value;
             if (setting_file >> value)
                 return {value};
-            return {}; /// e.g. the cgroups default "max"
+            else
+                return {}; /// e.g. the cgroups default "max"
         }
         current_cgroup = current_cgroup.parent_path();
     }
@@ -58,9 +63,6 @@ uint64_t getMemoryAmountOrZero()
 
     uint64_t memory_amount = num_pages * page_size;
 
-    if (auto total_numa_memory = DB::getNumaNodesTotalMemory(); total_numa_memory.has_value())
-        memory_amount = *total_numa_memory;
-
     /// Respect the memory limit set by cgroups v2.
     auto limit_v2 = getCgroupsV2MemoryLimit();
     if (limit_v2.has_value() && *limit_v2 < memory_amount)
@@ -76,7 +78,8 @@ uint64_t getMemoryAmountOrZero()
         {
             uint64_t limit_v1;
             if (limit_file_v1 >> limit_v1)
-                memory_amount = std::min(memory_amount, limit_v1);
+                if (limit_v1 < memory_amount)
+                    memory_amount = limit_v1;
         }
     }
 

base/base/hex.h

@@ -146,7 +146,7 @@ namespace impl
             TUInt res;
             if constexpr (sizeof(TUInt) == 1)
             {
-                res = unhexDigit(data[0]) * 0x10 + unhexDigit(data[1]);
+                res = static_cast<UInt8>(unhexDigit(data[0])) * 0x10 + static_cast<UInt8>(unhexDigit(data[1]));
             }
             else if constexpr (sizeof(TUInt) == 2)
             {
@@ -176,19 +176,17 @@ namespace impl
     };
 
     /// Helper template class to convert a value of any supported type to hexadecimal representation and back.
-    template <typename T>
+    template <typename T, typename SFINAE = void>
     struct HexConversion;
 
     template <typename TUInt>
-    requires(std::is_integral_v<TUInt>)
-    struct HexConversion<TUInt> : public HexConversionUInt<TUInt> {};
+    struct HexConversion<TUInt, std::enable_if_t<std::is_integral_v<TUInt>>> : public HexConversionUInt<TUInt> {};
 
     template <size_t Bits, typename Signed>
     struct HexConversion<wide::integer<Bits, Signed>> : public HexConversionUInt<wide::integer<Bits, Signed>> {};
 
     template <typename CityHashUInt128> /// Partial specialization here allows not to include <city.h> in this header.
-    requires(std::is_same_v<CityHashUInt128, typename CityHash_v1_0_2::uint128>)
-    struct HexConversion<CityHashUInt128>
+    struct HexConversion<CityHashUInt128, std::enable_if_t<std::is_same_v<CityHashUInt128, typename CityHash_v1_0_2::uint128>>>
     {
         static const constexpr size_t num_hex_digits = 32;
 

base/base/iostream_debug_helpers.h

@@ -0,0 +1,183 @@
+#pragma once
+
+#include "demangle.h"
+#include "getThreadId.h"
+#include <type_traits>
+#include <tuple>
+#include <iomanip>
+#include <iostream>
+#include <magic_enum.hpp>
+
+/** Usage:
+  *
+  * DUMP(variable...)
+  */
+
+
+template <typename Out, typename T>
+Out & dumpValue(Out &, T &&);
+
+
+/// Catch-all case.
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == -1, Out> & dumpImpl(Out & out, T &&) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return out << "{...}";
+}
+
+/// An object, that could be output with operator <<.
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 0, Out> & dumpImpl(Out & out, T && x, std::decay_t<decltype(std::declval<Out &>() << std::declval<T>())> * = nullptr) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return out << x;
+}
+
+/// A pointer-like object.
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 1
+    /// Protect from the case when operator * do effectively nothing (function pointer).
+    && !std::is_same_v<std::decay_t<T>, std::decay_t<decltype(*std::declval<T>())>>
+    , Out> & dumpImpl(Out & out, T && x, std::decay_t<decltype(*std::declval<T>())> * = nullptr) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    if (!x)
+        return out << "nullptr";
+    return dumpValue(out, *x);
+}
+
+/// Container.
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 2, Out> & dumpImpl(Out & out, T && x, std::decay_t<decltype(std::begin(std::declval<T>()))> * = nullptr) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    bool first = true;
+    out << "{";
+    for (const auto & elem : x)
+    {
+        if (first)
+            first = false;
+        else
+            out << ", ";
+        dumpValue(out, elem);
+    }
+    return out << "}";
+}
+
+
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 3 && std::is_enum_v<std::decay_t<T>>, Out> &
+dumpImpl(Out & out, T && x) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return out << magic_enum::enum_name(x);
+}
+
+/// string and const char * - output not as container or pointer.
+
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 3 && (std::is_same_v<std::decay_t<T>, std::string> || std::is_same_v<std::decay_t<T>, const char *>), Out> &
+dumpImpl(Out & out, T && x) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return out << std::quoted(x);
+}
+
+/// UInt8 - output as number, not char.
+
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 3 && std::is_same_v<std::decay_t<T>, unsigned char>, Out> &
+dumpImpl(Out & out, T && x) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return out << int(x);
+}
+
+
+/// Tuple, pair
+template <size_t N, typename Out, typename T>
+Out & dumpTupleImpl(Out & out, T && x) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    if constexpr (N == 0)
+        out << "{";
+    else
+        out << ", ";
+
+    dumpValue(out, std::get<N>(x));
+
+    if constexpr (N + 1 == std::tuple_size_v<std::decay_t<T>>)
+        out << "}";
+    else
+        dumpTupleImpl<N + 1>(out, x);
+
+    return out;
+}
+
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 4, Out> & dumpImpl(Out & out, T && x, std::decay_t<decltype(std::get<0>(std::declval<T>()))> * = nullptr) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return dumpTupleImpl<0>(out, x);
+}
+
+
+template <int priority, typename Out, typename T>
+Out & dumpDispatchPriorities(Out & out, T && x, std::decay_t<decltype(dumpImpl<priority>(std::declval<Out &>(), std::declval<T>()))> *) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return dumpImpl<priority>(out, x);
+}
+
+// NOLINTNEXTLINE(google-explicit-constructor)
+struct LowPriority { LowPriority(void *) {} };
+
+template <int priority, typename Out, typename T>
+Out & dumpDispatchPriorities(Out & out, T && x, LowPriority) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return dumpDispatchPriorities<priority - 1>(out, x, nullptr);
+}
+
+
+template <typename Out, typename T>
+Out & dumpValue(Out & out, T && x) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    return dumpDispatchPriorities<5>(out, x, nullptr);
+}
+
+
+template <typename Out, typename T>
+Out & dump(Out & out, const char * name, T && x) // NOLINT(cppcoreguidelines-missing-std-forward)
+{
+    // Dumping string literal, printing name and demangled type is irrelevant.
+    if constexpr (std::is_same_v<const char *, std::decay_t<std::remove_reference_t<T>>>)
+    {
+         const auto name_len = strlen(name);
+         const auto value_len = strlen(x);
+         // `name` is the same as quoted `x`
+         if (name_len > 2 && value_len > 0 && name[0] == '"' && name[name_len - 1] == '"'
+                 && strncmp(name + 1, x, std::min(value_len, name_len) - 1) == 0)
+             return out << x;
+    }
+
+    out << demangle(typeid(x).name()) << " " << name << " = ";
+    return dumpValue(out, x) << "; ";
+}
+
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+
+#define DUMPVAR(VAR) ::dump(std::cerr, #VAR, (VAR));
+#define DUMPHEAD std::cerr << __FILE__ << ':' << __LINE__ << " [ " << getThreadId() << " ] ";
+#define DUMPTAIL std::cerr << '\n';
+
+#define DUMP1(V1) do { DUMPHEAD DUMPVAR(V1) DUMPTAIL } while(0)
+#define DUMP2(V1, V2) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPTAIL } while(0)
+#define DUMP3(V1, V2, V3) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPTAIL } while(0)
+#define DUMP4(V1, V2, V3, V4) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPVAR(V4) DUMPTAIL } while(0)
+#define DUMP5(V1, V2, V3, V4, V5) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPVAR(V4) DUMPVAR(V5) DUMPTAIL } while(0)
+#define DUMP6(V1, V2, V3, V4, V5, V6) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPVAR(V4) DUMPVAR(V5) DUMPVAR(V6) DUMPTAIL } while(0)
+#define DUMP7(V1, V2, V3, V4, V5, V6, V7) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPVAR(V4) DUMPVAR(V5) DUMPVAR(V6) DUMPVAR(V7) DUMPTAIL } while(0)
+#define DUMP8(V1, V2, V3, V4, V5, V6, V7, V8) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPVAR(V4) DUMPVAR(V5) DUMPVAR(V6) DUMPVAR(V7) DUMPVAR(V8) DUMPTAIL } while(0)
+#define DUMP9(V1, V2, V3, V4, V5, V6, V7, V8, V9) do { DUMPHEAD DUMPVAR(V1) DUMPVAR(V2) DUMPVAR(V3) DUMPVAR(V4) DUMPVAR(V5) DUMPVAR(V6) DUMPVAR(V7) DUMPVAR(V8) DUMPVAR(V9) DUMPTAIL } while(0)
+
+/// https://groups.google.com/forum/#!searchin/kona-dev/variadic$20macro%7Csort:date/kona-dev/XMA-lDOqtlI/GCzdfZsD41sJ
+
+#define VA_NUM_ARGS_IMPL(x1, x2, x3, x4, x5, x6, x7, x8, x9, N, ...) N
+#define VA_NUM_ARGS(...) VA_NUM_ARGS_IMPL(__VA_ARGS__, 9, 8, 7, 6, 5, 4, 3, 2, 1)
+
+#define MAKE_VAR_MACRO_IMPL_CONCAT(PREFIX, NUM_ARGS) PREFIX ## NUM_ARGS
+#define MAKE_VAR_MACRO_IMPL(PREFIX, NUM_ARGS) MAKE_VAR_MACRO_IMPL_CONCAT(PREFIX, NUM_ARGS)
+#define MAKE_VAR_MACRO(PREFIX, ...) MAKE_VAR_MACRO_IMPL(PREFIX, VA_NUM_ARGS(__VA_ARGS__))
+
+#define DUMP(...) MAKE_VAR_MACRO(DUMP, __VA_ARGS__)(__VA_ARGS__)

base/base/isSharedPtrUnique.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <memory>
-
-template <typename T>
-bool isSharedPtrUnique(const std::shared_ptr<T> & ptr)
-{
-    return ptr.use_count() == 1;
-}

base/base/itoa.cpp

@@ -1,3 +1,32 @@
+// Based on https://github.com/amdn/itoa and combined with our optimizations
+//
+//=== itoa.cpp - Fast integer to ascii conversion                 --*- C++ -*-//
+//
+// The MIT License (MIT)
+// Copyright (c) 2016 Arturo Martin-de-Nicolas
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+//     The above copyright notice and this permission notice shall be included
+//     in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//===----------------------------------------------------------------------===//
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <type_traits>
 #include <base/defines.h>
 #include <base/extended_types.h>
@@ -5,15 +34,99 @@
 
 namespace
 {
-ALWAYS_INLINE inline char * outOneDigit(char * p, uint8_t value)
+template <typename T>
+ALWAYS_INLINE inline constexpr T pow10(size_t x)
+{
+    return x ? 10 * pow10<T>(x - 1) : 1;
+}
+
+// Division by a power of 10 is implemented using a multiplicative inverse.
+// This strength reduction is also done by optimizing compilers, but
+// presently the fastest results are produced by using the values
+// for the multiplication and the shift as given by the algorithm
+// described by Agner Fog in "Optimizing Subroutines in Assembly Language"
+//
+// http://www.agner.org/optimize/optimizing_assembly.pdf
+//
+// "Integer division by a constant (all processors)
+// A floating point number can be divided by a constant by multiplying
+// with the reciprocal. If we want to do the same with integers, we have
+// to scale the reciprocal by 2n and then shift the product to the right
+// by n. There are various algorithms for finding a suitable value of n
+// and compensating for rounding errors. The algorithm described below
+// was invented by Terje Mathisen, Norway, and not published elsewhere."
+
+/// Division by constant is performed by:
+/// 1. Adding 1 if needed;
+/// 2. Multiplying by another constant;
+/// 3. Shifting right by another constant.
+template <typename UInt, bool add_, UInt multiplier_, unsigned shift_>
+struct Division
+{
+    static constexpr bool add{add_};
+    static constexpr UInt multiplier{multiplier_};
+    static constexpr unsigned shift{shift_};
+};
+
+/// Select a type with appropriate number of bytes from the list of types.
+/// First parameter is the number of bytes requested. Then goes a list of types with 1, 2, 4, ... number of bytes.
+/// Example: SelectType<4, uint8_t, uint16_t, uint32_t, uint64_t> will select uint32_t.
+template <size_t N, typename T, typename... Ts>
+struct SelectType
+{
+    using Result = typename SelectType<N / 2, Ts...>::Result;
+};
+
+template <typename T, typename... Ts>
+struct SelectType<1, T, Ts...>
+{
+    using Result = T;
+};
+
+
+/// Division by 10^N where N is the size of the type.
+template <size_t N>
+using DivisionBy10PowN = typename SelectType<
+    N,
+    Division<uint8_t, false, 205U, 11>, /// divide by 10
+    Division<uint16_t, true, 41943U, 22>, /// divide by 100
+    Division<uint32_t, false, 3518437209U, 45>, /// divide by 10000
+    Division<uint64_t, false, 12379400392853802749ULL, 90> /// divide by 100000000
+    >::Result;
+
+template <size_t N>
+using UnsignedOfSize = typename SelectType<N, uint8_t, uint16_t, uint32_t, uint64_t, __uint128_t>::Result;
+
+/// Holds the result of dividing an unsigned N-byte variable by 10^N resulting in
+template <size_t N>
+struct QuotientAndRemainder
+{
+    UnsignedOfSize<N> quotient; // quotient with fewer than 2*N decimal digits
+    UnsignedOfSize<N / 2> remainder; // remainder with at most N decimal digits
+};
+
+template <size_t N>
+QuotientAndRemainder<N> inline split(UnsignedOfSize<N> value)
+{
+    constexpr DivisionBy10PowN<N> division;
+
+    UnsignedOfSize<N> quotient = (division.multiplier * (UnsignedOfSize<2 * N>(value) + division.add)) >> division.shift;
+    UnsignedOfSize<N / 2> remainder = static_cast<UnsignedOfSize<N / 2>>(value - quotient * pow10<UnsignedOfSize<N / 2>>(N));
+
+    return {quotient, remainder};
+}
+
+ALWAYS_INLINE inline char * outDigit(char * p, uint8_t value)
 {
     *p = '0' + value;
-    return p + 1;
+    ++p;
+    return p;
 }
 
 // Using a lookup table to convert binary numbers from 0 to 99
 // into ascii characters as described by Andrei Alexandrescu in
 // https://www.facebook.com/notes/facebook-engineering/three-optimization-tips-for-c/10151361643253920/
+
 const char digits[201] = "00010203040506070809"
                          "10111213141516171819"
                          "20212223242526272829"
@@ -24,6 +137,7 @@ const char digits[201] = "00010203040506070809"
                          "70717273747576777879"
                          "80818283848586878889"
                          "90919293949596979899";
+
 ALWAYS_INLINE inline char * outTwoDigits(char * p, uint8_t value)
 {
     memcpy(p, &digits[value * 2], 2);
@@ -31,260 +145,151 @@ ALWAYS_INLINE inline char * outTwoDigits(char * p, uint8_t value)
     return p;
 }
 
-namespace jeaiii
+namespace convert
 {
-/*
-    MIT License
+template <typename UInt, size_t N = sizeof(UInt)>
+char * head(char * p, UInt u);
+template <typename UInt, size_t N = sizeof(UInt)>
+char * tail(char * p, UInt u);
 
-    Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa
+//===----------------------------------------------------------===//
+//     head: find most significant digit, skip leading zeros
+//===----------------------------------------------------------===//
 
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-*/
-struct pair
+// "x" contains quotient and remainder after division by 10^N
+// quotient is less than 10^N
+template <size_t N>
+ALWAYS_INLINE inline char * head(char * p, QuotientAndRemainder<N> x)
 {
-    char dd[2];
-    constexpr pair(char c) : dd{c, '\0'} { } /// NOLINT(google-explicit-constructor)
-    constexpr pair(int n) : dd{"0123456789"[n / 10], "0123456789"[n % 10]} { } /// NOLINT(google-explicit-constructor)
-};
+    p = head(p, UnsignedOfSize<N / 2>(x.quotient));
+    p = tail(p, x.remainder);
+    return p;
+}
 
-constexpr struct
+// "u" is less than 10^2*N
+template <typename UInt, size_t N>
+ALWAYS_INLINE inline char * head(char * p, UInt u)
 {
-    pair dd[100]{
-        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, //
-        10, 11, 12, 13, 14, 15, 16, 17, 18, 19, //
-        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, //
-        30, 31, 32, 33, 34, 35, 36, 37, 38, 39, //
-        40, 41, 42, 43, 44, 45, 46, 47, 48, 49, //
-        50, 51, 52, 53, 54, 55, 56, 57, 58, 59, //
-        60, 61, 62, 63, 64, 65, 66, 67, 68, 69, //
-        70, 71, 72, 73, 74, 75, 76, 77, 78, 79, //
-        80, 81, 82, 83, 84, 85, 86, 87, 88, 89, //
-        90, 91, 92, 93, 94, 95, 96, 97, 98, 99, //
-    };
-    pair fd[100]{
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', //
-        10,  11,  12,  13,  14,  15,  16,  17,  18,  19, //
-        20,  21,  22,  23,  24,  25,  26,  27,  28,  29, //
-        30,  31,  32,  33,  34,  35,  36,  37,  38,  39, //
-        40,  41,  42,  43,  44,  45,  46,  47,  48,  49, //
-        50,  51,  52,  53,  54,  55,  56,  57,  58,  59, //
-        60,  61,  62,  63,  64,  65,  66,  67,  68,  69, //
-        70,  71,  72,  73,  74,  75,  76,  77,  78,  79, //
-        80,  81,  82,  83,  84,  85,  86,  87,  88,  89, //
-        90,  91,  92,  93,  94,  95,  96,  97,  98,  99, //
-    };
-} digits;
+    return u < pow10<UnsignedOfSize<N>>(N) ? head(p, UnsignedOfSize<N / 2>(u)) : head<N>(p, split<N>(u));
+}
 
-constexpr UInt64 mask24 = (UInt64(1) << 24) - 1;
-constexpr UInt64 mask32 = (UInt64(1) << 32) - 1;
-constexpr UInt64 mask57 = (UInt64(1) << 57) - 1;
-
-template <bool, class, class F>
-struct _cond
+// recursion base case, selected when "u" is one byte
+template <>
+ALWAYS_INLINE inline char * head<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
 {
-    using type = F;
-};
-template <class T, class F>
-struct _cond<true, T, F>
+    return u < 10 ? outDigit(p, u) : outTwoDigits(p, u);
+}
+
+//===----------------------------------------------------------===//
+//     tail: produce all digits including leading zeros
+//===----------------------------------------------------------===//
+
+// recursive step, "u" is less than 10^2*N
+template <typename UInt, size_t N>
+ALWAYS_INLINE inline char * tail(char * p, UInt u)
 {
-    using type = T;
-};
-template <bool B, class T, class F>
-using cond = typename _cond<B, T, F>::type;
+    QuotientAndRemainder<N> x = split<N>(u);
+    p = tail(p, UnsignedOfSize<N / 2>(x.quotient));
+    p = tail(p, x.remainder);
+    return p;
+}
 
-template <class T>
-inline ALWAYS_INLINE char * to_text_from_integer(char * b, T i)
+// recursion base case, selected when "u" is one byte
+template <>
+ALWAYS_INLINE inline char * tail<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
 {
-    constexpr auto q = sizeof(T);
-    using U = cond<q == 1, char8_t, cond<q <= sizeof(UInt16), UInt16, cond<q <= sizeof(UInt32), UInt32, UInt64>>>;
+    return outTwoDigits(p, u);
+}
 
-    // convert bool to int before test with unary + to silence warning if T happens to be bool
-    U const n = +i < 0 ? *b++ = '-', U(0) - U(i) : U(i);
+//===----------------------------------------------------------===//
+// large values are >= 10^2*N
+// where x contains quotient and remainder after division by 10^N
+//===----------------------------------------------------------===//
+template <size_t N>
+ALWAYS_INLINE inline char * large(char * p, QuotientAndRemainder<N> x)
+{
+    QuotientAndRemainder<N> y = split<N>(x.quotient);
+    p = head(p, UnsignedOfSize<N / 2>(y.quotient));
+    p = tail(p, y.remainder);
+    p = tail(p, x.remainder);
+    return p;
+}
 
-    if (n < U(1e2))
-    {
-        /// This is changed from the original jeaiii implementation
-        /// For small numbers the extra branch to call outOneDigit() is worth it as it saves some instructions
-        /// and a memory access (no need to read digits.fd[n])
-        /// This is not true for pure random numbers, but that's not the common use case of a database
-        /// Original jeaii code
-        //      *reinterpret_cast<pair *>(b) = digits.fd[n];
-        //      return n < 10 ? b + 1 : b + 2;
-        return n < 10 ? outOneDigit(b, n) : outTwoDigits(b, n);
-    }
-    if (n < UInt32(1e6))
-    {
-        if (sizeof(U) == 1 || n < U(1e4))
-        {
-            auto f0 = UInt32(10 * (1 << 24) / 1e3 + 1) * n;
-            *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 24];
-            if constexpr (sizeof(U) == 1)
-                b -= 1;
-            else
-                b -= n < U(1e3);
-            auto f2 = (f0 & mask24) * 100;
-            *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 24];
-            return b + 4;
-        }
-        auto f0 = UInt64(10 * (1ull << 32ull) / 1e5 + 1) * n;
-        *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 32];
-        if constexpr (sizeof(U) == 2)
-            b -= 1;
-        else
-            b -= n < U(1e5);
-        auto f2 = (f0 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 32];
-        auto f4 = (f2 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 32];
-        return b + 6;
-    }
-    if (sizeof(U) == 4 || n < UInt64(1ull << 32ull))
-    {
-        if (n < U(1e8))
-        {
-            auto f0 = UInt64(10 * (1ull << 48ull) / 1e7 + 1) * n >> 16;
-            *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 32];
-            b -= n < U(1e7);
-            auto f2 = (f0 & mask32) * 100;
-            *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 32];
-            auto f4 = (f2 & mask32) * 100;
-            *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 32];
-            auto f6 = (f4 & mask32) * 100;
-            *reinterpret_cast<pair *>(b + 6) = digits.dd[f6 >> 32];
-            return b + 8;
-        }
-        auto f0 = UInt64(10 * (1ull << 57ull) / 1e9 + 1) * n;
-        *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 57];
-        b -= n < UInt32(1e9);
-        auto f2 = (f0 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 57];
-        auto f4 = (f2 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 57];
-        auto f6 = (f4 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 6) = digits.dd[f6 >> 57];
-        auto f8 = (f6 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 8) = digits.dd[f8 >> 57];
-        return b + 10;
-    }
+//===----------------------------------------------------------===//
+// handle values of "u" that might be >= 10^2*N
+// where N is the size of "u" in bytes
+//===----------------------------------------------------------===//
+template <typename UInt, size_t N = sizeof(UInt)>
+ALWAYS_INLINE inline char * uitoa(char * p, UInt u)
+{
+    if (u < pow10<UnsignedOfSize<N>>(N))
+        return head(p, UnsignedOfSize<N / 2>(u));
+    QuotientAndRemainder<N> x = split<N>(u);
 
-    // if we get here U must be UInt64 but some compilers don't know that, so reassign n to a UInt64 to avoid warnings
-    UInt32 z = n % UInt32(1e8);
-    UInt64 u = n / UInt32(1e8);
+    return u < pow10<UnsignedOfSize<N>>(2 * N) ? head<N>(p, x) : large<N>(p, x);
+}
 
-    if (u < UInt32(1e2))
-    {
-        // u can't be 1 digit (if u < 10 it would have been handled above as a 9 digit 32bit number)
-        *reinterpret_cast<pair *>(b) = digits.dd[u];
-        b += 2;
-    }
-    else if (u < UInt32(1e6))
-    {
-        if (u < UInt32(1e4))
-        {
-            auto f0 = UInt32(10 * (1 << 24) / 1e3 + 1) * u;
-            *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 24];
-            b -= u < UInt32(1e3);
-            auto f2 = (f0 & mask24) * 100;
-            *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 24];
-            b += 4;
-        }
-        else
-        {
-            auto f0 = UInt64(10 * (1ull << 32ull) / 1e5 + 1) * u;
-            *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 32];
-            b -= u < UInt32(1e5);
-            auto f2 = (f0 & mask32) * 100;
-            *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 32];
-            auto f4 = (f2 & mask32) * 100;
-            *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 32];
-            b += 6;
-        }
-    }
-    else if (u < UInt32(1e8))
-    {
-        auto f0 = UInt64(10 * (1ull << 48ull) / 1e7 + 1) * u >> 16;
-        *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 32];
-        b -= u < UInt32(1e7);
-        auto f2 = (f0 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 32];
-        auto f4 = (f2 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 32];
-        auto f6 = (f4 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 6) = digits.dd[f6 >> 32];
-        b += 8;
-    }
-    else if (u < UInt64(1ull << 32ull))
-    {
-        auto f0 = UInt64(10 * (1ull << 57ull) / 1e9 + 1) * u;
-        *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 57];
-        b -= u < UInt32(1e9);
-        auto f2 = (f0 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 57];
-        auto f4 = (f2 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 57];
-        auto f6 = (f4 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 6) = digits.dd[f6 >> 57];
-        auto f8 = (f6 & mask57) * 100;
-        *reinterpret_cast<pair *>(b + 8) = digits.dd[f8 >> 57];
-        b += 10;
-    }
+// selected when "u" is one byte
+template <>
+ALWAYS_INLINE inline char * uitoa<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
+{
+    if (u < 10)
+        return outDigit(p, u);
+    else if (u < 100)
+        return outTwoDigits(p, u);
     else
     {
-        UInt32 y = u % UInt32(1e8);
-        u /= UInt32(1e8);
-
-        // u is 2, 3, or 4 digits (if u < 10 it would have been handled above)
-        if (u < UInt32(1e2))
-        {
-            *reinterpret_cast<pair *>(b) = digits.dd[u];
-            b += 2;
-        }
-        else
-        {
-            auto f0 = UInt32(10 * (1 << 24) / 1e3 + 1) * u;
-            *reinterpret_cast<pair *>(b) = digits.fd[f0 >> 24];
-            b -= u < UInt32(1e3);
-            auto f2 = (f0 & mask24) * 100;
-            *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 24];
-            b += 4;
-        }
-        // do 8 digits
-        auto f0 = (UInt64((1ull << 48ull) / 1e6 + 1) * y >> 16) + 1;
-        *reinterpret_cast<pair *>(b) = digits.dd[f0 >> 32];
-        auto f2 = (f0 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 32];
-        auto f4 = (f2 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 32];
-        auto f6 = (f4 & mask32) * 100;
-        *reinterpret_cast<pair *>(b + 6) = digits.dd[f6 >> 32];
-        b += 8;
+        p = outDigit(p, u / 100);
+        p = outTwoDigits(p, u % 100);
+        return p;
     }
-    // do 8 digits
-    auto f0 = (UInt64((1ull << 48ull) / 1e6 + 1) * z >> 16) + 1;
-    *reinterpret_cast<pair *>(b) = digits.dd[f0 >> 32];
-    auto f2 = (f0 & mask32) * 100;
-    *reinterpret_cast<pair *>(b + 2) = digits.dd[f2 >> 32];
-    auto f4 = (f2 & mask32) * 100;
-    *reinterpret_cast<pair *>(b + 4) = digits.dd[f4 >> 32];
-    auto f6 = (f4 & mask32) * 100;
-    *reinterpret_cast<pair *>(b + 6) = digits.dd[f6 >> 32];
-    return b + 8;
+}
+
+//===----------------------------------------------------------===//
+//     handle unsigned and signed integral operands
+//===----------------------------------------------------------===//
+
+// itoa: handle unsigned integral operands (selected by SFINAE)
+template <typename U, std::enable_if_t<!std::is_signed_v<U> && std::is_integral_v<U>> * = nullptr>
+ALWAYS_INLINE inline char * itoa(U u, char * p)
+{
+    return convert::uitoa(p, u);
+}
+
+// itoa: handle signed integral operands (selected by SFINAE)
+template <typename I, size_t N = sizeof(I), std::enable_if_t<std::is_signed_v<I> && std::is_integral_v<I>> * = nullptr>
+ALWAYS_INLINE inline char * itoa(I i, char * p)
+{
+    // Need "mask" to be filled with a copy of the sign bit.
+    // If "i" is a negative value, then the result of "operator >>"
+    // is implementation-defined, though usually it is an arithmetic
+    // right shift that replicates the sign bit.
+    // Use a conditional expression to be portable,
+    // a good optimizing compiler generates an arithmetic right shift
+    // and avoids the conditional branch.
+    UnsignedOfSize<N> mask = i < 0 ? ~UnsignedOfSize<N>(0) : 0;
+    // Now get the absolute value of "i" and cast to unsigned type UnsignedOfSize<N>.
+    // Cannot use std::abs() because the result is undefined
+    // in 2's complement systems for the most-negative value.
+    // Want to avoid conditional branch for performance reasons since
+    // CPU branch prediction will be ineffective when negative values
+    // occur randomly.
+    // Let "u" be "i" cast to unsigned type UnsignedOfSize<N>.
+    // Subtract "u" from 2*u if "i" is positive or 0 if "i" is negative.
+    // This yields the absolute value with the desired type without
+    // using a conditional branch and without invoking undefined or
+    // implementation defined behavior:
+    UnsignedOfSize<N> u = ((2 * UnsignedOfSize<N>(i)) & ~mask) - UnsignedOfSize<N>(i);
+    // Unconditionally store a minus sign when producing digits
+    // in a forward direction and increment the pointer only if
+    // the value is in fact negative.
+    // This avoids a conditional branch and is safe because we will
+    // always produce at least one digit and it will overwrite the
+    // minus sign when the value is not negative.
+    *p = '-';
+    p += (mask & 1);
+    p = convert::uitoa(p, u);
+    return p;
 }
 }
 
@@ -296,7 +301,7 @@ ALWAYS_INLINE inline char * writeUIntText(UInt128 _x, char * p)
 {
     /// If we the highest 64bit item is empty, we can print just the lowest item as u64
     if (_x.items[UInt128::_impl::little(1)] == 0)
-        return jeaiii::to_text_from_integer(p, _x.items[UInt128::_impl::little(0)]);
+        return convert::itoa(_x.items[UInt128::_impl::little(0)], p);
 
     /// Doing operations using __int128 is faster and we already rely on this feature
     using T = unsigned __int128;
@@ -327,7 +332,7 @@ ALWAYS_INLINE inline char * writeUIntText(UInt128 _x, char * p)
         current_block += max_multiple_of_hundred_blocks;
     }
 
-    char * highest_part_print = jeaiii::to_text_from_integer(p, uint64_t(x));
+    char * highest_part_print = convert::itoa(uint64_t(x), p);
     for (int i = 0; i < current_block; i++)
     {
         outTwoDigits(highest_part_print, two_values[current_block - 1 - i]);
@@ -443,12 +448,12 @@ ALWAYS_INLINE inline char * writeSIntText(T x, char * pos)
 
 char * itoa(UInt8 i, char * p)
 {
-    return jeaiii::to_text_from_integer(p, uint8_t(i));
+    return convert::itoa(uint8_t(i), p);
 }
 
 char * itoa(Int8 i, char * p)
 {
-    return jeaiii::to_text_from_integer(p, int8_t(i));
+    return convert::itoa(int8_t(i), p);
 }
 
 char * itoa(UInt128 i, char * p)
@@ -474,7 +479,7 @@ char * itoa(Int256 i, char * p)
 #define DEFAULT_ITOA(T) \
     char * itoa(T i, char * p) \
     { \
-        return jeaiii::to_text_from_integer(p, i); \
+        return convert::itoa(i, p); \
     }
 
 #define FOR_MISSING_INTEGER_TYPES(M) \

base/base/map.h

@@ -19,8 +19,8 @@ auto map(const Collection<Params...> & collection, Mapper && mapper)
     using value_type = unqualified_t<decltype(mapper(*std::begin(collection)))>;
 
     return Collection<value_type>(
-        boost::make_transform_iterator(std::begin(collection), mapper),
-        boost::make_transform_iterator(std::end(collection), mapper));
+        boost::make_transform_iterator(std::begin(collection), std::forward<Mapper>(mapper)),
+        boost::make_transform_iterator(std::end(collection), std::forward<Mapper>(mapper)));
 }
 
 /** \brief Returns collection of specified container-type,
@@ -33,8 +33,8 @@ auto map(const Collection & collection, Mapper && mapper)
     using value_type = unqualified_t<decltype(mapper(*std::begin(collection)))>;
 
     return ResultCollection<value_type>(
-        boost::make_transform_iterator(std::begin(collection), mapper),
-        boost::make_transform_iterator(std::end(collection), mapper));
+        boost::make_transform_iterator(std::begin(collection), std::forward<Mapper>(mapper)),
+        boost::make_transform_iterator(std::end(collection), std::forward<Mapper>(mapper)));
 }
 
 /** \brief Returns collection of specified type,
@@ -45,8 +45,8 @@ template <typename ResultCollection, typename Collection, typename Mapper>
 auto map(const Collection & collection, Mapper && mapper)
 {
     return ResultCollection(
-        boost::make_transform_iterator(std::begin(collection), mapper),
-        boost::make_transform_iterator(std::end(collection), mapper));
+        boost::make_transform_iterator(std::begin(collection), std::forward<Mapper>(mapper)),
+        boost::make_transform_iterator(std::end(collection), std::forward<Mapper>(mapper)));
 }
 
 }

base/base/range.h

@@ -23,10 +23,12 @@ namespace internal
 
 /// For loop adaptor which is used to iterate through a half-closed interval [begin, end).
 /// The parameters `begin` and `end` can have any integral or enum types.
-template <typename BeginType, typename EndType>
-requires((std::is_integral_v<BeginType> || std::is_enum_v<BeginType>) &&
-         (std::is_integral_v<EndType> || std::is_enum_v<EndType>) &&
-         (!std::is_enum_v<BeginType> || !std::is_enum_v<EndType> || std::is_same_v<BeginType, EndType>))
+template <typename BeginType,
+        typename EndType,
+        typename = std::enable_if_t<
+            (std::is_integral_v<BeginType> || std::is_enum_v<BeginType>) &&
+            (std::is_integral_v<EndType> || std::is_enum_v<EndType>) &&
+            (!std::is_enum_v<BeginType> || !std::is_enum_v<EndType> || std::is_same_v<BeginType, EndType>), void>>
 inline auto range(BeginType begin, EndType end)
 {
     if constexpr (std::is_integral_v<BeginType> && std::is_integral_v<EndType>)
@@ -48,8 +50,8 @@ inline auto range(BeginType begin, EndType end)
 /// For loop adaptor which is used to iterate through a half-closed interval [0, end).
 /// The parameter `end` can have any integral or enum type.
 /// The same as range(0, end).
-template <typename Type>
-requires(std::is_integral_v<Type> || std::is_enum_v<Type>)
+template <typename Type,
+        typename = std::enable_if_t<std::is_integral_v<Type> || std::is_enum_v<Type>, void>>
 inline auto range(Type end)
 {
     if constexpr (std::is_integral_v<Type>)

base/base/sleep.cpp

@@ -2,7 +2,6 @@
 
 #include <ctime>
 #include <cerrno>
-#include <system_error>
 
 #if defined(OS_DARWIN)
 #include <mach/mach.h>
@@ -35,8 +34,7 @@ void sleepForNanoseconds(uint64_t nanoseconds)
     constexpr auto clock_type = CLOCK_MONOTONIC;
 
     struct timespec current_time;
-    if (0 != clock_gettime(clock_type, &current_time))
-        throw std::system_error(std::error_code(errno, std::system_category()));
+    clock_gettime(clock_type, &current_time);
 
     constexpr uint64_t resolution = 1'000'000'000;
     struct timespec finish_time = current_time;

base/base/tests/CMakeLists.txt

@@ -0,0 +1,2 @@
+clickhouse_add_executable (dump_variable dump_variable.cpp)
+target_link_libraries (dump_variable PRIVATE clickhouse_common_io)

base/base/tests/dump_variable.cpp

@@ -0,0 +1,70 @@
+#include <base/iostream_debug_helpers.h>
+
+#include <iostream>
+#include <memory>
+#include <vector>
+#include <map>
+#include <set>
+#include <tuple>
+#include <array>
+#include <utility>
+
+
+struct S1;
+struct S2 {};
+
+struct S3
+{
+    std::set<const char *> m1;
+};
+
+std::ostream & operator<<(std::ostream & stream, const S3 & what)
+{
+    stream << "S3 {m1=";
+    dumpValue(stream, what.m1) << "}";
+    return stream;
+}
+
+int main(int, char **)
+{
+    int x = 1;
+
+    DUMP(x);
+    DUMP(x, 1, &x);
+
+    DUMP(std::make_unique<int>(1));
+    DUMP(std::make_shared<int>(1));
+
+    std::vector<int> vec{1, 2, 3};
+    DUMP(vec);
+
+    auto pair = std::make_pair(1, 2);
+    DUMP(pair);
+
+    auto tuple = std::make_tuple(1, 2, 3);
+    DUMP(tuple);
+
+    std::map<int, std::string> map{{1, "hello"}, {2, "world"}};
+    DUMP(map);
+
+    std::initializer_list<const char *> list{"hello", "world"};
+    DUMP(list);
+
+    std::array<const char *, 2> arr{{"hello", "world"}};
+    DUMP(arr);
+
+    //DUMP([]{});
+
+    S1 * s = nullptr;
+    DUMP(s);
+
+    DUMP(S2());
+
+    std::set<const char *> variants = {"hello", "world"};
+    DUMP(variants);
+
+    S3 s3 {{"hello", "world"}};
+    DUMP(s3);
+
+    return 0;
+}

base/base/wide_integer.h

@@ -111,8 +111,7 @@ public:
 
     constexpr explicit operator bool() const noexcept;
 
-    template <typename T>
-    requires(std::is_arithmetic_v<T>)
+    template <typename T, typename = std::enable_if_t<std::is_arithmetic_v<T>, T>>
     constexpr operator T() const noexcept;
 
     constexpr operator long double() const noexcept;
@@ -209,14 +208,12 @@ constexpr integer<Bits, Signed> operator<<(const integer<Bits, Signed> & lhs, in
 template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, int n) noexcept;
 
-template <size_t Bits, typename Signed, typename Int>
-requires(!std::is_same_v<Int, int>)
+template <size_t Bits, typename Signed, typename Int, typename = std::enable_if_t<!std::is_same_v<Int, int>>>
 constexpr integer<Bits, Signed> operator<<(const integer<Bits, Signed> & lhs, Int n) noexcept
 {
     return lhs << int(n);
 }
-template <size_t Bits, typename Signed, typename Int>
-requires(!std::is_same_v<Int, int>)
+template <size_t Bits, typename Signed, typename Int, typename = std::enable_if_t<!std::is_same_v<Int, int>>>
 constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, Int n) noexcept
 {
     return lhs >> int(n);
@@ -265,3 +262,4 @@ struct hash<wide::integer<Bits, Signed>>;
 // NOLINTEND(*)
 
 #include "wide_integer_impl.h"
+

base/base/wide_integer_impl.h

@@ -13,6 +13,8 @@
 #include <tuple>
 #include <limits>
 
+#include <boost/math/special_functions/fpclassify.hpp>
+
 // NOLINTBEGIN(*)
 
 /// Use same extended double for all platforms
@@ -20,7 +22,6 @@
 #define CONSTEXPR_FROM_DOUBLE constexpr
 using FromDoubleIntermediateType = long double;
 #else
-#include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
 /// `wide_integer_from_builtin` can't be constexpr with non-literal `cpp_bin_float_double_extended`
 #define CONSTEXPR_FROM_DOUBLE
@@ -308,13 +309,6 @@ struct integer<Bits, Signed>::_impl
         constexpr uint64_t max_int = std::numeric_limits<uint64_t>::max();
         static_assert(std::is_same_v<T, double> || std::is_same_v<T, FromDoubleIntermediateType>);
         /// Implementation specific behaviour on overflow (if we don't check here, stack overflow will triggered in bigint_cast).
-#if (LDBL_MANT_DIG == 64)
-        if (!std::isfinite(t))
-        {
-            self = 0;
-            return;
-        }
-#else
         if constexpr (std::is_same_v<T, double>)
         {
             if (!std::isfinite(t))
@@ -331,7 +325,6 @@ struct integer<Bits, Signed>::_impl
                 return;
             }
         }
-#endif
 
         const T alpha = t / static_cast<T>(max_int);
 
@@ -1246,8 +1239,7 @@ constexpr integer<Bits, Signed>::operator bool() const noexcept
 }
 
 template <size_t Bits, typename Signed>
-template <class T>
-requires(std::is_arithmetic_v<T>)
+template <class T, class>
 constexpr integer<Bits, Signed>::operator T() const noexcept
 {
     static_assert(std::numeric_limits<T>::is_integer);

base/base/wide_integer_to_string.h

@@ -62,7 +62,7 @@ struct fmt::formatter<wide::integer<Bits, Signed>>
     }
 
     template <typename FormatContext>
-    auto format(const wide::integer<Bits, Signed> & value, FormatContext & ctx) const
+    auto format(const wide::integer<Bits, Signed> & value, FormatContext & ctx)
     {
         return fmt::format_to(ctx.out(), "{}", to_string(value));
     }

base/glibc-compatibility/CMakeLists.txt

@@ -11,9 +11,6 @@ if (GLIBC_COMPATIBILITY)
     if (ARCH_AARCH64)
         list (APPEND glibc_compatibility_sources musl/aarch64/syscall.s musl/aarch64/longjmp.s)
         set (musl_arch_include_dir musl/aarch64)
-        # Disable getauxval in aarch64. ARM glibc minimum requirement for the project is 2.18 and getauxval is present
-        # in 2.16. Having a custom one introduces issues with sanitizers
-        list (REMOVE_ITEM glibc_compatibility_sources musl/getauxval.c)
     elseif (ARCH_AMD64)
         list (APPEND glibc_compatibility_sources musl/x86_64/syscall.s musl/x86_64/longjmp.s)
         set (musl_arch_include_dir musl/x86_64)
@@ -21,16 +18,6 @@ if (GLIBC_COMPATIBILITY)
         message (FATAL_ERROR "glibc_compatibility can only be used on x86_64 or aarch64.")
     endif ()
 
-    if (SANITIZE STREQUAL thread AND ARCH_AMD64)
-        # Disable TSAN instrumentation that conflicts with re-exec due to high ASLR entropy using getauxval
-        # See longer comment in __auxv_init_procfs
-        # In the case of tsan we need to make sure getauxval is not instrumented as that would introduce tsan
-        # internal calls to functions that depend on a state that isn't initialized yet
-        set_source_files_properties(
-                musl/getauxval.c
-                PROPERTIES COMPILE_FLAGS "-mllvm -tsan-instrument-func-entry-exit=false")
-    endif()
-
     # Need to omit frame pointers to match the performance of glibc
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer")
 

base/glibc-compatibility/musl/getauxval.c

@@ -25,10 +25,9 @@
 // We don't have libc struct available here.
 // Compute aux vector manually (from /proc/self/auxv).
 //
-// Right now there are 51 AT_* constants. Custom kernels have been encountered
-// making use of up to 71. 128 should be enough until this implementation is
-// replaced with musl.
-static unsigned long __auxv_procfs[128];
+// Right now there is only 51 AT_* constants,
+// so 64 should be enough until this implementation will be replaced with musl.
+static unsigned long __auxv_procfs[64];
 static unsigned long __auxv_secure = 0;
 // Common
 static unsigned long * __auxv_environ = NULL;
@@ -76,44 +75,6 @@ unsigned long NO_SANITIZE_THREAD __getauxval_procfs(unsigned long type)
 }
 static unsigned long NO_SANITIZE_THREAD __auxv_init_procfs(unsigned long type)
 {
-#if defined(__x86_64__) && defined(__has_feature)
-#    if __has_feature(memory_sanitizer) || __has_feature(thread_sanitizer)
-    /// Sanitizers are not compatible with high ASLR entropy, which is the default on modern Linux distributions, and
-    /// to workaround this limitation, TSAN and MSAN (couldn't see other sanitizers doing the same), re-exec the binary
-    /// without ASLR (see https://github.com/llvm/llvm-project/commit/0784b1eefa36d4acbb0dacd2d18796e26313b6c5)
-
-    /// The problem we face is that, in order to re-exec, the sanitizer wants to use the original pathname in the call
-    /// and to get its value it uses getauxval (https://github.com/llvm/llvm-project/blob/20eff684203287828d6722fc860b9d3621429542/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp#L985-L988).
-    /// Since we provide getauxval ourselves (to minimize the version dependency on runtime glibc), we are the ones
-    // being called and we fail horribly:
-    ///
-    ///    ==301455==ERROR: MemorySanitizer: SEGV on unknown address 0x2ffc6d721550 (pc 0x5622c1cc0073 bp 0x000000000003 sp 0x7ffc6d721530 T301455)
-    ///    ==301455==The signal is caused by a WRITE memory access.
-    /// #0 0x5622c1cc0073 in __auxv_init_procfs ./ClickHouse/base/glibc-compatibility/musl/getauxval.c:129:5
-    /// #1 0x5622c1cbffe9 in getauxval ./ClickHouse/base/glibc-compatibility/musl/getauxval.c:240:12
-    /// #2 0x5622c0d7bfb4 in __sanitizer::ReExec() crtstuff.c
-    /// #3 0x5622c0df7bfc in __msan::InitShadowWithReExec(bool) crtstuff.c
-    /// #4 0x5622c0d95356 in __msan_init (./ClickHouse/build_msan/contrib/google-protobuf-cmake/protoc+0x256356) (BuildId: 6411d3c88b898ba3f7d49760555977d3e61f0741)
-    /// #5 0x5622c0dfe878 in msan.module_ctor main.cc
-    /// #6 0x5622c1cc156c in __libc_csu_init (./ClickHouse/build_msan/contrib/google-protobuf-cmake/protoc+0x118256c) (BuildId: 6411d3c88b898ba3f7d49760555977d3e61f0741)
-    /// #7 0x73dc05dd7ea3 in __libc_start_main /usr/src/debug/glibc/glibc/csu/../csu/libc-start.c:343:6
-    /// #8 0x5622c0d6b7cd in _start (./ClickHouse/build_msan/contrib/google-protobuf-cmake/protoc+0x22c7cd) (BuildId: 6411d3c88b898ba3f7d49760555977d3e61f0741)
-
-    /// The source of the issue above is that, at this point in time during __msan_init, we can't really do much as
-    /// most global variables aren't initialized or available yet, so we can't initiate the auxiliary vector.
-    /// Normal glibc / musl getauxval doesn't have this problem since they initiate their auxval vector at the very
-    /// start of __libc_start_main (just keeping track of argv+argc+1), but we don't have such option (otherwise
-    /// this complexity of reading "/proc/self/auxv" or using __environ would not be necessary).
-
-    /// To avoid this crashes on the re-exec call (see above how it would fail when creating `aux`, and if we used
-    /// __auxv_init_environ then it would SIGSEV on READing `__environ`) we capture this call for `AT_EXECFN` and
-    /// unconditionally return "/proc/self/exe" without any preparation. Theoretically this should be fine in
-    /// our case, as we don't load any libraries. That's the theory at least.
-    if (type == AT_EXECFN)
-        return (unsigned long)"/proc/self/exe";
-#    endif
-#endif
-
     // For debugging:
     // - od -t dL /proc/self/auxv
     // - LD_SHOW_AUX= ls
@@ -238,7 +199,7 @@ static unsigned long NO_SANITIZE_THREAD __auxv_init_environ(unsigned long type)
 // - __auxv_init_procfs -> __auxv_init_environ -> __getauxval_environ
 static void * volatile getauxval_func = (void *)__auxv_init_procfs;
 
-unsigned long NO_SANITIZE_THREAD getauxval(unsigned long type)
+unsigned long getauxval(unsigned long type)
 {
     return ((unsigned long (*)(unsigned long))getauxval_func)(type);
 }

base/harmful/harmful.c

@@ -66,11 +66,13 @@ TRAP(gethostbyname)
 TRAP(gethostbyname2)
 TRAP(gethostent)
 TRAP(getlogin)
+TRAP(getmntent)
 TRAP(getnetbyaddr)
 TRAP(getnetbyname)
 TRAP(getnetent)
 TRAP(getnetgrent)
 TRAP(getnetgrent_r)
+TRAP(getopt)
 TRAP(getopt_long)
 TRAP(getopt_long_only)
 TRAP(getpass)
@@ -131,6 +133,7 @@ TRAP(nrand48)
 TRAP(__ppc_get_timebase_freq)
 TRAP(ptsname)
 TRAP(putchar_unlocked)
+TRAP(putenv)
 TRAP(pututline)
 TRAP(pututxline)
 TRAP(putwchar_unlocked)
@@ -145,6 +148,7 @@ TRAP(sethostent)
 TRAP(sethostid)
 TRAP(setkey)
 //TRAP(setlocale) // Used by replxx at startup
+TRAP(setlogmask)
 TRAP(setnetent)
 TRAP(setnetgrent)
 TRAP(setprotoent)
@@ -199,6 +203,7 @@ TRAP(lgammal)
 TRAP(nftw)
 TRAP(nl_langinfo)
 TRAP(putc_unlocked)
+TRAP(rand)
 /** In  the current POSIX.1 specification (POSIX.1-2008), readdir() is not required to be thread-safe.  However, in modern
   * implementations (including the glibc implementation), concurrent calls to readdir() that specify different directory streams
   * are thread-safe.  In cases where multiple threads must read from the same directory stream, using readdir() with external
@@ -283,14 +288,4 @@ TRAP(tss_get)
 TRAP(tss_set)
 TRAP(tss_delete)
 
-#ifndef USE_MUSL
-/// These produce duplicate symbol errors when statically linking with musl.
-/// Maybe we can remove them from the musl fork.
-TRAP(getopt)
-TRAP(putenv)
-TRAP(setlogmask)
-TRAP(rand)
-TRAP(getmntent)
-#endif
-
 #endif

base/poco/CMakeLists.txt

@@ -3,11 +3,7 @@ add_subdirectory (Data)
 add_subdirectory (Data/ODBC)
 add_subdirectory (Foundation)
 add_subdirectory (JSON)
-
-if (USE_MONGODB)
-    add_subdirectory(MongoDB)
-endif()
-
+add_subdirectory (MongoDB)
 add_subdirectory (Net)
 add_subdirectory (NetSSL_OpenSSL)
 add_subdirectory (Redis)

base/poco/Crypto/include/Poco/Crypto/EVPPKey.h

@@ -188,9 +188,8 @@ namespace Crypto
                     pFile = fopen(keyFile.c_str(), "r");
                     if (pFile)
                     {
-                        pem_password_cb * pCB = &passCB;
-                        static constexpr char * no_password = "";
-                        void * pPassword = pass.empty() ? (void *)no_password : (void *)pass.c_str();
+                        pem_password_cb * pCB = pass.empty() ? (pem_password_cb *)0 : &passCB;
+                        void * pPassword = pass.empty() ? (void *)0 : (void *)pass.c_str();
                         if (readFunc(pFile, &pKey, pCB, pPassword))
                         {
                             fclose(pFile);
@@ -226,13 +225,6 @@ namespace Crypto
         error:
             if (pFile)
                 fclose(pFile);
-            if (*ppKey)
-            {
-                if constexpr (std::is_same_v<K, EVP_PKEY>)
-                    EVP_PKEY_free(*ppKey);
-                else
-                    EC_KEY_free(*ppKey);
-            }
             throw OpenSSLException("EVPKey::loadKey(string)");
         }
 
@@ -294,13 +286,6 @@ namespace Crypto
         error:
             if (pBIO)
                 BIO_free(pBIO);
-            if (*ppKey)
-            {
-                if constexpr (std::is_same_v<K, EVP_PKEY>)
-                    EVP_PKEY_free(*ppKey);
-                else
-                    EC_KEY_free(*ppKey);
-            }
             throw OpenSSLException("EVPKey::loadKey(stream)");
         }
 

base/poco/Foundation/CMakeLists.txt

@@ -213,7 +213,6 @@ target_compile_definitions (_poco_foundation
 )
 
 target_include_directories (_poco_foundation SYSTEM PUBLIC "include")
-target_link_libraries (_poco_foundation PRIVATE clickhouse_common_io)
 
 target_link_libraries (_poco_foundation
     PRIVATE

base/poco/Foundation/include/Poco/ErrorHandler.h

@@ -21,7 +21,6 @@
 #include "Poco/Exception.h"
 #include "Poco/Foundation.h"
 #include "Poco/Mutex.h"
-#include "Poco/Message.h"
 
 
 namespace Poco
@@ -79,10 +78,6 @@ public:
     ///
     /// The default implementation just breaks into the debugger.
 
-    virtual void logMessageImpl(Message::Priority priority, const std::string & msg) {}
-    /// Write a messages to the log
-    /// Useful for logging from Poco
-
     static void handle(const Exception & exc);
     /// Invokes the currently registered ErrorHandler.
 
@@ -92,9 +87,6 @@ public:
     static void handle();
     /// Invokes the currently registered ErrorHandler.
 
-    static void logMessage(Message::Priority priority, const std::string & msg);
-    /// Invokes the currently registered ErrorHandler to log a message.
-
     static ErrorHandler * set(ErrorHandler * pHandler);
     /// Registers the given handler as the current error handler.
     ///

base/poco/Foundation/include/Poco/Format.h

@@ -232,7 +232,7 @@ void Foundation_API format(
     const Any & value10);
 
 
-void Foundation_API formatVector(std::string & result, const std::string & fmt, const std::vector<Any> & values);
+void Foundation_API format(std::string & result, const std::string & fmt, const std::vector<Any> & values);
 /// Supports a variable number of arguments and is used by
 /// all other variants of format().
 

base/poco/Foundation/include/Poco/Logger.h

@@ -21,8 +21,6 @@
 #include <atomic>
 #include <cstddef>
 #include <map>
-#include <memory>
-#include <unordered_map>
 #include <vector>
 
 #include "Poco/Channel.h"
@@ -952,8 +950,6 @@ private:
     static std::pair<LoggerMapIterator, bool> add(Logger * pLogger);
     static std::optional<LoggerMapIterator> find(const std::string & name);
     static Logger * findRawPtr(const std::string & name);
-    void unsafeSetChannel(Channel * pChannel);
-    Channel* unsafeGetChannel() const;
 
     Logger();
     Logger(const Logger &);

base/poco/Foundation/include/Poco/Message.h

@@ -19,7 +19,6 @@
 
 
 #include <map>
-#include <vector>
 #include "Poco/Foundation.h"
 #include "Poco/Timestamp.h"
 
@@ -67,11 +66,9 @@ public:
     /// The thread and process ids are set.
 
     Message(
-        const std::string & source, const std::string & text, Priority prio, const char * file, int line,
-        std::string_view fmt_str = {}, const std::vector<std::string> & fmt_str_args = {});
+        const std::string & source, const std::string & text, Priority prio, const char * file, int line, std::string_view fmt_str = {});
     Message(
-        std::string && source, std::string && text, Priority prio, const char * file, int line,
-        std::string_view fmt_str, std::vector<std::string> && fmt_str_args);
+        std::string && source, std::string && text, Priority prio, const char * file, int line, std::string_view fmt_str);
     /// Creates a Message with the given source, text, priority,
     /// source file path and line.
     ///
@@ -164,9 +161,6 @@ public:
     std::string_view getFormatString() const;
     void setFormatString(std::string_view fmt_str);
 
-    const std::vector<std::string> & getFormatStringArgs() const;
-    void setFormatStringArgs(const std::vector<std::string> & fmt_str_args);
-
     int getSourceLine() const;
     /// Returns the source file line of the statement
     /// generating the log message. May be 0
@@ -216,7 +210,6 @@ private:
     int _line;
     StringMap * _pMap;
     std::string_view _fmt_str;
-    std::vector<std::string> _fmt_str_args;
 };
 
 

base/poco/Foundation/include/Poco/Platform.h

@@ -120,7 +120,6 @@
 #define POCO_ARCH_AARCH64 0x0f
 #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64
 #define POCO_ARCH_RISCV64 0x10
-#define POCO_ARCH_LOONGARCH64 0x12
 
 
 #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
@@ -210,9 +209,6 @@
 #elif defined(__riscv) && (__riscv_xlen == 64)
 #    define POCO_ARCH POCO_ARCH_RISCV64
 #    define POCO_ARCH_LITTLE_ENDIAN 1
-#elif defined(__loongarch64)
-#    define POCO_ARCH POCO_ARCH_LOONGARCH64
-#    define POCO_ARCH_LITTLE_ENDIAN 1
 #endif
 
 

base/poco/Foundation/include/Poco/RefCountedObject.h

@@ -21,8 +21,6 @@
 #include "Poco/AtomicCounter.h"
 #include "Poco/Foundation.h"
 
-#include <atomic>
-
 
 namespace Poco
 {

base/poco/Foundation/include/Poco/ThreadPool.h

@@ -48,13 +48,7 @@ class Foundation_API ThreadPool
 /// from the pool.
 {
 public:
-    explicit ThreadPool(
-        int minCapacity = 2,
-        int maxCapacity = 16,
-        int idleTime = 60,
-        int stackSize = POCO_THREAD_STACK_SIZE,
-        size_t global_profiler_real_time_period_ns_ = 0,
-        size_t global_profiler_cpu_time_period_ns_ = 0);
+    ThreadPool(int minCapacity = 2, int maxCapacity = 16, int idleTime = 60, int stackSize = POCO_THREAD_STACK_SIZE);
     /// Creates a thread pool with minCapacity threads.
     /// If required, up to maxCapacity threads are created
     /// a NoThreadAvailableException exception is thrown.
@@ -62,14 +56,8 @@ public:
     /// and more than minCapacity threads are running, the thread
     /// is killed. Threads are created with given stack size.
 
-    explicit ThreadPool(
-        const std::string & name,
-        int minCapacity = 2,
-        int maxCapacity = 16,
-        int idleTime = 60,
-        int stackSize = POCO_THREAD_STACK_SIZE,
-        size_t global_profiler_real_time_period_ns_ = 0,
-        size_t global_profiler_cpu_time_period_ns_ = 0);
+    ThreadPool(
+        const std::string & name, int minCapacity = 2, int maxCapacity = 16, int idleTime = 60, int stackSize = POCO_THREAD_STACK_SIZE);
     /// Creates a thread pool with the given name and minCapacity threads.
     /// If required, up to maxCapacity threads are created
     /// a NoThreadAvailableException exception is thrown.
@@ -183,8 +171,6 @@ private:
     int _serial;
     int _age;
     int _stackSize;
-    size_t _globalProfilerRealTimePeriodNs;
-    size_t _globalProfilerCPUTimePeriodNs;
     ThreadVec _threads;
     mutable FastMutex _mutex;
 };

base/poco/Foundation/include/Poco/UUID.h

@@ -19,7 +19,6 @@
 
 
 #include "Poco/Foundation.h"
-#include <Poco/Types.h>
 
 
 namespace Poco
@@ -136,12 +135,6 @@ public:
     static const UUID & x500();
     /// Returns the namespace identifier for the X500 namespace.
 
-    UInt32 getTimeLow() const { return _timeLow; }
-    UInt16 getTimeMid() const { return _timeMid; }
-    UInt16 getTimeHiAndVersion() const { return _timeHiAndVersion; }
-    UInt16 getClockSeq() const { return _clockSeq; }
-    std::array<UInt8, 6> getNode() const { return std::array<UInt8, 6>{_node[0], _node[1], _node[2], _node[3], _node[4], _node[5]}; }
-
 protected:
     UUID(UInt32 timeLow, UInt32 timeMid, UInt32 timeHiAndVersion, UInt16 clockSeq, UInt8 node[]);
     UUID(const char * bytes, Version version);