Merge branch 'master' into hanfei/sqllogic

.github/actions/common_setup/action.yml

@@ -19,6 +19,8 @@ runs:
           cat >> "$GITHUB_ENV" << 'EOF'
           TEMP_PATH=${{runner.temp}}/${{inputs.job_type}}
           REPO_COPY=${{runner.temp}}/${{inputs.job_type}}/git-repo-copy
+          IMAGES_PATH=${{runner.temp}}/images_path
+          REPORTS_PATH=${{runner.temp}}/reports_dir
           EOF
           if [ -z "${{env.GITHUB_JOB_OVERRIDDEN}}" ] && [ "true" == "${{inputs.nested_job}}" ]; then
             echo "The GITHUB_JOB_OVERRIDDEN ENV is unset, and must be set for the nested jobs"

.github/workflows/backport_branches.yml

@@ -105,66 +105,22 @@ jobs:
           path: ${{ runner.temp }}/changed_images.json
   CompatibilityCheckX86:
     needs: [BuilderDebRelease]
-    runs-on: [self-hosted, style-checker]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Compatibility check X86
-        run: |
+      runner_type: style-checker
-          cat >> "$GITHUB_ENV" << 'EOF'
+      run_command: |
-          TEMP_PATH=${{runner.temp}}/compatibility_check
+        cd "$REPO_COPY/tests/ci"
-          REPO_COPY=${{runner.temp}}/compatibility_check/ClickHouse
+        python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
-          REPORTS_PATH=${{runner.temp}}/reports_dir
-          EOF
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: CompatibilityCheckX86
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
-      - 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"
   CompatibilityCheckAarch64:
     needs: [BuilderDebAarch64]
-    runs-on: [self-hosted, style-checker]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Compatibility check X86
-        run: |
+      runner_type: style-checker
-          cat >> "$GITHUB_ENV" << 'EOF'
+      run_command: |
-          TEMP_PATH=${{runner.temp}}/compatibility_check
+        cd "$REPO_COPY/tests/ci"
-          REPO_COPY=${{runner.temp}}/compatibility_check/ClickHouse
+        python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
-          REPORTS_PATH=${{runner.temp}}/reports_dir
-          EOF
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: CompatibilityCheckAarch64
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
-      - 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"
 #########################################################################################
 #################################### ORDINARY BUILDS ####################################
 #########################################################################################
@@ -239,303 +195,114 @@ jobs:
 ##################################### BUILD REPORTER #######################################
 ############################################################################################
   BuilderReport:
+    if: ${{ success() || failure() }}
     needs:
       - BuilderDebRelease
       - BuilderDebAarch64
       - BuilderDebAsan
       - BuilderDebTsan
       - BuilderDebDebug
-    runs-on: [self-hosted, style-checker]
+    uses: ./.github/workflows/reusable_test.yml
-    if: ${{ success() || failure() }}
+    with:
-    steps:
+      test_name: ClickHouse build check
-      - name: Set envs
+      runner_type: style-checker
-        run: |
+      additional_envs: |
-          cat >> "$GITHUB_ENV" << 'EOF'
+        NEEDS_DATA<<NDENV
-          CHECK_NAME=ClickHouse build check
+        ${{ toJSON(needs) }}
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+        NDENV
-          TEMP_PATH=${{runner.temp}}/report_check
+      run_command: |
-          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
+        cd "$GITHUB_WORKSPACE/tests/ci"
-          EOF
+        python3 build_report_check.py "$CHECK_NAME"
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Report Builder
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cat > "$NEEDS_DATA_PATH" << 'EOF'
-          ${{ toJSON(needs) }}
-          EOF
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME"
-      - 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"
   BuilderSpecialReport:
+    if: ${{ success() || failure() }}
     needs:
       - BuilderBinDarwin
       - BuilderBinDarwinAarch64
-    runs-on: [self-hosted, style-checker]
+    uses: ./.github/workflows/reusable_test.yml
-    if: ${{ success() || failure() }}
+    with:
-    steps:
+      test_name: ClickHouse special build check
-      - name: Set envs
+      runner_type: style-checker
-        run: |
+      additional_envs: |
-          cat >> "$GITHUB_ENV" << 'EOF'
+        NEEDS_DATA<<NDENV
-          TEMP_PATH=${{runner.temp}}/report_check
+        ${{ toJSON(needs) }}
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+        NDENV
-          CHECK_NAME=ClickHouse special build check
+      run_command: |
-          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
+        cd "$GITHUB_WORKSPACE/tests/ci"
-          EOF
+        python3 build_report_check.py "$CHECK_NAME"
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Report Builder
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cat > "$NEEDS_DATA_PATH" << 'EOF'
-          ${{ toJSON(needs) }}
-          EOF
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME"
-      - 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"
 ############################################################################################
 #################################### INSTALL PACKAGES ######################################
 ############################################################################################
   InstallPackagesTestRelease:
     needs: [BuilderDebRelease]
-    runs-on: [self-hosted, style-checker]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Install packages (amd64)
-        run: |
+      runner_type: style-checker
-          cat >> "$GITHUB_ENV" << 'EOF'
+      run_command: |
-          TEMP_PATH=${{runner.temp}}/test_install
+        cd "$REPO_COPY/tests/ci"
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+        python3 install_check.py "$CHECK_NAME"
-          CHECK_NAME=Install packages (amd64)
-          REPO_COPY=${{runner.temp}}/test_install/ClickHouse
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Test packages installation
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 install_check.py "$CHECK_NAME"
-      - 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"
   InstallPackagesTestAarch64:
     needs: [BuilderDebAarch64]
-    runs-on: [self-hosted, style-checker-aarch64]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Install packages (arm64)
-        run: |
+      runner_type: style-checker-aarch64
-          cat >> "$GITHUB_ENV" << 'EOF'
+      run_command: |
-          TEMP_PATH=${{runner.temp}}/test_install
+        cd "$REPO_COPY/tests/ci"
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+        python3 install_check.py "$CHECK_NAME"
-          CHECK_NAME=Install packages (arm64)
-          REPO_COPY=${{runner.temp}}/test_install/ClickHouse
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Test packages installation
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 install_check.py "$CHECK_NAME"
-      - 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"
 ##############################################################################################
 ########################### FUNCTIONAl STATELESS TESTS #######################################
 ##############################################################################################
   FunctionalStatelessTestAsan:
     needs: [BuilderDebAsan]
-    runs-on: [self-hosted, func-tester]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Stateless tests (asan)
-        run: |
+      runner_type: func-tester
-          cat >> "$GITHUB_ENV" << 'EOF'
+      additional_envs: |
-          TEMP_PATH=${{runner.temp}}/stateless_debug
+        KILL_TIMEOUT=10800
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+      run_command: |
-          CHECK_NAME=Stateless tests (asan)
+        cd "$REPO_COPY/tests/ci"
-          REPO_COPY=${{runner.temp}}/stateless_debug/ClickHouse
+        python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-          KILL_TIMEOUT=10800
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Functional test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-      - 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"
 ##############################################################################################
 ############################ FUNCTIONAl STATEFUL TESTS #######################################
 ##############################################################################################
   FunctionalStatefulTestDebug:
     needs: [BuilderDebDebug]
-    runs-on: [self-hosted, func-tester]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Stateful tests (debug)
-        run: |
+      runner_type: func-tester
-          cat >> "$GITHUB_ENV" << 'EOF'
+      additional_envs: |
-          TEMP_PATH=${{runner.temp}}/stateful_debug
+        KILL_TIMEOUT=3600
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+      run_command: |
-          CHECK_NAME=Stateful tests (debug)
+        cd "$REPO_COPY/tests/ci"
-          REPO_COPY=${{runner.temp}}/stateful_debug/ClickHouse
+        python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-          KILL_TIMEOUT=3600
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Functional test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-      - 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"
 ##############################################################################################
 ######################################### STRESS TESTS #######################################
 ##############################################################################################
   StressTestTsan:
     needs: [BuilderDebTsan]
-    # func testers have 16 cores + 128 GB memory
+    uses: ./.github/workflows/reusable_test.yml
-    # while stress testers have 36 cores + 72 memory
+    with:
-    # It would be better to have something like 32 + 128,
+      test_name: Stress test (tsan)
-    # but such servers almost unavailable as spot instances.
+      runner_type: stress-tester
-    runs-on: [self-hosted, func-tester]
+      run_command: |
-    steps:
+        cd "$REPO_COPY/tests/ci"
-      - name: Set envs
+        python3 stress_check.py "$CHECK_NAME"
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/stress_thread
-          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Stress test (tsan)
-          REPO_COPY=${{runner.temp}}/stress_thread/ClickHouse
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Stress test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 stress_check.py "$CHECK_NAME"
-      - 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"
 #############################################################################################
 ############################# INTEGRATION TESTS #############################################
 #############################################################################################
   IntegrationTestsRelease:
     needs: [BuilderDebRelease]
-    runs-on: [self-hosted, stress-tester]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Integration tests (release)
-        run: |
+      runner_type: stress-tester
-          cat >> "$GITHUB_ENV" << 'EOF'
+      batches: 4
-          TEMP_PATH=${{runner.temp}}/integration_tests_release
+      run_command: |
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+        cd "$REPO_COPY/tests/ci"
-          CHECK_NAME=Integration tests (release)
+        python3 integration_test_check.py "$CHECK_NAME"
-          REPO_COPY=${{runner.temp}}/integration_tests_release/ClickHouse
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Integration test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 integration_test_check.py "$CHECK_NAME"
-      - 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"
   FinishCheck:
     needs:
       - DockerHubPush

.github/workflows/docs_check.yml

@@ -96,68 +96,30 @@ jobs:
           path: ${{ runner.temp }}/changed_images.json
   StyleCheck:
     needs: DockerHubPush
-    runs-on: [self-hosted, style-checker]
+    # We need additional `&& ! cancelled()` to have the job being able to cancel
-    if: ${{ success() || failure() }}
+    if: ${{ success() || failure() || ( always() && ! cancelled() ) }}
-    steps:
+    uses: ./.github/workflows/reusable_test.yml
-      - name: Set envs
+    with:
-        run: |
+      test_name: Style check
-          cat >> "$GITHUB_ENV" << 'EOF'
+      runner_type: style-checker
-          TEMP_PATH=${{ runner.temp }}/style_check
+      run_command: |
-          ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
+          cd "$REPO_COPY/tests/ci"
-          ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
-          RCSK
-          EOF
-      - name: Download changed images
-        # even if artifact does not exist, e.g. on `do not test` label or failed Docker job
-        continue-on-error: true
-        uses: actions/download-artifact@v3
-        with:
-          name: changed_images
-          path: ${{ env.TEMP_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Style Check
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
           python3 style_check.py
-      - name: Cleanup
+    secrets:
-        if: always()
+      secret_envs: |
-        run: |
+        ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
-          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+        ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
-          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+        RCSK
-          sudo rm -fr "$TEMP_PATH"
   DocsCheck:
     needs: DockerHubPush
-    runs-on: [self-hosted, func-tester-aarch64]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Docs check
-        run: |
+      runner_type: func-tester-aarch64
-          cat >> "$GITHUB_ENV" << 'EOF'
+      additional_envs: |
-          TEMP_PATH=${{runner.temp}}/docs_check
+      run_command: |
-          REPO_COPY=${{runner.temp}}/docs_check/ClickHouse
+        cd "$REPO_COPY/tests/ci"
-          EOF
+        python3 docs_check.py
-      - name: Download changed images
-        uses: actions/download-artifact@v3
-        with:
-          name: changed_images
-          path: ${{ env.TEMP_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: Docs Check
-        run: |
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 docs_check.py
-      - 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"
   FinishCheck:
     needs:
       - StyleCheck

.github/workflows/jepsen.yml

@@ -11,60 +11,19 @@ on: # yamllint disable-line rule:truthy
   workflow_call:
 jobs:
   KeeperJepsenRelease:
-    runs-on: [self-hosted, style-checker]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: Jepsen keeper check
-        run: |
+      runner_type: style-checker
-          cat >> "$GITHUB_ENV" << 'EOF'
+      run_command: |
-          TEMP_PATH=${{runner.temp}}/keeper_jepsen
+        cd "$REPO_COPY/tests/ci"
-          REPO_COPY=${{runner.temp}}/keeper_jepsen/ClickHouse
+        python3 jepsen_check.py keeper
-          EOF
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-          fetch-depth: 0
-          filter: tree:0
-      - name: Jepsen Test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 jepsen_check.py keeper
-      - 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"
   # ServerJepsenRelease:
   #   runs-on: [self-hosted, style-checker]
-  #   if: ${{ always() }}
+  #   uses: ./.github/workflows/reusable_test.yml
-  #   needs: [KeeperJepsenRelease]
+  #   with:
-  #   steps:
+  #     test_name: Jepsen server check
-  #     - name: Set envs
+  #     runner_type: style-checker
-  #       run: |
+  #     run_command: |
-  #         cat >> "$GITHUB_ENV" << 'EOF'
+  #       cd "$REPO_COPY/tests/ci"
-  #         TEMP_PATH=${{runner.temp}}/server_jepsen
+  #       python3 jepsen_check.py server
-  #         REPO_COPY=${{runner.temp}}/server_jepsen/ClickHouse
-  #         EOF
-  #     - name: Check out repository code
-  #       uses: ClickHouse/checkout@v1
-  #       with:
-  #         clear-repository: true
-  #         fetch-depth: 0
-  #         filter: tree:0
-  #     - name: Jepsen Test
-  #       run: |
-  #         sudo rm -fr "$TEMP_PATH"
-  #         mkdir -p "$TEMP_PATH"
-  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-  #         cd "$REPO_COPY/tests/ci"
-  #         python3 jepsen_check.py server
-  #     - 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/libfuzzer.yml

@@ -10,86 +10,17 @@ on: # yamllint disable-line rule:truthy
   workflow_call:
 jobs:
   BuilderFuzzers:
-    runs-on: [self-hosted, builder]
+    uses: ./.github/workflows/reusable_build.yml
-    steps:
+    with:
-      - name: Set envs
+      build_name: fuzzers
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/build_check
-          IMAGES_PATH=${{runner.temp}}/images_path
-          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
-          CACHES_PATH=${{runner.temp}}/../ccaches
-          BUILD_NAME=fuzzers
-          EOF
-      - name: Download changed images
-        # even if artifact does not exist, e.g. on `do not test` label or failed Docker job
-        continue-on-error: true
-        uses: actions/download-artifact@v3
-        with:
-          name: changed_images
-          path: ${{ env.IMAGES_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-          submodules: true
-          ref: ${{github.ref}}
-      - name: Build
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
-      - name: Upload build URLs to artifacts
-        if: ${{ success() || failure() }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
-      - 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" "$CACHES_PATH"
   libFuzzerTest:
     needs: [BuilderFuzzers]
-    runs-on: [self-hosted, func-tester]
+    uses: ./.github/workflows/reusable_test.yml
-    steps:
+    with:
-      - name: Set envs
+      test_name: libFuzzer tests
-        run: |
+      runner_type: func-tester
-          cat >> "$GITHUB_ENV" << 'EOF'
+      additional_envs: |
-          TEMP_PATH=${{runner.temp}}/libfuzzer
+        KILL_TIMEOUT=10800
-          REPORTS_PATH=${{runner.temp}}/reports_dir
+      run_command: |
-          CHECK_NAME=libFuzzer tests
+        cd "$REPO_COPY/tests/ci"
-          REPO_COPY=${{runner.temp}}/libfuzzer/ClickHouse
+        python3 libfuzzer_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-          KILL_TIMEOUT=10800
-          EOF
-      - name: Download changed images
-        # even if artifact does not exist, e.g. on `do not test` label or failed Docker job
-        continue-on-error: true
-        uses: actions/download-artifact@v3
-        with:
-          name: changed_images
-          path: ${{ env.TEMP_PATH }}
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-      - name: libFuzzer test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 libfuzzer_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-      - 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/nightly.yml

@@ -74,9 +74,6 @@ jobs:
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
-  Codebrowser:
-    needs: [DockerHubPush]
-    uses: ./.github/workflows/woboq.yml
   SonarCloud:
     runs-on: [self-hosted, builder]
     env:

.github/workflows/reusable_build.yml

@@ -1,6 +1,10 @@
 ### For the pure soul wishes to move it to another place
 # https://github.com/orgs/community/discussions/9050
 
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
 name: Build ClickHouse
 'on':
   workflow_call:
@@ -25,6 +29,8 @@ name: Build ClickHouse
 jobs:
   Build:
     name: Build-${{inputs.build_name}}
+    env:
+      GITHUB_JOB_OVERRIDDEN: Build-${{inputs.build_name}}
     runs-on: [self-hosted, '${{inputs.runner_type}}']
     steps:
       - name: Check out repository code
@@ -37,8 +43,6 @@ jobs:
       - name: Set build envs
         run: |
           cat >> "$GITHUB_ENV" << 'EOF'
-          IMAGES_PATH=${{runner.temp}}/images_path
-          GITHUB_JOB_OVERRIDDEN=Build-${{inputs.build_name}}
           ${{inputs.additional_envs}}
           EOF
           python3 "$GITHUB_WORKSPACE"/tests/ci/ci_config.py --build-name "${{inputs.build_name}}" >> "$GITHUB_ENV"
@@ -71,4 +75,5 @@ jobs:
           name: ${{ env.BUILD_URLS }}
           path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
       - name: Clean
+        if: always()
         uses: ./.github/actions/clean

.github/workflows/reusable_test.yml

@@ -0,0 +1,113 @@
+### For the pure soul wishes to move it to another place
+# https://github.com/orgs/community/discussions/9050
+
+name: Testing workflow
+'on':
+  workflow_call:
+    inputs:
+      test_name:
+        description: the value of test type from tests/ci/ci_config.py, ends up as $CHECK_NAME ENV
+        required: true
+        type: string
+      runner_type:
+        description: the label of runner to use
+        required: true
+        type: string
+      run_command:
+        description: the command to launch the check. Usually starts with `cd '$REPO_COPY/tests/ci'`
+        required: true
+        type: string
+      batches:
+        description: how many batches for the test will be launched
+        default: 1
+        type: number
+      checkout_depth:
+        description: the value of the git shallow checkout
+        required: false
+        type: number
+        default: 1
+      submodules:
+        description: if the submodules should be checked out
+        required: false
+        type: boolean
+        default: false
+      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
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+  CHECK_NAME: ${{inputs.test_name}}
+
+jobs:
+  PrepareStrategy:
+    # batches < 1 is misconfiguration,
+    # and we need this step only for batches > 1
+    if: ${{ inputs.batches > 1 }}
+    runs-on: [self-hosted, style-checker-aarch64]
+    outputs:
+      batches: ${{steps.batches.outputs.batches}}
+    steps:
+      - name: Calculate batches
+        id: batches
+        run: |
+          batches_output=$(python3 -c 'import json; print(json.dumps(list(range(${{inputs.batches}}))))')
+          echo "batches=${batches_output}" >> "$GITHUB_OUTPUT"
+  Test:
+    # If PrepareStrategy is skipped for batches == 1,
+    # we still need to launch the test.
+    # `! failure()` is mandatory here to launch on skipped Job
+    # `&& !cancelled()` to allow the be cancelable
+    if: ${{ ( !failure() && !cancelled() ) && inputs.batches > 0 }}
+    # Do not add `-0` to the end, if there's only one batch
+    name: ${{inputs.test_name}}${{ inputs.batches > 1 && format('-{0}',matrix.batch) || '' }}
+    env:
+      GITHUB_JOB_OVERRIDDEN: ${{inputs.test_name}}${{ inputs.batches > 1 && format('-{0}',matrix.batch) || '' }}
+    runs-on: [self-hosted, '${{inputs.runner_type}}']
+    needs: [PrepareStrategy]
+    strategy:
+      fail-fast: false  # we always wait for entire matrix
+      matrix:
+        # if PrepareStrategy does not have batches, we use 0
+        batch: ${{ needs.PrepareStrategy.outputs.batches
+          && fromJson(needs.PrepareStrategy.outputs.batches)
+          || fromJson('[0]')}}
+    steps:
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          clear-repository: true
+          submodules: ${{inputs.submodules}}
+          fetch-depth: ${{inputs.checkout_depth}}
+          filter: tree:0
+      - name: Set build envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          ${{inputs.additional_envs}}
+          ${{secrets.secret_envs}}
+          EOF
+      - name: Common setup
+        uses: ./.github/actions/common_setup
+        with:
+          job_type: test
+      - name: Download json reports
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Setup batch
+        if: ${{ inputs.batches > 1}}
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          RUN_BY_HASH_NUM=${{matrix.batch}}
+          RUN_BY_HASH_TOTAL=${{inputs.batches}}
+          EOF
+      - name: Run test
+        run: ${{inputs.run_command}}
+      - name: Clean
+        if: always()
+        uses: ./.github/actions/clean

.github/workflows/woboq.yml

@@ -1,44 +0,0 @@
-name: WoboqBuilder
-env:
-  # Force the stdout and stderr streams to be unbuffered
-  PYTHONUNBUFFERED: 1
-
-concurrency:
-  group: woboq
-on: # yamllint disable-line rule:truthy
-  workflow_dispatch:
-  workflow_call:
-jobs:
-  # don't use dockerhub push because this image updates so rarely
-  WoboqCodebrowser:
-    runs-on: [self-hosted, style-checker]
-    timeout-minutes: 420  # the task is pretty heavy, so there's an additional hour
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/codebrowser
-          REPO_COPY=${{runner.temp}}/codebrowser/ClickHouse
-          IMAGES_PATH=${{runner.temp}}/images_path
-          EOF
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-          submodules: 'true'
-      - name: Download json reports
-        uses: actions/download-artifact@v3
-        with:
-          path: ${{ env.IMAGES_PATH }}
-      - name: Codebrowser
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 codebrowser_check.py
-      - 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"

.gitmodules

@@ -354,3 +354,6 @@
 [submodule "contrib/aklomp-base64"]
 	path = contrib/aklomp-base64
 	url = https://github.com/aklomp/base64.git
+[submodule "contrib/pocketfft"]
+	path = contrib/pocketfft
+	url = https://github.com/mreineck/pocketfft.git

CMakeLists.txt

@@ -21,8 +21,11 @@ include (cmake/clang_tidy.cmake)
 include (cmake/git.cmake)
 include (cmake/utils.cmake)
 
+# This is needed to set up the CMAKE_INSTALL_BINDIR variable.
+include (GNUInstallDirs)
+
 # Ignore export() since we don't use it,
-# but it gets broken with a global targets via link_libraries()
+# but it gets broken with global targets via link_libraries()
 macro (export)
 endmacro ()
 
@@ -164,7 +167,7 @@ if (OS_LINUX)
     #   and whatever is poisoning it by LD_PRELOAD should not link to our symbols.
     # - The clickhouse-odbc-bridge and clickhouse-library-bridge binaries
     #   should not expose their symbols to ODBC drivers and libraries.
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic")
+    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic -Wl,--gc-sections")
 endif ()
 
 if (OS_DARWIN)
@@ -187,9 +190,10 @@ if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
     endif ()
 endif()
 
-if (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE"
+if (NOT (SANITIZE_COVERAGE OR WITH_COVERAGE)
-    OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
+    AND (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE"
-    OR CMAKE_BUILD_TYPE_UC STREQUAL "MINSIZEREL")
+        OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
+        OR CMAKE_BUILD_TYPE_UC STREQUAL "MINSIZEREL"))
     set (OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT ON)
 else()
     set (OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT OFF)
@@ -273,6 +277,11 @@ option (ENABLE_BUILD_PROFILING "Enable profiling of build time" OFF)
 if (ENABLE_BUILD_PROFILING)
      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 ()
      else ()
         message (${RECONFIGURE_MESSAGE_LEVEL} "Build profiling is only available with CLang")
      endif ()
@@ -286,9 +295,6 @@ set (CMAKE_C_STANDARD 11)
 set (CMAKE_C_EXTENSIONS ON) # required by most contribs written in C
 set (CMAKE_C_STANDARD_REQUIRED ON)
 
-# Compiler-specific coverage flags e.g. -fcoverage-mapping
-option(WITH_COVERAGE "Profile the resulting binary/binaries" OFF)
-
 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
@@ -304,18 +310,12 @@ if (COMPILER_CLANG)
         set(BRANCHES_WITHIN_32B_BOUNDARIES "-mbranches-within-32B-boundaries")
         set(COMPILER_FLAGS "${COMPILER_FLAGS} ${BRANCHES_WITHIN_32B_BOUNDARIES}")
     endif()
-
-    if (WITH_COVERAGE)
-        set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
-        # If we want to disable coverage for specific translation units
-        set(WITHOUT_COVERAGE "-fno-profile-instr-generate -fno-coverage-mapping")
-    endif()
 endif ()
 
 set (COMPILER_FLAGS "${COMPILER_FLAGS}")
 
 # Our built-in unwinder only supports DWARF version up to 4.
-set (DEBUG_INFO_FLAGS "-g -gdwarf-4")
+set (DEBUG_INFO_FLAGS "-g")
 
 # Disable omit frame pointer compiler optimization using -fno-omit-frame-pointer
 option(DISABLE_OMIT_FRAME_POINTER "Disable omit frame pointer compiler optimization" OFF)
@@ -463,14 +463,6 @@ endif ()
 
 message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE}")
 
-include (GNUInstallDirs)
-
-# When testing for memory leaks with Valgrind, don't link tcmalloc or jemalloc.
-
-if (TARGET global-group)
-    install (EXPORT global DESTINATION cmake)
-endif ()
-
 add_subdirectory (contrib EXCLUDE_FROM_ALL)
 
 if (NOT ENABLE_JEMALLOC)
@@ -554,10 +546,16 @@ if (ENABLE_RUST)
     endif()
 endif()
 
+if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO" AND NOT SANITIZE AND OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64))
+    set(CHECK_LARGE_OBJECT_SIZES_DEFAULT ON)
+else ()
+    set(CHECK_LARGE_OBJECT_SIZES_DEFAULT OFF)
+endif ()
+option(CHECK_LARGE_OBJECT_SIZES "Check that there are no large object files after build." ${CHECK_LARGE_OBJECT_SIZES_DEFAULT})
+
 add_subdirectory (base)
 add_subdirectory (src)
 add_subdirectory (programs)
-add_subdirectory (tests)
 add_subdirectory (utils)
 
 if (FUZZER)

base/base/CMakeLists.txt

@@ -1,3 +1,5 @@
+add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>)
+
 if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
 endif ()

base/base/coverage.cpp

@@ -1,11 +1,15 @@
 #include "coverage.h"
 
-#if WITH_COVERAGE
-
 #pragma GCC diagnostic ignored "-Wreserved-identifier"
 
-#    include <mutex>
+
-#    include <unistd.h>
+/// WITH_COVERAGE enables the default implementation of code coverage,
+/// that dumps a map to the filesystem.
+
+#if WITH_COVERAGE
+
+#include <mutex>
+#include <unistd.h>
 
 
 #    if defined(__clang__)
@@ -31,3 +35,131 @@ void dumpCoverageReportIfPossible()
 
 #endif
 }
+
+
+/// SANITIZE_COVERAGE enables code instrumentation,
+/// but leaves the callbacks implementation to us,
+/// which we use to calculate coverage on a per-test basis
+/// and to write it to system tables.
+
+#if defined(SANITIZE_COVERAGE)
+
+namespace
+{
+    bool pc_guards_initialized = false;
+    bool pc_table_initialized = false;
+
+    uint32_t * guards_start = nullptr;
+    uint32_t * guards_end = nullptr;
+
+    uintptr_t * coverage_array = nullptr;
+    size_t coverage_array_size = 0;
+
+    uintptr_t * all_addresses_array = nullptr;
+    size_t all_addresses_array_size = 0;
+}
+
+extern "C"
+{
+
+/// This is called at least once for every DSO for initialization.
+/// But we will use it only for the main DSO.
+void __sanitizer_cov_trace_pc_guard_init(uint32_t * start, uint32_t * stop)
+{
+    if (pc_guards_initialized)
+        return;
+    pc_guards_initialized = true;
+
+    /// The function can be called multiple times, but we need to initialize only once.
+    if (start == stop || *start)
+        return;
+
+    guards_start = start;
+    guards_end = stop;
+    coverage_array_size = stop - start;
+
+    /// Note: we will leak this.
+    coverage_array = static_cast<uintptr_t*>(malloc(sizeof(uintptr_t) * coverage_array_size));
+
+    resetCoverage();
+}
+
+/// This is called at least once for every DSO for initialization
+/// and provides information about all instrumented addresses.
+void __sanitizer_cov_pcs_init(const uintptr_t * pcs_begin, const uintptr_t * pcs_end)
+{
+    if (pc_table_initialized)
+        return;
+    pc_table_initialized = true;
+
+    all_addresses_array = static_cast<uintptr_t*>(malloc(sizeof(uintptr_t) * coverage_array_size));
+    all_addresses_array_size = pcs_end - pcs_begin;
+
+    /// They are not a real pointers, but also contain a flag in the most significant bit,
+    /// in which we are not interested for now. Reset it.
+    for (size_t i = 0; i < all_addresses_array_size; ++i)
+        all_addresses_array[i] = pcs_begin[i] & 0x7FFFFFFFFFFFFFFFULL;
+}
+
+/// This is called at every basic block / edge, etc.
+void __sanitizer_cov_trace_pc_guard(uint32_t * guard)
+{
+    /// Duplicate the guard check.
+    if (!*guard)
+        return;
+    *guard = 0;
+
+    /// If you set *guard to 0 this code will not be called again for this edge.
+    /// Now we can get the PC and do whatever you want:
+    /// - store it somewhere or symbolize it and print right away.
+    /// The values of `*guard` are as you set them in
+    /// __sanitizer_cov_trace_pc_guard_init and so you can make them consecutive
+    /// and use them to dereference an array or a bit vector.
+    void * pc = __builtin_return_address(0);
+
+    coverage_array[guard - guards_start] = reinterpret_cast<uintptr_t>(pc);
+}
+
+}
+
+__attribute__((no_sanitize("coverage")))
+std::span<const uintptr_t> getCoverage()
+{
+    return {coverage_array, coverage_array_size};
+}
+
+__attribute__((no_sanitize("coverage")))
+std::span<const uintptr_t> getAllInstrumentedAddresses()
+{
+    return {all_addresses_array, all_addresses_array_size};
+}
+
+__attribute__((no_sanitize("coverage")))
+void resetCoverage()
+{
+    memset(coverage_array, 0, coverage_array_size * sizeof(*coverage_array));
+
+    /// The guard defines whether the __sanitizer_cov_trace_pc_guard should be called.
+    /// For example, you can unset it after first invocation to prevent excessive work.
+    /// Initially set all the guards to 1 to enable callbacks.
+    for (uint32_t * x = guards_start; x < guards_end; ++x)
+        *x = 1;
+}
+
+#else
+
+std::span<const uintptr_t> getCoverage()
+{
+    return {};
+}
+
+std::span<const uintptr_t> getAllInstrumentedAddresses()
+{
+    return {};
+}
+
+void resetCoverage()
+{
+}
+
+#endif

base/base/coverage.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <span>
+#include <cstdint>
+
 /// Flush coverage report to file, depending on coverage system
 /// proposed by compiler (llvm for clang and gcov for gcc).
 ///
@@ -7,3 +10,16 @@
 /// Thread safe (use exclusive lock).
 /// Idempotent, may be called multiple times.
 void dumpCoverageReportIfPossible();
+
+/// This is effective if SANITIZE_COVERAGE is enabled at build time.
+/// Get accumulated unique program addresses of the instrumented parts of the code,
+/// seen so far after program startup or after previous reset.
+/// The returned span will be represented as a sparse map, containing mostly zeros, which you should filter away.
+std::span<const uintptr_t> getCoverage();
+
+/// Get all instrumented addresses that could be in the coverage.
+std::span<const uintptr_t> getAllInstrumentedAddresses();
+
+/// Reset the accumulated coverage.
+/// This is useful to compare coverage of different tests, including differential coverage.
+void resetCoverage();

base/base/wide_integer_impl.h

@@ -65,7 +65,7 @@ class IsTupleLike
     static void check(...);
 
 public:
-    static constexpr const bool value = !std::is_void<decltype(check<T>(nullptr))>::value;
+    static constexpr const bool value = !std::is_void_v<decltype(check<T>(nullptr))>;
 };
 
 }
@@ -79,7 +79,7 @@ class numeric_limits<wide::integer<Bits, Signed>>
 {
 public:
     static constexpr bool is_specialized = true;
-    static constexpr bool is_signed = is_same<Signed, signed>::value;
+    static constexpr bool is_signed = is_same_v<Signed, signed>;
     static constexpr bool is_integer = true;
     static constexpr bool is_exact = true;
     static constexpr bool has_infinity = false;
@@ -91,7 +91,7 @@ public:
     static constexpr bool is_iec559 = false;
     static constexpr bool is_bounded = true;
     static constexpr bool is_modulo = true;
-    static constexpr int digits = Bits - (is_same<Signed, signed>::value ? 1 : 0);
+    static constexpr int digits = Bits - (is_same_v<Signed, signed> ? 1 : 0);
     static constexpr int digits10 = digits * 0.30103 /*std::log10(2)*/;
     static constexpr int max_digits10 = 0;
     static constexpr int radix = 2;
@@ -104,7 +104,7 @@ public:
 
     static constexpr wide::integer<Bits, Signed> min() noexcept
     {
-        if (is_same<Signed, signed>::value)
+        if constexpr (is_same_v<Signed, signed>)
         {
             using T = wide::integer<Bits, signed>;
             T res{};
@@ -118,7 +118,7 @@ public:
     {
         using T = wide::integer<Bits, Signed>;
         T res{};
-        res.items[T::_impl::big(0)] = is_same<Signed, signed>::value
+        res.items[T::_impl::big(0)] = is_same_v<Signed, signed>
             ? std::numeric_limits<typename wide::integer<Bits, Signed>::signed_base_type>::max()
             : std::numeric_limits<typename wide::integer<Bits, Signed>::base_type>::max();
         for (unsigned i = 1; i < wide::integer<Bits, Signed>::_impl::item_count; ++i)

base/glibc-compatibility/CMakeLists.txt

@@ -5,9 +5,6 @@ if (GLIBC_COMPATIBILITY)
     endif()
 
     enable_language(ASM)
-    include(CheckIncludeFile)
-
-    check_include_file("sys/random.h" HAVE_SYS_RANDOM_H)
 
     add_headers_and_sources(glibc_compatibility .)
     add_headers_and_sources(glibc_compatibility musl)
@@ -21,11 +18,6 @@ if (GLIBC_COMPATIBILITY)
         message (FATAL_ERROR "glibc_compatibility can only be used on x86_64 or aarch64.")
     endif ()
 
-    list(REMOVE_ITEM glibc_compatibility_sources musl/getentropy.c)
-    if(HAVE_SYS_RANDOM_H)
-        list(APPEND glibc_compatibility_sources musl/getentropy.c)
-    endif()
-
     # Need to omit frame pointers to match the performance of glibc
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer")
 
@@ -43,12 +35,6 @@ if (GLIBC_COMPATIBILITY)
 
     target_link_libraries(global-libs INTERFACE glibc-compatibility ${MEMCPY_LIBRARY})
 
-    install(
-        TARGETS glibc-compatibility ${MEMCPY_LIBRARY}
-        EXPORT global
-        ARCHIVE DESTINATION lib
-    )
-
     message (STATUS "Some symbols from glibc will be replaced for compatibility")
 
 elseif (CLICKHOUSE_OFFICIAL_BUILD)

base/glibc-compatibility/memcpy/memcpy.cpp

@@ -1,5 +1,6 @@
 #include "memcpy.h"
 
+__attribute__((no_sanitize("coverage")))
 extern "C" void * memcpy(void * __restrict dst, const void * __restrict src, size_t size)
 {
     return inline_memcpy(dst, src, size);

base/glibc-compatibility/memcpy/memcpy.h

@@ -93,7 +93,7 @@
   * See https://habr.com/en/company/yandex/blog/457612/
   */
 
-
+__attribute__((no_sanitize("coverage")))
 static inline void * inline_memcpy(void * __restrict dst_, const void * __restrict src_, size_t size)
 {
     /// We will use pointer arithmetic, so char pointer will be used.

base/harmful/CMakeLists.txt

@@ -1,2 +1 @@
 add_library(harmful harmful.c)
-install(TARGETS harmful EXPORT global ARCHIVE DESTINATION lib)

base/poco/Net/src/HTTPServerSession.cpp

@@ -26,7 +26,6 @@ HTTPServerSession::HTTPServerSession(const StreamSocket& socket, HTTPServerParam
 	_maxKeepAliveRequests(pParams->getMaxKeepAliveRequests())
 {
 	setTimeout(pParams->getTimeout());
-	this->socket().setReceiveTimeout(pParams->getTimeout());
 }
 
 

base/poco/Net/src/HTTPSession.cpp

@@ -93,9 +93,34 @@ void HTTPSession::setTimeout(const Poco::Timespan& timeout)
 
 void HTTPSession::setTimeout(const Poco::Timespan& connectionTimeout, const Poco::Timespan& sendTimeout, const Poco::Timespan& receiveTimeout)
 {
-	 _connectionTimeout = connectionTimeout;
+     try
-	 _sendTimeout = sendTimeout;
+     {
-	 _receiveTimeout = receiveTimeout;
+         _connectionTimeout = connectionTimeout;
+
+         if (_sendTimeout.totalMicroseconds() != sendTimeout.totalMicroseconds()) {
+             _sendTimeout = sendTimeout;
+
+             if (connected())
+                 _socket.setSendTimeout(_sendTimeout);
+         }
+
+         if (_receiveTimeout.totalMicroseconds() != receiveTimeout.totalMicroseconds()) {
+             _receiveTimeout = receiveTimeout;
+
+             if (connected())
+                 _socket.setReceiveTimeout(_receiveTimeout);
+         }
+     }
+     catch (NetException &)
+     {
+#ifndef NDEBUG
+         throw;
+#else
+         // mute exceptions in release
+         // just in case when changing settings on socket is not allowed
+         // however it should be OK for timeouts
+#endif
+     }
 }
 
 

cmake/add_check.cmake

@@ -1,19 +0,0 @@
-# Adding test output on failure
-enable_testing ()
-
-if (NOT TARGET check)
-    if (CMAKE_CONFIGURATION_TYPES)
-        add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}
-            --force-new-ctest-process --output-on-failure --build-config "$<CONFIGURATION>"
-            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
-    else ()
-        add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}
-            --force-new-ctest-process --output-on-failure
-            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
-    endif ()
-endif ()
-
-macro (add_check target)
-    add_test (NAME test_${target} COMMAND ${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    add_dependencies (check ${target})
-endmacro (add_check)

cmake/ccache.cmake

@@ -9,10 +9,10 @@ if (CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" OR CMAKE_C_COMPILER_LAUNCHER MA
     return()
 endif()
 
-set(COMPILER_CACHE "auto" CACHE STRING "Speedup re-compilations using the caching tools; valid options are 'auto' (ccache, then sccache), 'ccache', 'sccache', or 'disabled'")
+set(COMPILER_CACHE "auto" CACHE STRING "Speedup re-compilations using the caching tools; valid options are 'auto' (sccache, then ccache), 'ccache', 'sccache', or 'disabled'")
 
 if(COMPILER_CACHE STREQUAL "auto")
-    find_program (CCACHE_EXECUTABLE NAMES ccache sccache)
+    find_program (CCACHE_EXECUTABLE NAMES sccache ccache)
 elseif (COMPILER_CACHE STREQUAL "ccache")
     find_program (CCACHE_EXECUTABLE ccache)
 elseif(COMPILER_CACHE STREQUAL "sccache")
@@ -21,7 +21,7 @@ elseif(COMPILER_CACHE STREQUAL "disabled")
     message(STATUS "Using *ccache: no (disabled via configuration)")
     return()
 else()
-    message(${RECONFIGURE_MESSAGE_LEVEL} "The COMPILER_CACHE must be one of (auto|ccache|sccache|disabled), value: '${COMPILER_CACHE}'")
+    message(${RECONFIGURE_MESSAGE_LEVEL} "The COMPILER_CACHE must be one of (auto|sccache|ccache|disabled), value: '${COMPILER_CACHE}'")
 endif()
 
 

cmake/cpu_features.cmake

@@ -1,10 +1,5 @@
 # https://software.intel.com/sites/landingpage/IntrinsicsGuide/
 
-include (CheckCXXSourceCompiles)
-include (CMakePushCheckState)
-
-cmake_push_check_state ()
-
 # The variables HAVE_* determine if compiler has support for the flag to use the corresponding instruction set.
 # The options ENABLE_* determine if we will tell compiler to actually use the corresponding instruction set if compiler can do it.
 
@@ -137,189 +132,54 @@ elseif (ARCH_AMD64)
     endif()
 
     # ClickHouse can be cross-compiled (e.g. on an ARM host for x86) but it is also possible to build ClickHouse on x86 w/o AVX for x86 w/
-    # AVX. We only check that the compiler can emit certain SIMD instructions, we don't care if the host system is able to run the binary.
+    # AVX. We only assume that the compiler can emit certain SIMD instructions, we don't care if the host system is able to run the binary.
-    # Therefore, use check_cxx_source_compiles (= does the code compile+link?) instead of check_cxx_source_runs (= does the code
-    # compile+link+run).
 
-    set (TEST_FLAG "-mssse3")
+    if (ENABLE_SSSE3)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mssse3")
-    check_cxx_source_compiles("
-        #include <tmmintrin.h>
-        int main() {
-            __m64 a = _mm_abs_pi8(__m64());
-            (void)a;
-            return 0;
-        }
-    " HAVE_SSSE3)
-    if (HAVE_SSSE3 AND ENABLE_SSSE3)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-msse4.1")
+    if (ENABLE_SSE41)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -msse4.1")
-    check_cxx_source_compiles("
-        #include <smmintrin.h>
-        int main() {
-            auto a = _mm_insert_epi8(__m128i(), 0, 0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_SSE41)
-    if (HAVE_SSE41 AND ENABLE_SSE41)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-msse4.2")
+    if (ENABLE_SSE42)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -msse4.2")
-    check_cxx_source_compiles("
-        #include <nmmintrin.h>
-        int main() {
-            auto a = _mm_crc32_u64(0, 0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_SSE42)
-    if (HAVE_SSE42 AND ENABLE_SSE42)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-mpclmul")
+    if (ENABLE_PCLMULQDQ)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mpclmul")
-    check_cxx_source_compiles("
-        #include <wmmintrin.h>
-        int main() {
-            auto a = _mm_clmulepi64_si128(__m128i(), __m128i(), 0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_PCLMULQDQ)
-    if (HAVE_PCLMULQDQ AND ENABLE_PCLMULQDQ)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-mpopcnt")
+    if (ENABLE_BMI)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mbmi")
-    check_cxx_source_compiles("
-        int main() {
-            auto a = __builtin_popcountll(0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_POPCNT)
-    if (HAVE_POPCNT AND ENABLE_POPCNT)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-mavx")
+    if (ENABLE_POPCNT)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mpopcnt")
-    check_cxx_source_compiles("
-        #include <immintrin.h>
-        int main() {
-            auto a = _mm256_insert_epi8(__m256i(), 0, 0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_AVX)
-    if (HAVE_AVX AND ENABLE_AVX)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-mavx2")
+    if (ENABLE_AVX)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx")
-    check_cxx_source_compiles("
-        #include <immintrin.h>
-        int main() {
-            auto a = _mm256_add_epi16(__m256i(), __m256i());
-            (void)a;
-            return 0;
-        }
-    " HAVE_AVX2)
-    if (HAVE_AVX2 AND ENABLE_AVX2)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
     endif ()
 
-    set (TEST_FLAG "-mavx512f -mavx512bw -mavx512vl")
+    if (ENABLE_AVX2)
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx2")
-    check_cxx_source_compiles("
+        if (ENABLE_BMI2)
-        #include <immintrin.h>
+            set (COMPILER_FLAGS "${COMPILER_FLAGS} -mbmi2")
-        int main() {
-            auto a = _mm512_setzero_epi32();
-            (void)a;
-            auto b = _mm512_add_epi16(__m512i(), __m512i());
-            (void)b;
-            auto c = _mm_cmp_epi8_mask(__m128i(), __m128i(), 0);
-            (void)c;
-            return 0;
-        }
-    " HAVE_AVX512)
-    if (HAVE_AVX512 AND ENABLE_AVX512)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
-    endif ()
-
-    set (TEST_FLAG "-mavx512vbmi")
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-    check_cxx_source_compiles("
-        #include <immintrin.h>
-        int main() {
-            auto a = _mm512_permutexvar_epi8(__m512i(), __m512i());
-            (void)a;
-            return 0;
-        }
-    " HAVE_AVX512_VBMI)
-    if (HAVE_AVX512 AND ENABLE_AVX512 AND HAVE_AVX512_VBMI AND ENABLE_AVX512_VBMI)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
-    endif ()
-
-    set (TEST_FLAG "-mbmi")
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-    check_cxx_source_compiles("
-        #include <immintrin.h>
-        int main() {
-            auto a = _blsr_u32(0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_BMI)
-    if (HAVE_BMI AND ENABLE_BMI)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
-    endif ()
-
-    set (TEST_FLAG "-mbmi2")
-    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-    check_cxx_source_compiles("
-        #include <immintrin.h>
-        int main() {
-            auto a = _pdep_u64(0, 0);
-            (void)a;
-            return 0;
-        }
-    " HAVE_BMI2)
-    if (HAVE_BMI2 AND HAVE_AVX2 AND ENABLE_AVX2 AND ENABLE_BMI2)
-        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
-    endif ()
-
-    # Limit avx2/avx512 flag for specific source build
-    set (X86_INTRINSICS_FLAGS "")
-    if (ENABLE_AVX2_FOR_SPEC_OP)
-        if (HAVE_BMI)
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mbmi")
         endif ()
-        if (HAVE_AVX AND HAVE_AVX2)
+    endif ()
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx -mavx2")
+
+    if (ENABLE_AVX512)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx512f -mavx512bw -mavx512vl")
+        if (ENABLE_AVX512_VBMI)
+            set (COMPILER_FLAGS "${COMPILER_FLAGS} -mavx512vbmi")
         endif ()
     endif ()
 
     if (ENABLE_AVX512_FOR_SPEC_OP)
-        set (X86_INTRINSICS_FLAGS "")
+        set (X86_INTRINSICS_FLAGS "-mbmi -mavx512f -mavx512bw -mavx512vl -mprefer-vector-width=256")
-        if (HAVE_BMI)
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mbmi")
-        endif ()
-        if (HAVE_AVX512)
-            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx512f -mavx512bw -mavx512vl -mprefer-vector-width=256")
-        endif ()
     endif ()
+
 else ()
     # RISC-V + exotic platforms
 endif ()
-
-cmake_pop_check_state ()

cmake/darwin/default_libs.cmake

@@ -22,9 +22,3 @@ link_libraries(global-group)
 target_link_libraries(global-group INTERFACE
     $<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
 )
-
-# FIXME: remove when all contribs will get custom cmake lists
-install(
-    TARGETS global-group global-libs
-    EXPORT global
-)

cmake/darwin/toolchain-aarch64.cmake

@@ -9,9 +9,3 @@ set (CMAKE_ASM_COMPILER_TARGET "aarch64-apple-darwin")
 set (CMAKE_OSX_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/darwin-aarch64")
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/darwin/toolchain-x86_64.cmake

@@ -9,9 +9,3 @@ set (CMAKE_ASM_COMPILER_TARGET "x86_64-apple-darwin")
 set (CMAKE_OSX_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/darwin-x86_64")
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/freebsd/default_libs.cmake

@@ -25,9 +25,3 @@ link_libraries(global-group)
 target_link_libraries(global-group INTERFACE
     $<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
 )
-
-# FIXME: remove when all contribs will get custom cmake lists
-install(
-    TARGETS global-group global-libs
-    EXPORT global
-)

cmake/freebsd/toolchain-aarch64.cmake

@@ -9,13 +9,3 @@ set (CMAKE_ASM_COMPILER_TARGET "aarch64-unknown-freebsd12")
 set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-aarch64")
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
-
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/freebsd/toolchain-ppc64le.cmake

@@ -9,13 +9,3 @@ set (CMAKE_ASM_COMPILER_TARGET "powerpc64le-unknown-freebsd13")
 set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-ppc64le")
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
-
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/freebsd/toolchain-x86_64.cmake

@@ -9,13 +9,3 @@ set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11")
 set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_64")
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
-
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/fuzzer.cmake

@@ -4,8 +4,8 @@ if (FUZZER)
         # NOTE: Eldar Zaitov decided to name it "libfuzzer" instead of "fuzzer" to keep in mind another possible fuzzer backends.
         # NOTE: no-link means that all the targets are built with instrumentation for fuzzer, but only some of them
         # (tests) have entry point for fuzzer and it's not checked.
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link -DFUZZER=1")
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link -DFUZZER=1")
 
         # NOTE: oss-fuzz can change LIB_FUZZING_ENGINE variable
         if (NOT LIB_FUZZING_ENGINE)

cmake/limit_jobs.cmake

@@ -21,7 +21,7 @@ if (NOT PARALLEL_COMPILE_JOBS AND MAX_COMPILER_MEMORY)
         set (PARALLEL_COMPILE_JOBS 1)
     endif ()
     if (PARALLEL_COMPILE_JOBS LESS NUMBER_OF_LOGICAL_CORES)
-        message(WARNING "The auto-calculated compile jobs limit (${PARALLEL_COMPILE_JOBS}) underutilizes CPU cores (${NUMBER_OF_LOGICAL_CORES}). Set PARALLEL_COMPILE_JOBS to override.")
+        message("The auto-calculated compile jobs limit (${PARALLEL_COMPILE_JOBS}) underutilizes CPU cores (${NUMBER_OF_LOGICAL_CORES}). Set PARALLEL_COMPILE_JOBS to override.")
     endif()
 endif ()
 
@@ -32,7 +32,7 @@ if (NOT PARALLEL_LINK_JOBS AND MAX_LINKER_MEMORY)
         set (PARALLEL_LINK_JOBS 1)
     endif ()
     if (PARALLEL_LINK_JOBS LESS NUMBER_OF_LOGICAL_CORES)
-        message(WARNING "The auto-calculated link jobs limit (${PARALLEL_LINK_JOBS}) underutilizes CPU cores (${NUMBER_OF_LOGICAL_CORES}). Set PARALLEL_LINK_JOBS to override.")
+        message("The auto-calculated link jobs limit (${PARALLEL_LINK_JOBS}) underutilizes CPU cores (${NUMBER_OF_LOGICAL_CORES}). Set PARALLEL_LINK_JOBS to override.")
     endif()
 endif ()
 

cmake/linux/default_libs.cmake

@@ -50,9 +50,3 @@ target_link_libraries(global-group INTERFACE
     $<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
     -Wl,--end-group
 )
-
-# FIXME: remove when all contribs will get custom cmake lists
-install(
-    TARGETS global-group global-libs
-    EXPORT global
-)

cmake/linux/toolchain-aarch64.cmake

@@ -9,10 +9,6 @@ set (CMAKE_C_COMPILER_TARGET "aarch64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "aarch64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "aarch64-linux-gnu")
 
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-aarch64")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/aarch64-linux-gnu/libc")
@@ -20,9 +16,3 @@ set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/aarch64-linux-gnu/libc")
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/linux/toolchain-ppc64le.cmake

@@ -9,10 +9,6 @@ set (CMAKE_C_COMPILER_TARGET "powerpc64le-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "powerpc64le-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "powerpc64le-linux-gnu")
 
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-powerpc64le")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/powerpc64le-linux-gnu/libc")
@@ -20,9 +16,3 @@ set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/powerpc64le-linux-gnu/libc")
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/linux/toolchain-riscv64.cmake

@@ -9,10 +9,6 @@ set (CMAKE_C_COMPILER_TARGET "riscv64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "riscv64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "riscv64-linux-gnu")
 
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-riscv64")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
@@ -27,9 +23,3 @@ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
 # ld.lld: error: section size decrease is too large
 # But GNU BinUtils work.
 set (LINKER_NAME "riscv64-linux-gnu-ld.bfd" CACHE STRING "Linker name" FORCE)
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/linux/toolchain-s390x.cmake

@@ -9,10 +9,6 @@ set (CMAKE_C_COMPILER_TARGET "s390x-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "s390x-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "s390x-linux-gnu")
 
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-s390x")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/s390x-linux-gnu/libc")
@@ -23,9 +19,3 @@ set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=mold -Wl,-L${CMAKE_SYSROOT}/usr/lib64")
 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=mold -Wl,-L${CMAKE_SYSROOT}/usr/lib64")
 set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=mold -Wl,-L${CMAKE_SYSROOT}/usr/lib64")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/linux/toolchain-x86_64-musl.cmake

@@ -9,10 +9,6 @@ set (CMAKE_C_COMPILER_TARGET "x86_64-linux-musl")
 set (CMAKE_CXX_COMPILER_TARGET "x86_64-linux-musl")
 set (CMAKE_ASM_COMPILER_TARGET "x86_64-linux-musl")
 
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-x86_64-musl")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
@@ -21,11 +17,5 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
 set (USE_MUSL 1)
 add_definitions(-DUSE_MUSL=1)

cmake/linux/toolchain-x86_64.cmake

@@ -19,10 +19,6 @@ set (CMAKE_C_COMPILER_TARGET "x86_64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "x86_64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "x86_64-linux-gnu")
 
-# Will be changed later, but somehow needed to be set here.
-set (CMAKE_AR "ar")
-set (CMAKE_RANLIB "ranlib")
-
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-x86_64")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/x86_64-linux-gnu/libc")
@@ -32,9 +28,3 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
-
-set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
-
-set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
-set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

cmake/sanitize.cmake

@@ -58,3 +58,27 @@ if (SANITIZE)
         message (FATAL_ERROR "Unknown sanitizer type: ${SANITIZE}")
     endif ()
 endif()
+
+# Default coverage instrumentation (dumping the coverage map on exit)
+option(WITH_COVERAGE "Instrumentation for code coverage with default implementation" OFF)
+
+if (WITH_COVERAGE)
+    message (INFORMATION "Enabled instrumentation for code coverage")
+    set(COVERAGE_FLAGS "-fprofile-instr-generate -fcoverage-mapping")
+endif()
+
+option (SANITIZE_COVERAGE "Instrumentation for code coverage with custom callbacks" OFF)
+
+if (SANITIZE_COVERAGE)
+    message (INFORMATION "Enabled instrumentation for code coverage")
+
+    # We set this define for whole build to indicate that at least some parts are compiled with coverage.
+    # And to expose it in system.build_options.
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSANITIZE_COVERAGE=1")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSANITIZE_COVERAGE=1")
+
+    # But the actual coverage will be enabled on per-library basis: for ClickHouse code, but not for 3rd-party.
+    set (COVERAGE_FLAGS "-fsanitize-coverage=trace-pc-guard,pc-table")
+endif()
+
+set (WITHOUT_COVERAGE_FLAGS "-fno-profile-instr-generate -fno-coverage-mapping -fno-sanitize-coverage=trace-pc-guard,pc-table")

contrib/AMQP-CPP

@@ -1 +1 @@
-Subproject commit 818c2d8ad96a08a5d20fece7d1e1e8855a2b0860
+Subproject commit 00f09897ce020a84e38f87dc416af4a19c5da9ae

contrib/CMakeLists.txt

@@ -1,16 +1,7 @@
 #"${folder}/CMakeLists.txt" Third-party libraries may have substandard code.
 
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w -ffunction-sections -fdata-sections")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -ffunction-sections -fdata-sections")
-
-if (WITH_COVERAGE)
-  set (WITHOUT_COVERAGE_LIST ${WITHOUT_COVERAGE})
-  separate_arguments(WITHOUT_COVERAGE_LIST)
-  # disable coverage for contib files and build with optimisations
-  if (COMPILER_CLANG)
-      add_compile_options(-O3 -DNDEBUG -finline-functions -finline-hint-functions ${WITHOUT_COVERAGE_LIST})
-  endif()
-endif()
 
 if (SANITIZE STREQUAL "undefined")
     # 3rd-party libraries usually not intended to work with UBSan.
@@ -53,6 +44,7 @@ else ()
 endif ()
 add_contrib (miniselect-cmake miniselect)
 add_contrib (pdqsort-cmake pdqsort)
+add_contrib (pocketfft-cmake pocketfft)
 add_contrib (crc32-vpmsum-cmake crc32-vpmsum)
 add_contrib (sparsehash-c11-cmake sparsehash-c11)
 add_contrib (abseil-cpp-cmake abseil-cpp)

contrib/abseil-cpp

@@ -1 +1 @@
-Subproject commit 5655528c41830f733160de4fb0b99073841bae9e
+Subproject commit 3bd86026c93da5a40006fd53403dff9d5f5e30e3

contrib/arrow

@@ -1 +1 @@
-Subproject commit 1d93838f69a802639ca144ea5704a98e2481810d
+Subproject commit ba5c67934e8274d649befcffab56731632dc5253

contrib/arrow-cmake/CMakeLists.txt

@@ -77,16 +77,16 @@ set(FLATBUFFERS_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/flatbuffers")
 set(FLATBUFFERS_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/flatbuffers")
 set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_SRC_DIR}/include")
 
-# set flatbuffers CMake options
+set(FLATBUFFERS_SRCS
-set(FLATBUFFERS_BUILD_FLATLIB ON CACHE BOOL "Enable the build of the flatbuffers library")
+  ${FLATBUFFERS_SRC_DIR}/src/idl_parser.cpp
-set(FLATBUFFERS_BUILD_SHAREDLIB OFF CACHE BOOL "Disable the build of the flatbuffers shared library")
+  ${FLATBUFFERS_SRC_DIR}/src/idl_gen_text.cpp
-set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "Skip flatbuffers tests")
+  ${FLATBUFFERS_SRC_DIR}/src/reflection.cpp
+  ${FLATBUFFERS_SRC_DIR}/src/util.cpp)
 
-add_subdirectory(${FLATBUFFERS_SRC_DIR} "${FLATBUFFERS_BINARY_DIR}")
+add_library(_flatbuffers STATIC ${FLATBUFFERS_SRCS})
+target_include_directories(_flatbuffers PUBLIC ${FLATBUFFERS_INCLUDE_DIR})
+target_compile_definitions(_flatbuffers PRIVATE -DFLATBUFFERS_LOCALE_INDEPENDENT=0)
 
-add_library(_flatbuffers INTERFACE)
-target_link_libraries(_flatbuffers INTERFACE flatbuffers)
-target_include_directories(_flatbuffers INTERFACE ${FLATBUFFERS_INCLUDE_DIR})
 
 # ===  hdfs
 # NOTE: cannot use ch_contrib::hdfs since it's INCLUDE_DIRECTORIES does not includes trailing "hdfs/"
@@ -109,7 +109,6 @@ set (ORC_CXX_HAS_CSTDINT 1)
 set (ORC_CXX_HAS_THREAD_LOCAL 1)
 
 include(orc_check.cmake)
-configure_file("${ORC_INCLUDE_DIR}/orc/orc-config.hh.in" "${ORC_BUILD_INCLUDE_DIR}/orc/orc-config.hh")
 configure_file("${ORC_SOURCE_SRC_DIR}/Adaptor.hh.in" "${ORC_BUILD_INCLUDE_DIR}/Adaptor.hh")
 
 
@@ -128,7 +127,6 @@ set(ORC_SRCS
         "${ORC_SOURCE_SRC_DIR}/BpackingDefault.hh"
         "${ORC_SOURCE_SRC_DIR}/ByteRLE.cc"
         "${ORC_SOURCE_SRC_DIR}/ByteRLE.hh"
-        "${ORC_SOURCE_SRC_DIR}/CMakeLists.txt"
         "${ORC_SOURCE_SRC_DIR}/ColumnPrinter.cc"
         "${ORC_SOURCE_SRC_DIR}/ColumnReader.cc"
         "${ORC_SOURCE_SRC_DIR}/ColumnReader.hh"
@@ -198,7 +196,9 @@ target_link_libraries(_orc PRIVATE
     ch_contrib::snappy
     ch_contrib::zlib
     ch_contrib::zstd)
-target_include_directories(_orc SYSTEM BEFORE PUBLIC ${ORC_INCLUDE_DIR})
+target_include_directories(_orc SYSTEM BEFORE PUBLIC
+    ${ORC_INCLUDE_DIR}
+    "${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src/orc/c++/include")
 target_include_directories(_orc SYSTEM BEFORE PUBLIC ${ORC_BUILD_INCLUDE_DIR})
 target_include_directories(_orc SYSTEM PRIVATE
     ${ORC_SOURCE_SRC_DIR}
@@ -212,8 +212,6 @@ target_include_directories(_orc SYSTEM PRIVATE
 
 set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow")
 
-configure_file("${LIBRARY_DIR}/util/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cpp/src/arrow/util/config.h")
-
 # arrow/cpp/src/arrow/CMakeLists.txt (ARROW_SRCS + ARROW_COMPUTE + ARROW_IPC)
 set(ARROW_SRCS
         "${LIBRARY_DIR}/array/array_base.cc"
@@ -230,6 +228,8 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/array/builder_nested.cc"
         "${LIBRARY_DIR}/array/builder_primitive.cc"
         "${LIBRARY_DIR}/array/builder_union.cc"
+        "${LIBRARY_DIR}/array/builder_run_end.cc"
+        "${LIBRARY_DIR}/array/array_run_end.cc"
         "${LIBRARY_DIR}/array/concatenate.cc"
         "${LIBRARY_DIR}/array/data.cc"
         "${LIBRARY_DIR}/array/diff.cc"
@@ -309,9 +309,12 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/util/debug.cc"
         "${LIBRARY_DIR}/util/tracing.cc"
         "${LIBRARY_DIR}/util/atfork_internal.cc"
+        "${LIBRARY_DIR}/util/crc32.cc"
+        "${LIBRARY_DIR}/util/hashing.cc"
+        "${LIBRARY_DIR}/util/ree_util.cc"
+        "${LIBRARY_DIR}/util/union_util.cc"
         "${LIBRARY_DIR}/vendored/base64.cpp"
         "${LIBRARY_DIR}/vendored/datetime/tz.cpp"
-
         "${LIBRARY_DIR}/vendored/musl/strptime.c"
         "${LIBRARY_DIR}/vendored/uriparser/UriCommon.c"
         "${LIBRARY_DIR}/vendored/uriparser/UriCompare.c"
@@ -328,39 +331,20 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/vendored/uriparser/UriRecompose.c"
         "${LIBRARY_DIR}/vendored/uriparser/UriResolve.c"
         "${LIBRARY_DIR}/vendored/uriparser/UriShorten.c"
+        "${LIBRARY_DIR}/vendored/double-conversion/bignum.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/bignum-dtoa.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/cached-powers.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/double-to-string.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/fast-dtoa.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/fixed-dtoa.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/string-to-double.cc"
+        "${LIBRARY_DIR}/vendored/double-conversion/strtod.cc"
 
         "${LIBRARY_DIR}/compute/api_aggregate.cc"
         "${LIBRARY_DIR}/compute/api_scalar.cc"
         "${LIBRARY_DIR}/compute/api_vector.cc"
         "${LIBRARY_DIR}/compute/cast.cc"
         "${LIBRARY_DIR}/compute/exec.cc"
-        "${LIBRARY_DIR}/compute/exec/accumulation_queue.cc"
-        "${LIBRARY_DIR}/compute/exec/accumulation_queue.h"
-        "${LIBRARY_DIR}/compute/exec/aggregate.cc"
-        "${LIBRARY_DIR}/compute/exec/aggregate_node.cc"
-        "${LIBRARY_DIR}/compute/exec/asof_join_node.cc"
-        "${LIBRARY_DIR}/compute/exec/bloom_filter.cc"
-        "${LIBRARY_DIR}/compute/exec/exec_plan.cc"
-        "${LIBRARY_DIR}/compute/exec/expression.cc"
-        "${LIBRARY_DIR}/compute/exec/filter_node.cc"
-        "${LIBRARY_DIR}/compute/exec/hash_join.cc"
-        "${LIBRARY_DIR}/compute/exec/hash_join_dict.cc"
-        "${LIBRARY_DIR}/compute/exec/hash_join_node.cc"
-        "${LIBRARY_DIR}/compute/exec/key_hash.cc"
-        "${LIBRARY_DIR}/compute/exec/key_map.cc"
-        "${LIBRARY_DIR}/compute/exec/map_node.cc"
-        "${LIBRARY_DIR}/compute/exec/options.cc"
-        "${LIBRARY_DIR}/compute/exec/order_by_impl.cc"
-        "${LIBRARY_DIR}/compute/exec/partition_util.cc"
-        "${LIBRARY_DIR}/compute/exec/project_node.cc"
-        "${LIBRARY_DIR}/compute/exec/query_context.cc"
-        "${LIBRARY_DIR}/compute/exec/sink_node.cc"
-        "${LIBRARY_DIR}/compute/exec/source_node.cc"
-        "${LIBRARY_DIR}/compute/exec/swiss_join.cc"
-        "${LIBRARY_DIR}/compute/exec/task_util.cc"
-        "${LIBRARY_DIR}/compute/exec/tpch_node.cc"
-        "${LIBRARY_DIR}/compute/exec/union_node.cc"
-        "${LIBRARY_DIR}/compute/exec/util.cc"
         "${LIBRARY_DIR}/compute/function.cc"
         "${LIBRARY_DIR}/compute/function_internal.cc"
         "${LIBRARY_DIR}/compute/kernel.cc"
@@ -403,8 +387,13 @@ set(ARROW_SRCS
         "${LIBRARY_DIR}/compute/kernels/vector_select_k.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_selection.cc"
         "${LIBRARY_DIR}/compute/kernels/vector_sort.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_selection_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_selection_filter_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_selection_take_internal.cc"
         "${LIBRARY_DIR}/compute/light_array.cc"
         "${LIBRARY_DIR}/compute/registry.cc"
+        "${LIBRARY_DIR}/compute/expression.cc"
+        "${LIBRARY_DIR}/compute/ordering.cc"
         "${LIBRARY_DIR}/compute/row/compare_internal.cc"
         "${LIBRARY_DIR}/compute/row/encode_internal.cc"
         "${LIBRARY_DIR}/compute/row/grouper.cc"
@@ -459,7 +448,7 @@ target_link_libraries(_arrow PUBLIC _orc)
 add_dependencies(_arrow protoc)
 
 target_include_directories(_arrow SYSTEM BEFORE PUBLIC ${ARROW_SRC_DIR})
-target_include_directories(_arrow SYSTEM BEFORE PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cpp/src")
+target_include_directories(_arrow SYSTEM BEFORE PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src")
 
 target_include_directories(_arrow SYSTEM PRIVATE ${ARROW_SRC_DIR})
 target_include_directories(_arrow SYSTEM PRIVATE ${HDFS_INCLUDE_DIR})
@@ -488,10 +477,10 @@ set(PARQUET_SRCS
         "${LIBRARY_DIR}/exception.cc"
         "${LIBRARY_DIR}/file_reader.cc"
         "${LIBRARY_DIR}/file_writer.cc"
+        "${LIBRARY_DIR}/page_index.cc"
         "${LIBRARY_DIR}/level_conversion.cc"
         "${LIBRARY_DIR}/level_comparison.cc"
         "${LIBRARY_DIR}/metadata.cc"
-        "${LIBRARY_DIR}/murmur3.cc"
         "${LIBRARY_DIR}/platform.cc"
         "${LIBRARY_DIR}/printer.cc"
         "${LIBRARY_DIR}/properties.cc"
@@ -500,6 +489,8 @@ set(PARQUET_SRCS
         "${LIBRARY_DIR}/stream_reader.cc"
         "${LIBRARY_DIR}/stream_writer.cc"
         "${LIBRARY_DIR}/types.cc"
+        "${LIBRARY_DIR}/bloom_filter_reader.cc"
+        "${LIBRARY_DIR}/xxhasher.cc"
 
         "${GEN_LIBRARY_DIR}/parquet_constants.cpp"
         "${GEN_LIBRARY_DIR}/parquet_types.cpp"

contrib/arrow-cmake/cpp/src/arrow/util/config.h

@@ -0,0 +1,61 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#define ARROW_VERSION_MAJOR 11
+#define ARROW_VERSION_MINOR 0
+#define ARROW_VERSION_PATCH 0
+#define ARROW_VERSION ((ARROW_VERSION_MAJOR * 1000) + ARROW_VERSION_MINOR) * 1000 + ARROW_VERSION_PATCH
+
+#define ARROW_VERSION_STRING "11.0.0"
+
+#define ARROW_SO_VERSION "1100"
+#define ARROW_FULL_SO_VERSION "1100.0.0"
+
+#define ARROW_CXX_COMPILER_ID "Clang"
+#define ARROW_CXX_COMPILER_VERSION "ClickHouse"
+#define ARROW_CXX_COMPILER_FLAGS ""
+
+#define ARROW_BUILD_TYPE ""
+
+#define ARROW_GIT_ID ""
+#define ARROW_GIT_DESCRIPTION ""
+
+#define ARROW_PACKAGE_KIND ""
+
+/* #undef ARROW_COMPUTE */
+/* #undef ARROW_CSV */
+/* #undef ARROW_CUDA */
+/* #undef ARROW_DATASET */
+/* #undef ARROW_FILESYSTEM */
+/* #undef ARROW_FLIGHT */
+/* #undef ARROW_FLIGHT_SQL */
+/* #undef ARROW_IPC */
+/* #undef ARROW_JEMALLOC */
+/* #undef ARROW_JEMALLOC_VENDORED */
+/* #undef ARROW_JSON */
+/* #undef ARROW_ORC */
+/* #undef ARROW_PARQUET */
+/* #undef ARROW_SUBSTRAIT */
+
+/* #undef ARROW_GCS */
+/* #undef ARROW_S3 */
+/* #undef ARROW_USE_NATIVE_INT128 */
+/* #undef ARROW_WITH_MUSL */
+/* #undef ARROW_WITH_OPENTELEMETRY */
+/* #undef ARROW_WITH_UCX */
+
+/* #undef GRPCPP_PP_INCLUDE */

contrib/arrow-cmake/cpp/src/orc/c++/include/orc/orc-config.hh

@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ORC_CONFIG_HH
+#define ORC_CONFIG_HH
+
+#define ORC_VERSION ""
+
+#define ORC_CXX_HAS_CSTDINT
+
+#ifdef ORC_CXX_HAS_CSTDINT
+  #include <cstdint>
+#else
+  #include <stdint.h>
+#endif
+
+// Following MACROS should be keeped for backward compatibility.
+#define ORC_NOEXCEPT noexcept
+#define ORC_NULLPTR nullptr
+#define ORC_OVERRIDE override
+#define ORC_UNIQUE_PTR std::unique_ptr
+
+#endif

contrib/aws-cmake/AwsFeatureTests.cmake

@@ -1,114 +1,13 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0.
 
-include(CheckCSourceRuns)
-
 option(USE_CPU_EXTENSIONS "Whenever possible, use functions optimized for CPUs with specific extensions (ex: SSE, AVX)." ON)
 
-# In the current (11/2/21) state of mingw64, the packaged gcc is not capable of emitting properly aligned avx2 instructions under certain circumstances.
+if (ARCH_AMD64)
-# This leads to crashes for windows builds using mingw64 when invoking the avx2-enabled versions of certain functions.  Until we can find a better
+    set (AWS_ARCH_INTEL 1)
-# work-around, disable avx2 (and all other extensions) in mingw builds.
+elseif (ARCH_AARCH64)
-#
+    set (AWS_ARCH_ARM64 1)
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
+endif ()
-#
-if (MINGW)
-    message(STATUS "MINGW detected!  Disabling avx2 and other CPU extensions")
-    set(USE_CPU_EXTENSIONS OFF)
-endif()
 
-if(NOT CMAKE_CROSSCOMPILING)
+set (AWS_HAVE_GCC_INLINE_ASM 1)
-    check_c_source_runs("
+set (AWS_HAVE_AUXV 1)
-    #include <stdbool.h>
-    bool foo(int a, int b, int *c) {
-        return __builtin_mul_overflow(a, b, c);
-    }
-
-    int main() {
-        int out;
-        if (foo(1, 2, &out)) {
-            return 0;
-        }
-
-        return 0;
-    }" AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS)
-
-    if (USE_CPU_EXTENSIONS)
-        check_c_source_runs("
-        int main() {
-        int foo = 42;
-        _mulx_u32(1, 2, &foo);
-        return foo != 2;
-        }" AWS_HAVE_MSVC_MULX)
-    endif()
-
-endif()
-
-check_c_source_compiles("
-    #include <Windows.h>
-    #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-    int main() {
-        return 0;
-    }
-    #else
-    it's not windows desktop
-    #endif
-" AWS_HAVE_WINAPI_DESKTOP)
-
-check_c_source_compiles("
-    int main() {
-#if !(defined(__x86_64__) || defined(__i386__) || defined(_M_X64) || defined(_M_IX86))
-#    error \"not intel\"
-#endif
-        return 0;
-    }
-" AWS_ARCH_INTEL)
-
-check_c_source_compiles("
-    int main() {
-#if !(defined(__aarch64__) || defined(_M_ARM64))
-#    error \"not arm64\"
-#endif
-        return 0;
-    }
-" AWS_ARCH_ARM64)
-
-check_c_source_compiles("
-    int main() {
-#if !(defined(__arm__) || defined(_M_ARM))
-#    error \"not arm\"
-#endif
-        return 0;
-    }
-" AWS_ARCH_ARM32)
-
-check_c_source_compiles("
-int main() {
-    int foo = 42, bar = 24;
-    __asm__ __volatile__(\"\":\"=r\"(foo):\"r\"(bar):\"memory\");
-}" AWS_HAVE_GCC_INLINE_ASM)
-
-check_c_source_compiles("
-#include <sys/auxv.h>
-int main() {
-#ifdef __linux__
-    getauxval(AT_HWCAP);
-    getauxval(AT_HWCAP2);
-#endif
-    return 0;
-}" AWS_HAVE_AUXV)
-
-string(REGEX MATCH "^(aarch64|arm)" ARM_CPU "${CMAKE_SYSTEM_PROCESSOR}")
-if(NOT LEGACY_COMPILER_SUPPORT OR ARM_CPU)
-    check_c_source_compiles("
-    #include <execinfo.h>
-    int main() {
-        backtrace(NULL, 0);
-        return 0;
-    }" AWS_HAVE_EXECINFO)
-endif()
-
-check_c_source_compiles("
-#include <linux/if_link.h>
-int main() {
-    return 1;
-}" AWS_HAVE_LINUX_IF_LINK_H)

contrib/aws-cmake/AwsSIMD.cmake

@@ -1,54 +1,13 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0.
 
-include(CheckCCompilerFlag)
-include(CheckIncludeFile)
-
 if (USE_CPU_EXTENSIONS)
-    if (MSVC)
+    if (ENABLE_AVX2)
-        check_c_compiler_flag("/arch:AVX2" HAVE_M_AVX2_FLAG)
+        set (AVX2_CFLAGS "-mavx -mavx2")
-        if (HAVE_M_AVX2_FLAG)
+        set (HAVE_AVX2_INTRINSICS 1)
-            set(AVX2_CFLAGS "/arch:AVX2")
+        set (HAVE_MM256_EXTRACT_EPI64 1)
-        endif()
-    else()
-        check_c_compiler_flag(-mavx2 HAVE_M_AVX2_FLAG)
-        if (HAVE_M_AVX2_FLAG)
-            set(AVX2_CFLAGS "-mavx -mavx2")
-        endif()
     endif()
-
+endif()
-
-    cmake_push_check_state()
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${AVX2_CFLAGS}")
-
-    check_c_source_compiles("
-        #include <immintrin.h>
-        #include <emmintrin.h>
-        #include <string.h>
-
-        int main() {
-            __m256i vec;
-            memset(&vec, 0, sizeof(vec));
-
-            _mm256_shuffle_epi8(vec, vec);
-            _mm256_set_epi32(1,2,3,4,5,6,7,8);
-            _mm256_permutevar8x32_epi32(vec, vec);
-
-            return 0;
-        }"  HAVE_AVX2_INTRINSICS)
-
-    check_c_source_compiles("
-        #include <immintrin.h>
-        #include <string.h>
-
-        int main() {
-            __m256i vec;
-            memset(&vec, 0, sizeof(vec));
-            return (int)_mm256_extract_epi64(vec, 2);
-        }" HAVE_MM256_EXTRACT_EPI64)
-
-    cmake_pop_check_state()
-endif() # USE_CPU_EXTENSIONS
 
 macro(simd_add_definition_if target definition)
     if(${definition})

contrib/aws-cmake/AwsThreadAffinity.cmake

@@ -1,50 +1,9 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0.
 
-include(CheckSymbolExists)
-
 # Check if the platform supports setting thread affinity
 # (important for hitting full NIC entitlement on NUMA architectures)
 function(aws_set_thread_affinity_method target)
-
+    # This code has been cut, because I don't care about it.
-    # Non-POSIX, Android, and Apple platforms do not support thread affinity.
+    target_compile_definitions(${target} PRIVATE -DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_NONE)
-    if (NOT UNIX OR ANDROID OR APPLE)
-        target_compile_definitions(${target} PRIVATE
-            -DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_NONE)
-        return()
-    endif()
-
-    cmake_push_check_state()
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-    list(APPEND CMAKE_REQUIRED_LIBRARIES pthread)
-
-    set(headers "pthread.h")
-    # BSDs put nonportable pthread declarations in a separate header.
-    if(CMAKE_SYSTEM_NAME MATCHES BSD)
-        set(headers "${headers};pthread_np.h")
-    endif()
-
-    # Using pthread attrs is the preferred method, but is glibc-specific.
-    check_symbol_exists(pthread_attr_setaffinity_np "${headers}" USE_PTHREAD_ATTR_SETAFFINITY)
-    if (USE_PTHREAD_ATTR_SETAFFINITY)
-        target_compile_definitions(${target} PRIVATE
-            -DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_PTHREAD_ATTR)
-        return()
-    endif()
-
-    # This method is still nonportable, but is supported by musl and BSDs.
-    check_symbol_exists(pthread_setaffinity_np "${headers}" USE_PTHREAD_SETAFFINITY)
-    if (USE_PTHREAD_SETAFFINITY)
-        target_compile_definitions(${target} PRIVATE
-            -DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_PTHREAD)
-        return()
-    endif()
-
-    # If we got here, we expected thread affinity support but didn't find it.
-    # We still build with degraded NUMA performance, but show a warning.
-    message(WARNING "No supported method for setting thread affinity")
-    target_compile_definitions(${target} PRIVATE
-        -DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_NONE)
-
-    cmake_pop_check_state()
 endfunction()

contrib/aws-cmake/AwsThreadName.cmake

@@ -1,61 +1,13 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0.
 
-include(CheckSymbolExists)
-
 # Check how the platform supports setting thread name
 function(aws_set_thread_name_method target)
-
+    if (APPLE)
-    if (WINDOWS)
-        # On Windows we do a runtime check, instead of compile-time check
-        return()
-    elseif (APPLE)
         # All Apple platforms we support have the same function, so no need for compile-time check.
         return()
     endif()
 
-    cmake_push_check_state()
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-    list(APPEND CMAKE_REQUIRED_LIBRARIES pthread)
-
-    # The start of the test program
-    set(c_source_start "
-        #define _GNU_SOURCE
-        #include <pthread.h>
-
-        #if defined(__FreeBSD__) || defined(__NETBSD__)
-        #include <pthread_np.h>
-        #endif
-
-        int main() {
-            pthread_t thread_id;
-        ")
-
-    # The end of the test program
-    set(c_source_end "}")
-
     # pthread_setname_np() usually takes 2 args
-    check_c_source_compiles("
+    target_compile_definitions(${target} PRIVATE -DAWS_PTHREAD_SETNAME_TAKES_2ARGS)
-        ${c_source_start}
-        pthread_setname_np(thread_id, \"asdf\");
-        ${c_source_end}"
-        PTHREAD_SETNAME_TAKES_2ARGS)
-    if (PTHREAD_SETNAME_TAKES_2ARGS)
-        target_compile_definitions(${target} PRIVATE -DAWS_PTHREAD_SETNAME_TAKES_2ARGS)
-        return()
-    endif()
-
-    # But on NetBSD it takes 3!
-    check_c_source_compiles("
-        ${c_source_start}
-        pthread_setname_np(thread_id, \"asdf\", NULL);
-        ${c_source_end}
-        " PTHREAD_SETNAME_TAKES_3ARGS)
-    if (PTHREAD_SETNAME_TAKES_3ARGS)
-        target_compile_definitions(${target} PRIVATE -DAWS_PTHREAD_SETNAME_TAKES_3ARGS)
-        return()
-    endif()
-
-    # And on many older/weirder platforms it's just not supported
-    cmake_pop_check_state()
 endfunction()

contrib/azure-cmake/CMakeLists.txt

@@ -48,9 +48,8 @@ set(AZURE_SDK_INCLUDES
     "${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/inc/"
 )
 
-include("${AZURE_DIR}/cmake-modules/AzureTransportAdapters.cmake")
-
 add_library(_azure_sdk ${AZURE_SDK_UNIFIED_SRC})
+target_compile_definitions(_azure_sdk PRIVATE BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 
 # Originally, on Windows azure-core is built with bcrypt and crypt32 by default
 if (TARGET OpenSSL::SSL)

contrib/cassandra-cmake/CMakeLists.txt

@@ -68,8 +68,7 @@ list(APPEND INCLUDE_DIRS
   ${CASS_SRC_DIR}/third_party/hdr_histogram
   ${CASS_SRC_DIR}/third_party/http-parser
   ${CASS_SRC_DIR}/third_party/mt19937_64
-  ${CASS_SRC_DIR}/third_party/rapidjson/rapidjson
+  ${CASS_SRC_DIR}/third_party/rapidjson/rapidjson)
-  ${CASS_SRC_DIR}/third_party/sparsehash/src)
 
 list(APPEND INCLUDE_DIRS ${CASS_INCLUDE_DIR} ${CASS_SRC_DIR})
 
@@ -83,10 +82,6 @@ set(HAVE_MEMCPY 1)
 set(HAVE_LONG_LONG 1)
 set(HAVE_UINT16_T 1)
 
-configure_file("${CASS_SRC_DIR}/third_party/sparsehash/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/sparsehash/internal/sparseconfig.h")
-
-
-
 # Determine random availability
 if (OS_LINUX)
   #set (HAVE_GETRANDOM 1) - not on every Linux kernel
@@ -116,17 +111,17 @@ configure_file(
   ${CASS_ROOT_DIR}/driver_config.hpp.in
   ${CMAKE_CURRENT_BINARY_DIR}/driver_config.hpp)
 
-
 add_library(_cassandra
     ${SOURCES}
     $<TARGET_OBJECTS:_curl_hostcheck>
     $<TARGET_OBJECTS:_hdr_histogram>
     $<TARGET_OBJECTS:_http-parser>)
 
-target_link_libraries(_cassandra ch_contrib::zlib ch_contrib::minizip)
+target_link_libraries(_cassandra ch_contrib::zlib ch_contrib::minizip ch_contrib::sparsehash)
 target_include_directories(_cassandra PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${INCLUDE_DIRS})
 target_include_directories(_cassandra SYSTEM BEFORE PUBLIC ${CASS_INCLUDE_DIR})
 target_compile_definitions(_cassandra PRIVATE CASS_BUILDING)
+target_compile_definitions(_cassandra PRIVATE -DSPARSEHASH_HASH=std::hash -Dsparsehash=google)
 
 target_link_libraries(_cassandra ch_contrib::uv)
 

contrib/fastops-cmake/CMakeLists.txt

@@ -13,12 +13,10 @@ set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/fastops")
 
 set(SRCS "")
 
-if(HAVE_AVX)
+if(ARCH_AMD64)
     set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/avx/ops_avx.cpp")
     set_source_files_properties("${LIBRARY_DIR}/fastops/avx/ops_avx.cpp" PROPERTIES COMPILE_FLAGS "-mavx -DNO_AVX2")
-endif()
 
-if(HAVE_AVX2)
     set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp")
     set_source_files_properties("${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp" PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
 endif()

contrib/google-protobuf

@@ -1 +1 @@
-Subproject commit 2a4fa1a4e95012d754ac55d43c8bc462dd1c78a8
+Subproject commit 0862007f6ca1f5723c58f10f0ca34f3f25a63b2e

contrib/google-protobuf-cmake/CMakeLists.txt

@@ -20,7 +20,6 @@ endif()
 set(protobuf_source_dir "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf")
 set(protobuf_binary_dir "${ClickHouse_BINARY_DIR}/contrib/google-protobuf")
 
-
 add_definitions(-DGOOGLE_PROTOBUF_CMAKE_BUILD)
 
 add_definitions(-DHAVE_PTHREAD)
@@ -30,17 +29,69 @@ include_directories(
   ${protobuf_binary_dir}
   ${protobuf_source_dir}/src)
 
+add_library(utf8_range
+    ${protobuf_source_dir}/third_party/utf8_range/naive.c
+    ${protobuf_source_dir}/third_party/utf8_range/range2-neon.c
+    ${protobuf_source_dir}/third_party/utf8_range/range2-sse.c
+)
+include_directories(${protobuf_source_dir}/third_party/utf8_range)
+
+add_library(utf8_validity
+    ${protobuf_source_dir}/third_party/utf8_range/utf8_validity.cc
+)
+target_link_libraries(utf8_validity PUBLIC absl::strings)
+
+set(protobuf_absl_used_targets
+    absl::absl_check
+    absl::absl_log
+    absl::algorithm
+    absl::base
+    absl::bind_front
+    absl::bits
+    absl::btree
+    absl::cleanup
+    absl::cord
+    absl::core_headers
+    absl::debugging
+    absl::die_if_null
+    absl::dynamic_annotations
+    absl::flags
+    absl::flat_hash_map
+    absl::flat_hash_set
+    absl::function_ref
+    absl::hash
+    absl::layout
+    absl::log_initialize
+    absl::log_severity
+    absl::memory
+    absl::node_hash_map
+    absl::node_hash_set
+    absl::optional
+    absl::span
+    absl::status
+    absl::statusor
+    absl::strings
+    absl::synchronization
+    absl::time
+    absl::type_traits
+    absl::utility
+    absl::variant
+)
+
 set(libprotobuf_lite_files
   ${protobuf_source_dir}/src/google/protobuf/any_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/arena.cc
+  ${protobuf_source_dir}/src/google/protobuf/arena_align.cc
   ${protobuf_source_dir}/src/google/protobuf/arenastring.cc
+  ${protobuf_source_dir}/src/google/protobuf/arenaz_sampler.cc
   ${protobuf_source_dir}/src/google/protobuf/extension_set.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_enum_util.cc
+  ${protobuf_source_dir}/src/google/protobuf/generated_message_tctable_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_message_util.cc
   ${protobuf_source_dir}/src/google/protobuf/implicit_weak_message.cc
+  ${protobuf_source_dir}/src/google/protobuf/inlined_string_field.cc
   ${protobuf_source_dir}/src/google/protobuf/io/coded_stream.cc
   ${protobuf_source_dir}/src/google/protobuf/io/io_win32.cc
-  ${protobuf_source_dir}/src/google/protobuf/io/strtod.cc
   ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream.cc
   ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_impl.cc
   ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
@@ -48,21 +99,15 @@ set(libprotobuf_lite_files
   ${protobuf_source_dir}/src/google/protobuf/message_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/parse_context.cc
   ${protobuf_source_dir}/src/google/protobuf/repeated_field.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/bytestream.cc
+  ${protobuf_source_dir}/src/google/protobuf/repeated_ptr_field.cc
   ${protobuf_source_dir}/src/google/protobuf/stubs/common.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/int128.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/status.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/statusor.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/stringpiece.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/stringprintf.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/structurally_valid.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/strutil.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/time.cc
   ${protobuf_source_dir}/src/google/protobuf/wire_format_lite.cc
 )
 
 add_library(_libprotobuf-lite ${libprotobuf_lite_files})
-target_link_libraries(_libprotobuf-lite pthread)
+target_link_libraries(_libprotobuf-lite
+    pthread
+    utf8_validity)
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     target_link_libraries(_libprotobuf-lite log)
 endif()
@@ -71,67 +116,93 @@ add_library(protobuf::libprotobuf-lite ALIAS _libprotobuf-lite)
 
 
 set(libprotobuf_files
-  ${protobuf_source_dir}/src/google/protobuf/any.cc
   ${protobuf_source_dir}/src/google/protobuf/any.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/api.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/duration.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/empty.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/field_mask.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/source_context.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/struct.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/type.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/any.cc
+  ${protobuf_source_dir}/src/google/protobuf/any_lite.cc
+  ${protobuf_source_dir}/src/google/protobuf/arena.cc
+  ${protobuf_source_dir}/src/google/protobuf/arena_align.cc
+  ${protobuf_source_dir}/src/google/protobuf/arenastring.cc
+  ${protobuf_source_dir}/src/google/protobuf/arenaz_sampler.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc
+  ${protobuf_source_dir}/src/google/protobuf/cpp_features.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/descriptor.cc
   ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc
-  ${protobuf_source_dir}/src/google/protobuf/duration.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/dynamic_message.cc
-  ${protobuf_source_dir}/src/google/protobuf/empty.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/extension_set.cc
   ${protobuf_source_dir}/src/google/protobuf/extension_set_heavy.cc
-  ${protobuf_source_dir}/src/google/protobuf/field_mask.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/feature_resolver.cc
+  ${protobuf_source_dir}/src/google/protobuf/generated_enum_util.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_message_bases.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_message_reflection.cc
+  ${protobuf_source_dir}/src/google/protobuf/generated_message_tctable_full.cc
+  ${protobuf_source_dir}/src/google/protobuf/generated_message_tctable_gen.cc
+  ${protobuf_source_dir}/src/google/protobuf/generated_message_tctable_lite.cc
+  ${protobuf_source_dir}/src/google/protobuf/generated_message_util.cc
+  ${protobuf_source_dir}/src/google/protobuf/implicit_weak_message.cc
+  ${protobuf_source_dir}/src/google/protobuf/inlined_string_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/coded_stream.cc
   ${protobuf_source_dir}/src/google/protobuf/io/gzip_stream.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/io_win32.cc
   ${protobuf_source_dir}/src/google/protobuf/io/printer.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/strtod.cc
   ${protobuf_source_dir}/src/google/protobuf/io/tokenizer.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_sink.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_impl.cc
+  ${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/lexer.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/message_path.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/parser.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/unparser.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/untyped_message.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/writer.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/internal/zero_copy_buffered_stream.cc
+  ${protobuf_source_dir}/src/google/protobuf/json/json.cc
+  ${protobuf_source_dir}/src/google/protobuf/map.cc
   ${protobuf_source_dir}/src/google/protobuf/map_field.cc
   ${protobuf_source_dir}/src/google/protobuf/message.cc
+  ${protobuf_source_dir}/src/google/protobuf/message_lite.cc
+  ${protobuf_source_dir}/src/google/protobuf/parse_context.cc
+  ${protobuf_source_dir}/src/google/protobuf/port.cc
+  ${protobuf_source_dir}/src/google/protobuf/raw_ptr.cc
+  ${protobuf_source_dir}/src/google/protobuf/reflection_mode.cc
   ${protobuf_source_dir}/src/google/protobuf/reflection_ops.cc
+  ${protobuf_source_dir}/src/google/protobuf/repeated_field.cc
   ${protobuf_source_dir}/src/google/protobuf/repeated_ptr_field.cc
   ${protobuf_source_dir}/src/google/protobuf/service.cc
-  ${protobuf_source_dir}/src/google/protobuf/source_context.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/stubs/common.cc
-  ${protobuf_source_dir}/src/google/protobuf/struct.pb.cc
-  ${protobuf_source_dir}/src/google/protobuf/stubs/substitute.cc
   ${protobuf_source_dir}/src/google/protobuf/text_format.cc
-  ${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc
-  ${protobuf_source_dir}/src/google/protobuf/type.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/unknown_field_set.cc
   ${protobuf_source_dir}/src/google/protobuf/util/delimited_message_util.cc
   ${protobuf_source_dir}/src/google/protobuf/util/field_comparator.cc
   ${protobuf_source_dir}/src/google/protobuf/util/field_mask_util.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/datapiece.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/default_value_objectwriter.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/error_listener.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/field_mask_utility.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/json_escaping.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/json_objectwriter.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/json_stream_parser.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/object_writer.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/proto_writer.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/protostream_objectsource.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/protostream_objectwriter.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/type_info.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/type_info_test_helper.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/internal/utility.cc
-  ${protobuf_source_dir}/src/google/protobuf/util/json_util.cc
   ${protobuf_source_dir}/src/google/protobuf/util/message_differencer.cc
   ${protobuf_source_dir}/src/google/protobuf/util/time_util.cc
   ${protobuf_source_dir}/src/google/protobuf/util/type_resolver_util.cc
   ${protobuf_source_dir}/src/google/protobuf/wire_format.cc
-  ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.cc
+  ${protobuf_source_dir}/src/google/protobuf/wire_format_lite.cc
 )
 
 add_library(_libprotobuf ${libprotobuf_lite_files} ${libprotobuf_files})
 if (ENABLE_FUZZING)
     target_compile_options(_libprotobuf PRIVATE "-fsanitize-recover=all")
 endif()
-target_link_libraries(_libprotobuf pthread)
+target_link_libraries(_libprotobuf
-target_link_libraries(_libprotobuf ch_contrib::zlib)
+    pthread
+    ch_contrib::zlib
+    utf8_validity
+    ${protobuf_absl_used_targets})
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     target_link_libraries(_libprotobuf log)
 endif()
@@ -140,23 +211,26 @@ add_library(protobuf::libprotobuf ALIAS _libprotobuf)
 
 
 set(libprotoc_files
+  ${protobuf_source_dir}/src/google/protobuf/compiler/allowlists/editions.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/code_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/command_line_interface.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/enum.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/enum_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/extension.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/map_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/string_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/file.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/helpers.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/map_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/message.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/message_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/padding_optimizer.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/parse_function_generator.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/primitive_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/service.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/string_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/tracker.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_enum.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
@@ -173,6 +247,7 @@ set(libprotoc_files
   ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/names.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/context.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/doc_comment.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/enum.cc
@@ -195,38 +270,55 @@ set(libprotoc_files
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/message_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/message_field_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/message_lite.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/java/message_serialization.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/name_resolver.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/java/names.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/primitive_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/primitive_field_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/service.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/shared_code_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/string_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/string_field_lite.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/enum.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/enum_field.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_extension.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/extension.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/field.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_file.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/file.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_generator.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/generator.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/helpers.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/import_writer.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_message.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/line_consumer.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/map_field.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/message.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/message_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/names.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/oneof.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/primitive_field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/text_format_decode_data.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/php/names.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/php/php_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/python/generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/python/helpers.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/python/pyi_generator.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/retention.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/ruby/ruby_generator.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/accessors/accessors.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/accessors/singular_bytes.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/context.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/generator.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/message.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/naming.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc
 )
 
 add_library(_libprotoc ${libprotoc_files})
-target_link_libraries(_libprotoc _libprotobuf)
+target_link_libraries(_libprotoc
+    _libprotobuf
+    ${protobuf_absl_used_targets})
 add_library(protobuf::libprotoc ALIAS _libprotoc)
 
 set(protoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc)
@@ -235,7 +327,11 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
     AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
 
     add_executable(protoc ${protoc_files})
-    target_link_libraries(protoc _libprotoc _libprotobuf pthread)
+    target_link_libraries(protoc _libprotoc
+        _libprotobuf
+        pthread
+        utf8_validity
+        ${protobuf_absl_used_targets})
     add_executable(protobuf::protoc ALIAS protoc)
 
     if (ENABLE_FUZZING)
@@ -255,6 +351,8 @@ else ()
 
         # This is quite ugly but I cannot make dependencies work propery.
 
+        set(abseil_source_dir "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
+
         execute_process(
             COMMAND mkdir -p ${PROTOC_BUILD_DIR}
             COMMAND_ECHO STDOUT)
@@ -269,7 +367,9 @@ else ()
                 "-Dprotobuf_BUILD_CONFORMANCE=0"
                 "-Dprotobuf_BUILD_EXAMPLES=0"
                 "-Dprotobuf_BUILD_PROTOC_BINARIES=1"
-                "${protobuf_source_dir}/cmake"
+                "-DABSL_ROOT_DIR=${abseil_source_dir}"
+                "-DABSL_ENABLE_INSTALL=0"
+                "${protobuf_source_dir}"
             WORKING_DIRECTORY "${PROTOC_BUILD_DIR}"
             COMMAND_ECHO STDOUT)
 
@@ -278,38 +378,6 @@ else ()
             COMMAND_ECHO STDOUT)
     endif ()
 
-#    add_custom_command (
-#        OUTPUT ${PROTOC_BUILD_DIR}
-#        COMMAND mkdir -p ${PROTOC_BUILD_DIR})
-#
-#    add_custom_command (
-#        OUTPUT "${PROTOC_BUILD_DIR}/CMakeCache.txt"
-#
-#        COMMAND ${CMAKE_COMMAND}
-#             -G"${CMAKE_GENERATOR}"
-#             -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
-#             -DCMAKE_C_COMPILER="${CMAKE_C_COMPILER}"
-#             -DCMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}"
-#             -Dprotobuf_BUILD_TESTS=0
-#             -Dprotobuf_BUILD_CONFORMANCE=0
-#             -Dprotobuf_BUILD_EXAMPLES=0
-#             -Dprotobuf_BUILD_PROTOC_BINARIES=1
-#             "${protobuf_source_dir}/cmake"
-#
-#         DEPENDS "${PROTOC_BUILD_DIR}"
-#         WORKING_DIRECTORY "${PROTOC_BUILD_DIR}"
-#         COMMENT "Configuring 'protoc' for host architecture."
-#         USES_TERMINAL)
-#
-#     add_custom_command (
-#         OUTPUT "${PROTOC_BUILD_DIR}/protoc"
-#         COMMAND ${CMAKE_COMMAND} --build "${PROTOC_BUILD_DIR}"
-#         DEPENDS "${PROTOC_BUILD_DIR}/CMakeCache.txt"
-#         COMMENT "Building 'protoc' for host architecture."
-#         USES_TERMINAL)
-#
-#     add_custom_target (protoc-host DEPENDS "${PROTOC_BUILD_DIR}/protoc")
-
     add_executable(protoc IMPORTED GLOBAL)
     set_target_properties (protoc PROPERTIES IMPORTED_LOCATION "${PROTOC_BUILD_DIR}/protoc")
     add_dependencies(protoc "${PROTOC_BUILD_DIR}/protoc")

contrib/grpc

@@ -1 +1 @@
-Subproject commit b723ecae0991bb873fe87a595dfb187178733fde
+Subproject commit 77b2737a709d43d8c6895e3f03ca62b00bd9201c

contrib/grpc-cmake/CMakeLists.txt

@@ -9,50 +9,14 @@ endif()
 set(_gRPC_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc")
 set(_gRPC_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/grpc")
 
-# Use re2 from ClickHouse contrib, not from gRPC third_party.
-set(gRPC_RE2_PROVIDER "clickhouse" CACHE STRING "" FORCE)
-set(_gRPC_RE2_INCLUDE_DIR "")
-set(_gRPC_RE2_LIBRARIES ch_contrib::re2)
-
-# Use zlib from ClickHouse contrib, not from gRPC third_party.
-set(gRPC_ZLIB_PROVIDER "clickhouse" CACHE STRING "" FORCE)
-set(_gRPC_ZLIB_INCLUDE_DIR "")
-set(_gRPC_ZLIB_LIBRARIES ch_contrib::zlib)
-
-# Use protobuf from ClickHouse contrib, not from gRPC third_party.
-set(gRPC_PROTOBUF_PROVIDER "clickhouse" CACHE STRING "" FORCE)
-set(_gRPC_PROTOBUF_LIBRARIES ch_contrib::protobuf)
-set(_gRPC_PROTOBUF_PROTOC "protoc")
-set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protoc>)
-set(_gRPC_PROTOBUF_PROTOC_LIBRARIES ch_contrib::protoc)
-
 if(TARGET OpenSSL::SSL)
   set(gRPC_USE_UNSECURE_LIBRARIES FALSE)
 else()
   set(gRPC_USE_UNSECURE_LIBRARIES TRUE)
 endif()
 
-# Use OpenSSL from ClickHouse contrib, not from gRPC third_party.
+include(grpc.cmake)
-set(gRPC_SSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)
+include(protobuf_generate_grpc.cmake)
-set(_gRPC_SSL_INCLUDE_DIR "")
-set(_gRPC_SSL_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
-
-# Use abseil-cpp from ClickHouse contrib, not from gRPC third_party.
-set(gRPC_ABSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)
-
-# We don't want to build C# extensions.
-set(gRPC_BUILD_CSHARP_EXT OFF)
-
-# TODO: Remove this. We generally like to compile with C++23 but grpc isn't ready yet.
-set (CMAKE_CXX_STANDARD 20)
-
-set(_gRPC_CARES_LIBRARIES ch_contrib::c-ares)
-set(gRPC_CARES_PROVIDER "clickhouse" CACHE STRING "" FORCE)
-add_subdirectory("${_gRPC_SOURCE_DIR}" "${_gRPC_BINARY_DIR}")
-
-# The contrib/grpc/CMakeLists.txt redefined the PROTOBUF_GENERATE_GRPC_CPP() function for its own purposes,
-# so we need to redefine it back.
-include("${ClickHouse_SOURCE_DIR}/contrib/grpc-cmake/protobuf_generate_grpc.cmake")
 
 set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>)
 set(gRPC_PYTHON_PLUGIN $<TARGET_FILE:grpc_python_plugin>)

contrib/libcxx-cmake/CMakeLists.txt

@@ -1,5 +1,3 @@
-include(CheckCXXCompilerFlag)
-
 set(LIBCXX_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libcxx")
 
 set(SRCS

contrib/libunwind

@@ -1 +1 @@
-Subproject commit 30cc1d3fd3655a5cfa0ab112fe320fb9fc0a8344
+Subproject commit 40d8eadf96b127d9b22d53ce7a4fc52aaedea965

contrib/libunwind-cmake/CMakeLists.txt

@@ -1,6 +1,3 @@
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-
 set(LIBUNWIND_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libunwind")
 
 set(LIBUNWIND_CXX_SOURCES
@@ -23,15 +20,7 @@ set(LIBUNWIND_ASM_SOURCES
     "${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersRestore.S"
     "${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersSave.S")
 
-# CMake doesn't pass the correct architecture for Apple prior to CMake 3.19 [1]
+enable_language(ASM)
-# Workaround these two issues by compiling as C.
-#
-#   [1]: https://gitlab.kitware.com/cmake/cmake/-/issues/20771
-if (APPLE AND CMAKE_VERSION VERSION_LESS 3.19)
-    set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)
-else()
-    enable_language(ASM)
-endif()
 
 set(LIBUNWIND_SOURCES
     ${LIBUNWIND_CXX_SOURCES}
@@ -48,27 +37,11 @@ target_compile_definitions(unwind PRIVATE -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG -D_LIB
 # and disable sanitizers (otherwise infinite loop may happen)
 target_compile_options(unwind PRIVATE -O3 -fno-exceptions -funwind-tables -fno-sanitize=all $<$<COMPILE_LANGUAGE:CXX>:-nostdinc++ -fno-rtti>)
 
-check_c_compiler_flag(-Wunused-but-set-variable HAVE_WARNING_UNUSED_BUT_SET_VARIABLE)
+target_compile_options(unwind PRIVATE -Wno-unused-but-set-variable)
-if (HAVE_WARNING_UNUSED_BUT_SET_VARIABLE)
-    target_compile_options(unwind PRIVATE -Wno-unused-but-set-variable)
-endif ()
-
-check_cxx_compiler_flag(-Wmissing-attributes HAVE_WARNING_MISSING_ATTRIBUTES)
-if (HAVE_WARNING_MISSING_ATTRIBUTES)
-    target_compile_options(unwind PRIVATE -Wno-missing-attributes)
-endif ()
-
-check_cxx_compiler_flag(-Wmaybe-uninitialized HAVE_WARNING_MAYBE_UNINITIALIZED)
-if (HAVE_WARNING_MAYBE_UNINITIALIZED)
-    target_compile_options(unwind PRIVATE -Wno-maybe-uninitialized)
-endif ()
 
 # The library is using register variables that are bound to specific registers
 # Example: DwarfInstructions.hpp: register unsigned long long x16 __asm("x16") = cfa;
-check_cxx_compiler_flag(-Wregister HAVE_WARNING_REGISTER)
+target_compile_options(unwind PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-Wno-register>")
-if (HAVE_WARNING_REGISTER)
-    target_compile_options(unwind PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-Wno-register>")
-endif ()
 
 install(
     TARGETS unwind

contrib/llvm-project-cmake/CMakeLists.txt

@@ -61,6 +61,9 @@ set (REQUIRED_LLVM_LIBRARIES
     LLVMDemangle
 )
 
+# Skip useless "install" instructions from CMake:
+set (LLVM_INSTALL_TOOLCHAIN_ONLY 1 CACHE INTERNAL "")
+
 if (ARCH_AMD64)
     set (LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "")
     list(APPEND REQUIRED_LLVM_LIBRARIES LLVMX86Info LLVMX86Desc LLVMX86CodeGen)

contrib/pocketfft

@@ -0,0 +1 @@
+Subproject commit 9efd4da52cf8d28d14531d14e43ad9d913807546

contrib/pocketfft-cmake/CMakeLists.txt

@@ -0,0 +1,10 @@
+option (ENABLE_POCKETFFT "Enable pocketfft" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_POCKETFFT)
+    message(STATUS "Not using pocketfft")
+    return()
+endif()
+
+add_library(_pocketfft INTERFACE)
+target_include_directories(_pocketfft INTERFACE ${ClickHouse_SOURCE_DIR}/contrib/pocketfft)
+add_library(ch_contrib::pocketfft ALIAS _pocketfft)

contrib/qpl-cmake/CMakeLists.txt

@@ -16,8 +16,7 @@ function(GetLibraryVersion _content _outputVar)
     SET(${_outputVar} ${CMAKE_MATCH_1} PARENT_SCOPE)
 endfunction()
 
-FILE(READ "${QPL_PROJECT_DIR}/CMakeLists.txt" HEADER_CONTENT)
+set (QPL_VERSION 1.2.0)
-GetLibraryVersion("${HEADER_CONTENT}" QPL_VERSION)
 
 message(STATUS "Intel QPL version: ${QPL_VERSION}")
 
@@ -28,16 +27,422 @@ message(STATUS "Intel QPL version: ${QPL_VERSION}")
 # The qpl submodule comes with its own version of isal. It contains code which does not exist in upstream isal. It would be nice to link
 # only upstream isal (ch_contrib::isal) but at this point we can't.
 
-include("${QPL_PROJECT_DIR}/cmake/CompileOptions.cmake")
+# ==========================================================================
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+# ==========================================================================
+
+set(QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS "-fno-exceptions;-fno-rtti")
+
+function(modify_standard_language_flag)
+    # Declaring function parameters
+    set(OPTIONS "")
+    set(ONE_VALUE_ARGS
+        LANGUAGE_NAME
+        FLAG_NAME
+        NEW_FLAG_VALUE)
+    set(MULTI_VALUE_ARGS "")
+
+    # Parsing function parameters
+    cmake_parse_arguments(MODIFY
+                          "${OPTIONS}"
+                          "${ONE_VALUE_ARGS}"
+                          "${MULTI_VALUE_ARGS}"
+                          ${ARGN})
+
+    # Variables
+    set(FLAG_REGULAR_EXPRESSION "${MODIFY_FLAG_NAME}.*[ ]*")
+    set(NEW_VALUE "${MODIFY_FLAG_NAME}${MODIFY_NEW_FLAG_VALUE}")
+
+    # Replacing specified flag with new value
+    string(REGEX REPLACE
+           ${FLAG_REGULAR_EXPRESSION} ${NEW_VALUE}
+           NEW_COMPILE_FLAGS
+           "${CMAKE_${MODIFY_LANGUAGE_NAME}_FLAGS}")
+
+    # Returning the value
+    set(CMAKE_${MODIFY_LANGUAGE_NAME}_FLAGS ${NEW_COMPILE_FLAGS} PARENT_SCOPE)
+endfunction()
+
+function(get_function_name_with_default_bit_width in_function_name bit_width out_function_name)
+
+    if(in_function_name MATCHES ".*_i")
+
+        string(REPLACE "_i" "" in_function_name ${in_function_name})
+
+        set(${out_function_name} "${in_function_name}_${bit_width}_i" PARENT_SCOPE)
+
+    else()
+
+        set(${out_function_name} "${in_function_name}_${bit_width}" PARENT_SCOPE)
+
+    endif()
+
+endfunction()
+
+macro(get_list_of_supported_optimizations PLATFORMS_LIST)
+    list(APPEND PLATFORMS_LIST "")
+    list(APPEND PLATFORMS_LIST "px")
+    list(APPEND PLATFORMS_LIST "avx512")
+endmacro(get_list_of_supported_optimizations)
+
+function(generate_unpack_kernel_arrays current_directory PLATFORMS_LIST)
+    list(APPEND UNPACK_POSTFIX_LIST "")
+    list(APPEND UNPACK_PRLE_POSTFIX_LIST "")
+    list(APPEND PACK_POSTFIX_LIST "")
+    list(APPEND PACK_INDEX_POSTFIX_LIST "")
+    list(APPEND SCAN_POSTFIX_LIST "")
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "")
+    list(APPEND DEFAULT_BIT_WIDTH_LIST "")
+
+    #create list of functions that use only 8u 16u 32u postfixes
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "unpack_prle")
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "extract")
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "extract_i")
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "select")
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "select_i")
+    list(APPEND DEFAULT_BIT_WIDTH_FUNCTIONS_LIST "expand")
+
+    #create default bit width list
+    list(APPEND DEFAULT_BIT_WIDTH_LIST "8u")
+    list(APPEND DEFAULT_BIT_WIDTH_LIST "16u")
+    list(APPEND DEFAULT_BIT_WIDTH_LIST "32u")
+
+    #create scan kernel postfixes
+    list(APPEND SCAN_COMPARATOR_LIST "")
+
+    list(APPEND SCAN_COMPARATOR_LIST "eq")
+    list(APPEND SCAN_COMPARATOR_LIST "ne")
+    list(APPEND SCAN_COMPARATOR_LIST "lt")
+    list(APPEND SCAN_COMPARATOR_LIST "le")
+    list(APPEND SCAN_COMPARATOR_LIST "gt")
+    list(APPEND SCAN_COMPARATOR_LIST "ge")
+    list(APPEND SCAN_COMPARATOR_LIST "range")
+    list(APPEND SCAN_COMPARATOR_LIST "not_range")
+
+    foreach(SCAN_COMPARATOR IN LISTS SCAN_COMPARATOR_LIST)
+        list(APPEND SCAN_POSTFIX_LIST "_${SCAN_COMPARATOR}_8u")
+        list(APPEND SCAN_POSTFIX_LIST "_${SCAN_COMPARATOR}_16u8u")
+        list(APPEND SCAN_POSTFIX_LIST "_${SCAN_COMPARATOR}_32u8u")
+    endforeach()
+
+    # create unpack kernel postfixes
+    foreach(input_width RANGE 1 32 1)
+        if(input_width LESS 8 OR input_width EQUAL 8)
+            list(APPEND UNPACK_POSTFIX_LIST "_${input_width}u8u")
+
+        elseif(input_width LESS 16 OR input_width EQUAL 16)
+            list(APPEND UNPACK_POSTFIX_LIST "_${input_width}u16u")
+
+        else()
+            list(APPEND UNPACK_POSTFIX_LIST "_${input_width}u32u")
+        endif()
+    endforeach()
+
+    # create pack kernel postfixes
+    foreach(output_width RANGE 1 8 1)
+        list(APPEND PACK_POSTFIX_LIST "_8u${output_width}u")
+    endforeach()
+
+    foreach(output_width RANGE 9 16 1)
+        list(APPEND PACK_POSTFIX_LIST "_16u${output_width}u")
+    endforeach()
+
+    foreach(output_width RANGE 17 32 1)
+        list(APPEND PACK_POSTFIX_LIST "_32u${output_width}u")
+    endforeach()
+
+    list(APPEND PACK_POSTFIX_LIST "_8u16u")
+    list(APPEND PACK_POSTFIX_LIST "_8u32u")
+    list(APPEND PACK_POSTFIX_LIST "_16u32u")
+
+    # create pack index kernel postfixes
+    list(APPEND PACK_INDEX_POSTFIX_LIST "_nu")
+    list(APPEND PACK_INDEX_POSTFIX_LIST "_8u")
+    list(APPEND PACK_INDEX_POSTFIX_LIST "_8u16u")
+    list(APPEND PACK_INDEX_POSTFIX_LIST "_8u32u")
+
+    # write to file
+    file(MAKE_DIRECTORY ${current_directory}/generated)
+
+    foreach(PLATFORM_VALUE IN LISTS PLATFORMS_LIST)
+        set(directory "${current_directory}/generated")
+        set(PLATFORM_PREFIX "${PLATFORM_VALUE}_")
+
+        #
+        # Write unpack table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}unpack.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "unpack_table_t ${PLATFORM_PREFIX}unpack_table = {\n")
+
+        #write LE kernels
+        foreach(UNPACK_POSTFIX IN LISTS UNPACK_POSTFIX_LIST)
+            file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "\t${PLATFORM_PREFIX}qplc_unpack${UNPACK_POSTFIX},\n")
+        endforeach()
+
+        #write BE kernels
+
+        #get last element of the list
+        set(LAST_ELEMENT "")
+        list(GET UNPACK_POSTFIX_LIST -1 LAST_ELEMENT)
+
+        foreach(UNPACK_POSTFIX IN LISTS UNPACK_POSTFIX_LIST)
+
+            if(UNPACK_POSTFIX STREQUAL LAST_ELEMENT)
+                file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "\t${PLATFORM_PREFIX}qplc_unpack_be${UNPACK_POSTFIX}};\n")
+            else()
+                file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "\t${PLATFORM_PREFIX}qplc_unpack_be${UNPACK_POSTFIX},\n")
+            endif()
+        endforeach()
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}unpack.cpp "}\n")
+
+        #
+        # Write pack table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}pack.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "pack_table_t ${PLATFORM_PREFIX}pack_table = {\n")
+
+        #write LE kernels
+        foreach(PACK_POSTFIX IN LISTS PACK_POSTFIX_LIST)
+            file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "\t${PLATFORM_PREFIX}qplc_pack${PACK_POSTFIX},\n")
+        endforeach()
+
+        #write BE kernels
+
+        #get last element of the list
+        set(LAST_ELEMENT "")
+        list(GET PACK_POSTFIX_LIST -1 LAST_ELEMENT)
+
+        foreach(PACK_POSTFIX IN LISTS PACK_POSTFIX_LIST)
+
+            if(PACK_POSTFIX STREQUAL LAST_ELEMENT)
+                file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "\t${PLATFORM_PREFIX}qplc_pack_be${PACK_POSTFIX}};\n")
+            else()
+                file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "\t${PLATFORM_PREFIX}qplc_pack_be${PACK_POSTFIX},\n")
+            endif()
+        endforeach()
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack.cpp "}\n")
+
+        #
+        # Write scan table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}scan.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan.cpp "scan_table_t ${PLATFORM_PREFIX}scan_table = {\n")
+
+        #get last element of the list
+        set(LAST_ELEMENT "")
+        list(GET SCAN_POSTFIX_LIST -1 LAST_ELEMENT)
+
+        foreach(SCAN_POSTFIX IN LISTS SCAN_POSTFIX_LIST)
+
+            if(SCAN_POSTFIX STREQUAL LAST_ELEMENT)
+                file(APPEND ${directory}/${PLATFORM_PREFIX}scan.cpp "\t${PLATFORM_PREFIX}qplc_scan${SCAN_POSTFIX}};\n")
+            else()
+                file(APPEND ${directory}/${PLATFORM_PREFIX}scan.cpp "\t${PLATFORM_PREFIX}qplc_scan${SCAN_POSTFIX},\n")
+            endif()
+        endforeach()
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan.cpp "}\n")
+
+        #
+        # Write scan_i table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}scan_i.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan_i.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan_i.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan_i.cpp "scan_i_table_t ${PLATFORM_PREFIX}scan_i_table = {\n")
+
+        #get last element of the list
+        set(LAST_ELEMENT "")
+        list(GET SCAN_POSTFIX_LIST -1 LAST_ELEMENT)
+
+        foreach(SCAN_POSTFIX IN LISTS SCAN_POSTFIX_LIST)
+
+            if(SCAN_POSTFIX STREQUAL LAST_ELEMENT)
+                file(APPEND ${directory}/${PLATFORM_PREFIX}scan_i.cpp "\t${PLATFORM_PREFIX}qplc_scan${SCAN_POSTFIX}_i};\n")
+            else()
+                file(APPEND ${directory}/${PLATFORM_PREFIX}scan_i.cpp "\t${PLATFORM_PREFIX}qplc_scan${SCAN_POSTFIX}_i,\n")
+            endif()
+        endforeach()
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}scan_i.cpp "}\n")
+
+        #
+        # Write pack_index table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}pack_index.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "pack_index_table_t ${PLATFORM_PREFIX}pack_index_table = {\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_bits_nu,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_index_8u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_index_8u16u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_index_8u32u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_bits_be_nu,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_index_8u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_index_be_8u16u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "\t${PLATFORM_PREFIX}qplc_pack_index_be_8u32u};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}pack_index.cpp "}\n")
+
+        #
+        # Write default bit width functions
+        #
+        foreach(DEAULT_BIT_WIDTH_FUNCTION IN LISTS DEFAULT_BIT_WIDTH_FUNCTIONS_LIST)
+            file(WRITE ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "#include \"qplc_api.h\"\n")
+            file(APPEND ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+            file(APPEND ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+            file(APPEND ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "${DEAULT_BIT_WIDTH_FUNCTION}_table_t ${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}_table = {\n")
+
+            #get last element of the list
+            set(LAST_ELEMENT "")
+            list(GET DEFAULT_BIT_WIDTH_LIST -1 LAST_ELEMENT)
+
+            foreach(BIT_WIDTH IN LISTS DEFAULT_BIT_WIDTH_LIST)
+
+                set(FUNCTION_NAME "")
+                get_function_name_with_default_bit_width(${DEAULT_BIT_WIDTH_FUNCTION} ${BIT_WIDTH} FUNCTION_NAME)
+
+                if(BIT_WIDTH STREQUAL LAST_ELEMENT)
+                    file(APPEND ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "\t${PLATFORM_PREFIX}qplc_${FUNCTION_NAME}};\n")
+                else()
+                 file(APPEND ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "\t${PLATFORM_PREFIX}qplc_${FUNCTION_NAME},\n")
+                 endif()
+            endforeach()
+
+            file(APPEND ${directory}/${PLATFORM_PREFIX}${DEAULT_BIT_WIDTH_FUNCTION}.cpp "}\n")
+        endforeach()
+
+        #
+        # Write aggregates table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}aggregates.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "aggregates_table_t ${PLATFORM_PREFIX}aggregates_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "\t${PLATFORM_PREFIX}qplc_bit_aggregates_8u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "\t${PLATFORM_PREFIX}qplc_aggregates_8u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "\t${PLATFORM_PREFIX}qplc_aggregates_16u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "\t${PLATFORM_PREFIX}qplc_aggregates_32u};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}aggregates.cpp "}\n")
+
+        #
+        # Write mem_copy functions table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "memory_copy_table_t ${PLATFORM_PREFIX}memory_copy_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "\t${PLATFORM_PREFIX}qplc_copy_8u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "\t${PLATFORM_PREFIX}qplc_copy_16u,\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "\t${PLATFORM_PREFIX}qplc_copy_32u};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}memory_copy.cpp "}\n")
+
+        #
+        # Write mem_copy functions table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}zero.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}zero.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}zero.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}zero.cpp "zero_table_t ${PLATFORM_PREFIX}zero_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}zero.cpp "\t${PLATFORM_PREFIX}qplc_zero_8u};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}zero.cpp "}\n")
+
+        #
+        # Write move functions table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}move.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}move.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}move.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}move.cpp "move_table_t ${PLATFORM_PREFIX}move_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}move.cpp "\t${PLATFORM_PREFIX}qplc_move_8u};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}move.cpp "}\n")
+
+        #
+        # Write crc64 function table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}crc64.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}crc64.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}crc64.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}crc64.cpp "crc64_table_t ${PLATFORM_PREFIX}crc64_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}crc64.cpp "\t${PLATFORM_PREFIX}qplc_crc64};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}crc64.cpp "}\n")
+
+        #
+        # Write xor_checksum function table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}xor_checksum.cpp "#include \"qplc_api.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}xor_checksum.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}xor_checksum.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}xor_checksum.cpp "xor_checksum_table_t ${PLATFORM_PREFIX}xor_checksum_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}xor_checksum.cpp "\t${PLATFORM_PREFIX}qplc_xor_checksum_8u};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}xor_checksum.cpp "}\n")
+
+        #
+        # Write deflate functions table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}deflate.cpp "#include \"deflate_slow_icf.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "#include \"deflate_hash_table.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "#include \"deflate_histogram.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "deflate_table_t ${PLATFORM_PREFIX}deflate_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "\t reinterpret_cast<void *>(&${PLATFORM_PREFIX}slow_deflate_icf_body),\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "\t reinterpret_cast<void *>(&${PLATFORM_PREFIX}deflate_histogram_reset),\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "\t reinterpret_cast<void *>(&${PLATFORM_PREFIX}deflate_hash_table_reset)};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate.cpp "}\n")
+
+        #
+        # Write deflate fix functions table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}deflate_fix.cpp "#include \"deflate_slow.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate_fix.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate_fix.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate_fix.cpp "deflate_fix_table_t ${PLATFORM_PREFIX}deflate_fix_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate_fix.cpp "\t reinterpret_cast<void *>(&${PLATFORM_PREFIX}slow_deflate_body)};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}deflate_fix.cpp "}\n")
+
+        #
+        # Write setup_dictionary functions table
+        #
+        file(WRITE ${directory}/${PLATFORM_PREFIX}setup_dictionary.cpp "#include \"deflate_slow_utils.h\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}setup_dictionary.cpp "#include \"dispatcher/dispatcher.hpp\"\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}setup_dictionary.cpp "namespace qpl::core_sw::dispatcher\n{\n")
+        file(APPEND ${directory}/${PLATFORM_PREFIX}setup_dictionary.cpp "setup_dictionary_table_t ${PLATFORM_PREFIX}setup_dictionary_table = {\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}setup_dictionary.cpp "\t reinterpret_cast<void *>(&${PLATFORM_PREFIX}setup_dictionary)};\n")
+
+        file(APPEND ${directory}/${PLATFORM_PREFIX}setup_dictionary.cpp "}\n")
+
+    endforeach()
+endfunction()
 
-# check nasm compiler
-include(CheckLanguage)
-check_language(ASM_NASM)
-if(NOT CMAKE_ASM_NASM_COMPILER)
-    message(FATAL_ERROR "Please install NASM from 'https://www.nasm.us/' because NASM compiler can not be found!")
-endif()
 
-# [SUBDIR]isal
 enable_language(ASM_NASM)
 
 set(ISAL_C_SRC ${QPL_SRC_DIR}/isal/igzip/adler32_base.c
@@ -107,11 +512,6 @@ set_target_properties(isal PROPERTIES
                         CXX_STANDARD 11
                         C_STANDARD 99)
 
-target_compile_options(isal PRIVATE
-                       "$<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS}>"
-                       "$<$<CONFIG:Debug>:>"
-                       "$<$<CONFIG:Release>:>")
-
 # AS_FEATURE_LEVEL=10 means "Check SIMD capabilities of the target system at runtime and use up to AVX512 if available".
 # HAVE_KNOWS_AVX512 means rely on AVX512 being available on the target system.
 target_compile_options(isal_asm PRIVATE "-I${QPL_SRC_DIR}/isal/include/"
@@ -164,15 +564,7 @@ foreach(PLATFORM_ID IN LISTS PLATFORMS_LIST)
                                 PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-sw/src/compression/include>
                                 PRIVATE $<TARGET_PROPERTY:isal,INTERFACE_INCLUDE_DIRECTORIES>)
 
-    set_target_properties(qplcore_${PLATFORM_ID} PROPERTIES
+        # Set specific compiler options and/or definitions based on a platform
-                                $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>)
-
-    target_compile_options(qplcore_${PLATFORM_ID}
-                            PRIVATE ${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS}
-                            PRIVATE "$<$<CONFIG:Debug>:>"
-                            PRIVATE "$<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>")
-
-    # Set specific compiler options and/or definitions based on a platform
     if (${PLATFORM_ID} MATCHES "avx512")
         target_compile_definitions(qplcore_${PLATFORM_ID} PRIVATE PLATFORM=2)
         target_compile_options(qplcore_${PLATFORM_ID} PRIVATE -march=skylake-avx512)
@@ -221,10 +613,7 @@ set_target_properties(qplcore_sw_dispatcher PROPERTIES CXX_STANDARD 17)
 target_compile_definitions(qplcore_sw_dispatcher PUBLIC -DQPL_LIB)
 
 target_compile_options(qplcore_sw_dispatcher
-        PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
+        PRIVATE ${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS})
-                                       ${QPL_LINUX_TOOLCHAIN_DYNAMIC_LIBRARY_FLAGS};
-                                       $<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>>
-        PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU>:${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS}>)
 
 # [SUBDIR]core-iaa
 file(GLOB HW_PATH_SRC ${QPL_SRC_DIR}/core-iaa/sources/aecs/*.c
@@ -249,14 +638,6 @@ target_include_directories(core_iaa
         PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/sources/c_api> # own_checkers.h
         PRIVATE $<TARGET_PROPERTY:qplcore_sw_dispatcher,INTERFACE_INCLUDE_DIRECTORIES>)
 
-set_target_properties(core_iaa PROPERTIES
-        $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>
-        CXX_STANDARD 17)
-
-target_compile_options(core_iaa
-        PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
-        $<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>>)
-
 target_compile_features(core_iaa PRIVATE c_std_11)
 
 target_compile_definitions(core_iaa PRIVATE QPL_BADARG_CHECK
@@ -286,10 +667,7 @@ set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
         $<TARGET_OBJECTS:middle_layer_lib>)
 
 target_compile_options(middle_layer_lib
-        PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
+        PRIVATE ${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS})
-                                       ${QPL_LINUX_TOOLCHAIN_DYNAMIC_LIBRARY_FLAGS};
-                                       $<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>>
-        PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU>:${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS}>)
 
 target_compile_definitions(middle_layer_lib
         PUBLIC QPL_VERSION="${QPL_VERSION}"
@@ -324,15 +702,8 @@ target_include_directories(_qpl
         PRIVATE $<TARGET_PROPERTY:middle_layer_lib,INTERFACE_INCLUDE_DIRECTORIES>
         PRIVATE $<BUILD_INTERFACE:${QPL_SRC_DIR}/c_api>)
 
-set_target_properties(_qpl PROPERTIES
-        $<$<C_COMPILER_ID:GNU>:C_STANDARD 17>
-        CXX_STANDARD 17)
-
 target_compile_options(_qpl
-        PRIVATE $<$<C_COMPILER_ID:GNU>:${QPL_LINUX_TOOLCHAIN_REQUIRED_FLAGS};
+        PRIVATE ${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS})
-                                       ${QPL_LINUX_TOOLCHAIN_DYNAMIC_LIBRARY_FLAGS};
-                                       $<$<CONFIG:Release>:-O3;-D_FORTIFY_SOURCE=2>>
-        PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU>:${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS}>)
 
 target_compile_definitions(_qpl
         PRIVATE -DQPL_LIB

contrib/qpl-cmake/benchmark_sample/client_scripts/allin1_ssb.sh

@@ -1,530 +0,0 @@
-#!/bin/bash
-ckhost="localhost"
-ckport=("9000" "9001" "9002" "9003")
-WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
-OUTPUT_DIR="${WORKING_DIR}/output"
-LOG_DIR="${OUTPUT_DIR}/log"
-RAWDATA_DIR="${WORKING_DIR}/rawdata_dir"
-database_dir="${WORKING_DIR}/database_dir"
-CLIENT_SCRIPTS_DIR="${WORKING_DIR}/client_scripts"
-LOG_PACK_FILE="$(date +%Y-%m-%d-%H-%M-%S)"
-QUERY_FILE="queries_ssb.sql"
-SERVER_BIND_CMD[0]="numactl -m 0 -N 0"
-SERVER_BIND_CMD[1]="numactl -m 0 -N 0"
-SERVER_BIND_CMD[2]="numactl -m 1 -N 1"
-SERVER_BIND_CMD[3]="numactl -m 1 -N 1"
-CLIENT_BIND_CMD=""
-SSB_GEN_FACTOR=20
-TABLE_NAME="lineorder_flat"
-TALBE_ROWS="119994608"
-CODEC_CONFIG="lz4 deflate zstd"
-
-# define instance number
-inst_num=$1
-if [ ! -n "$1" ]; then
-        echo "Please clarify instance number from 1,2,3 or 4"
-        exit 1
-else
-        echo "Benchmarking with instance number:$1"
-fi
-
-if [ ! -d "$OUTPUT_DIR" ]; then
-mkdir $OUTPUT_DIR
-fi
-if [ ! -d "$LOG_DIR" ]; then
-mkdir $LOG_DIR
-fi
-if [ ! -d "$RAWDATA_DIR" ]; then
-mkdir $RAWDATA_DIR
-fi
-
-# define different directories
-dir_server=("" "_s2" "_s3" "_s4")
-ckreadSql="
-    CREATE TABLE customer
-    (
-            C_CUSTKEY       UInt32,
-            C_NAME          String,
-            C_ADDRESS       String,
-            C_CITY          LowCardinality(String),
-            C_NATION        LowCardinality(String),
-            C_REGION        LowCardinality(String),
-            C_PHONE         String,
-            C_MKTSEGMENT    LowCardinality(String)
-    )
-    ENGINE = MergeTree ORDER BY (C_CUSTKEY);
-
-    CREATE TABLE lineorder
-    (
-        LO_ORDERKEY             UInt32,
-        LO_LINENUMBER           UInt8,
-        LO_CUSTKEY              UInt32,
-        LO_PARTKEY              UInt32,
-        LO_SUPPKEY              UInt32,
-        LO_ORDERDATE            Date,
-        LO_ORDERPRIORITY        LowCardinality(String),
-        LO_SHIPPRIORITY         UInt8,
-        LO_QUANTITY             UInt8,
-        LO_EXTENDEDPRICE        UInt32,
-        LO_ORDTOTALPRICE        UInt32,
-        LO_DISCOUNT             UInt8,
-        LO_REVENUE              UInt32,
-        LO_SUPPLYCOST           UInt32,
-        LO_TAX                  UInt8,
-        LO_COMMITDATE           Date,
-        LO_SHIPMODE             LowCardinality(String)
-    )
-    ENGINE = MergeTree PARTITION BY toYear(LO_ORDERDATE) ORDER BY (LO_ORDERDATE, LO_ORDERKEY);
-
-    CREATE TABLE part
-    (
-            P_PARTKEY       UInt32,
-            P_NAME          String,
-            P_MFGR          LowCardinality(String),
-            P_CATEGORY      LowCardinality(String),
-            P_BRAND         LowCardinality(String),
-            P_COLOR         LowCardinality(String),
-            P_TYPE          LowCardinality(String),
-            P_SIZE          UInt8,
-            P_CONTAINER     LowCardinality(String)
-    )
-    ENGINE = MergeTree ORDER BY P_PARTKEY;
-
-    CREATE TABLE supplier
-    (
-            S_SUPPKEY       UInt32,
-            S_NAME          String,
-            S_ADDRESS       String,
-            S_CITY          LowCardinality(String),
-            S_NATION        LowCardinality(String),
-            S_REGION        LowCardinality(String),
-            S_PHONE         String
-    )
-    ENGINE = MergeTree ORDER BY S_SUPPKEY;
-"
-supplier_table="
-   CREATE TABLE supplier
-    (
-            S_SUPPKEY       UInt32,
-            S_NAME          String,
-            S_ADDRESS       String,
-            S_CITY          LowCardinality(String),
-            S_NATION        LowCardinality(String),
-            S_REGION        LowCardinality(String),
-            S_PHONE         String
-    )
-    ENGINE = MergeTree ORDER BY S_SUPPKEY;
-"
-part_table="
-    CREATE TABLE part
-    (
-            P_PARTKEY       UInt32,
-            P_NAME          String,
-            P_MFGR          LowCardinality(String),
-            P_CATEGORY      LowCardinality(String),
-            P_BRAND         LowCardinality(String),
-            P_COLOR         LowCardinality(String),
-            P_TYPE          LowCardinality(String),
-            P_SIZE          UInt8,
-            P_CONTAINER     LowCardinality(String)
-    )
-    ENGINE = MergeTree ORDER BY P_PARTKEY;
-"
-lineorder_table="
-    CREATE TABLE lineorder
-    (
-        LO_ORDERKEY             UInt32,
-        LO_LINENUMBER           UInt8,
-        LO_CUSTKEY              UInt32,
-        LO_PARTKEY              UInt32,
-        LO_SUPPKEY              UInt32,
-        LO_ORDERDATE            Date,
-        LO_ORDERPRIORITY        LowCardinality(String),
-        LO_SHIPPRIORITY         UInt8,
-        LO_QUANTITY             UInt8,
-        LO_EXTENDEDPRICE        UInt32,
-        LO_ORDTOTALPRICE        UInt32,
-        LO_DISCOUNT             UInt8,
-        LO_REVENUE              UInt32,
-        LO_SUPPLYCOST           UInt32,
-        LO_TAX                  UInt8,
-        LO_COMMITDATE           Date,
-        LO_SHIPMODE             LowCardinality(String)
-    )
-    ENGINE = MergeTree PARTITION BY toYear(LO_ORDERDATE) ORDER BY (LO_ORDERDATE, LO_ORDERKEY);
-"
-customer_table="
-    CREATE TABLE customer
-    (
-            C_CUSTKEY       UInt32,
-            C_NAME          String,
-            C_ADDRESS       String,
-            C_CITY          LowCardinality(String),
-            C_NATION        LowCardinality(String),
-            C_REGION        LowCardinality(String),
-            C_PHONE         String,
-            C_MKTSEGMENT    LowCardinality(String)
-    )
-    ENGINE = MergeTree ORDER BY (C_CUSTKEY);
-"
-
-lineorder_flat_table="
-    SET max_memory_usage = 20000000000;
-    CREATE TABLE lineorder_flat
-    ENGINE = MergeTree
-    PARTITION BY toYear(LO_ORDERDATE)
-    ORDER BY (LO_ORDERDATE, LO_ORDERKEY) AS
-    SELECT
-        l.LO_ORDERKEY AS LO_ORDERKEY,
-        l.LO_LINENUMBER AS LO_LINENUMBER,
-        l.LO_CUSTKEY AS LO_CUSTKEY,
-        l.LO_PARTKEY AS LO_PARTKEY,
-        l.LO_SUPPKEY AS LO_SUPPKEY,
-        l.LO_ORDERDATE AS LO_ORDERDATE,
-        l.LO_ORDERPRIORITY AS LO_ORDERPRIORITY,
-        l.LO_SHIPPRIORITY AS LO_SHIPPRIORITY,
-        l.LO_QUANTITY AS LO_QUANTITY,
-        l.LO_EXTENDEDPRICE AS LO_EXTENDEDPRICE,
-        l.LO_ORDTOTALPRICE AS LO_ORDTOTALPRICE,
-        l.LO_DISCOUNT AS LO_DISCOUNT,
-        l.LO_REVENUE AS LO_REVENUE,
-        l.LO_SUPPLYCOST AS LO_SUPPLYCOST,
-        l.LO_TAX AS LO_TAX,
-        l.LO_COMMITDATE AS LO_COMMITDATE,
-        l.LO_SHIPMODE AS LO_SHIPMODE,
-        c.C_NAME AS C_NAME,
-        c.C_ADDRESS AS C_ADDRESS,
-        c.C_CITY AS C_CITY,
-        c.C_NATION AS C_NATION,
-        c.C_REGION AS C_REGION,
-        c.C_PHONE AS C_PHONE,
-        c.C_MKTSEGMENT AS C_MKTSEGMENT,
-        s.S_NAME AS S_NAME,
-        s.S_ADDRESS AS S_ADDRESS,
-        s.S_CITY AS S_CITY,
-        s.S_NATION AS S_NATION,
-        s.S_REGION AS S_REGION,
-        s.S_PHONE AS S_PHONE,
-        p.P_NAME AS P_NAME,
-        p.P_MFGR AS P_MFGR,
-        p.P_CATEGORY AS P_CATEGORY,
-        p.P_BRAND AS P_BRAND,
-        p.P_COLOR AS P_COLOR,
-        p.P_TYPE AS P_TYPE,
-        p.P_SIZE AS P_SIZE,
-        p.P_CONTAINER AS P_CONTAINER
-    FROM lineorder AS l
-    INNER JOIN customer AS c ON c.C_CUSTKEY = l.LO_CUSTKEY
-    INNER JOIN supplier AS s ON s.S_SUPPKEY = l.LO_SUPPKEY
-    INNER JOIN part AS p ON p.P_PARTKEY = l.LO_PARTKEY;
-    show settings ilike 'max_memory_usage';
-"
- 
-function insert_data(){
-        echo "insert_data:$1"
-        create_table_prefix="clickhouse client --host ${ckhost} --port $2 --multiquery -q"
-        insert_data_prefix="clickhouse client --query "
-        case $1 in
-          all)
-                clickhouse client --host ${ckhost} --port $2 --multiquery -q"$ckreadSql" && {
-                ${insert_data_prefix} "INSERT INTO customer FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/customer.tbl --port=$2
-                ${insert_data_prefix} "INSERT INTO part FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/part.tbl --port=$2
-                ${insert_data_prefix} "INSERT INTO supplier FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/supplier.tbl --port=$2
-                ${insert_data_prefix} "INSERT INTO lineorder FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/lineorder.tbl --port=$2
-                }
-                ${create_table_prefix}"${lineorder_flat_table}" 
-          ;;
-          customer)
-                echo ${create_table_prefix}\"${customer_table}\"
-                ${create_table_prefix}"${customer_table}" && {
-                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
-                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
-                }
-          ;;
-          part)
-                echo ${create_table_prefix}\"${part_table}\"
-                ${create_table_prefix}"${part_table}" && {
-                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
-                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
-                }
-          ;;
-          supplier)
-                echo ${create_table_prefix}"${supplier_table}"
-                ${create_table_prefix}"${supplier_table}" && {
-                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
-                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
-                }
-          ;;
-          lineorder)
-                echo ${create_table_prefix}"${lineorder_table}"
-                ${create_table_prefix}"${lineorder_table}" && {
-                echo "${insert_data_prefix} \"INSERT INTO $1 FORMAT CSV\" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2"
-                ${insert_data_prefix} "INSERT INTO $1 FORMAT CSV" < ${RAWDATA_DIR}/ssb-dbgen/$1.tbl --port=$2
-                }
-          ;;
-          lineorder_flat)
-                echo ${create_table_prefix}"${lineorder_flat_table}"
-                ${create_table_prefix}"${lineorder_flat_table}" 
-                return 0
-          ;;
-          *)
-                exit 0
-                ;;
-
-        esac
-}
-
-function check_sql(){
-        select_sql="select * from "$1" limit 1"
-        clickhouse client --host ${ckhost} --port $2 --multiquery -q"${select_sql}"
-}
-
-function check_table(){
-        checknum=0
-        source_tables="customer part supplier lineorder lineorder_flat"
-        test_tables=${1:-${source_tables}}
-        echo "Checking table data required in server..."
-        for i in $(seq 0 $[inst_num-1])
-        do
-                for j in `echo ${test_tables}`
-                do
-                        check_sql $j ${ckport[i]} &> /dev/null || {
-                                let checknum+=1 && insert_data "$j" ${ckport[i]}
-                        }
-                done
-        done
-
-        for i in $(seq 0 $[inst_num-1])
-        do
-                echo "clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q\"select count() from ${TABLE_NAME};\""
-                var=$(clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q"select count() from ${TABLE_NAME};")
-                if [ $var -eq $TALBE_ROWS ];then
-                        echo "Instance_${i} Table data integrity check OK -> Rows:$var"
-                else
-                        echo  "Instance_${i} Table data integrity check Failed -> Rows:$var"
-                        exit 1
-                fi
-        done
-        if [ $checknum -gt 0 ];then
-                echo "Need sleep 10s after first table data insertion...$checknum"
-                sleep 10
-        fi
-}
-
-function check_instance(){
-instance_alive=0
-for i in {1..10}
-do
-        sleep 1
-        netstat -nltp | grep ${1} > /dev/null
-        if [ $? -ne 1 ];then
-                instance_alive=1
-                break
-        fi
-        
-done
-
-if [ $instance_alive -eq 0 ];then
-        echo "check_instance -> clickhouse server instance faild to launch due to 10s timeout!"
-        exit 1
-else
-        echo "check_instance -> clickhouse server instance launch successfully!"
-fi
-}
-
-function start_clickhouse_for_insertion(){
-        echo "start_clickhouse_for_insertion"
-        for i in $(seq 0 $[inst_num-1])
-	do                
-                echo "cd ${database_dir}/$1${dir_server[i]}"
-                echo "${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&${LOG_DIR}/${1}_${i}_server_log& > /dev/null"
-                
-	        cd ${database_dir}/$1${dir_server[i]}
-	        ${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&${LOG_DIR}/${1}_${i}_server_log& > /dev/null
-                check_instance ${ckport[i]}
-        done
-}
-
-function start_clickhouse_for_stressing(){
-        echo "start_clickhouse_for_stressing"
-        for i in $(seq 0 $[inst_num-1])
-	do
-                echo "cd ${database_dir}/$1${dir_server[i]}"
-                echo "${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&/dev/null&"
-                
-	        cd ${database_dir}/$1${dir_server[i]}
-	        ${SERVER_BIND_CMD[i]} clickhouse server -C config_${1}${dir_server[i]}.xml >&/dev/null&
-                check_instance ${ckport[i]}
-        done
-}
-yum -y install git make gcc sudo net-tools &> /dev/null
-pip3 install clickhouse_driver numpy &> /dev/null
-test -d ${RAWDATA_DIR}/ssb-dbgen || git clone https://github.com/vadimtk/ssb-dbgen.git ${RAWDATA_DIR}/ssb-dbgen && cd ${RAWDATA_DIR}/ssb-dbgen
-
-if [ ! -f ${RAWDATA_DIR}/ssb-dbgen/dbgen ];then
-        make && {
-        test -f ${RAWDATA_DIR}/ssb-dbgen/customer.tbl || echo y |./dbgen -s ${SSB_GEN_FACTOR} -T c
-        test -f ${RAWDATA_DIR}/ssb-dbgen/part.tbl  || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T p
-        test -f ${RAWDATA_DIR}/ssb-dbgen/supplier.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T s
-        test -f ${RAWDATA_DIR}/ssb-dbgen/date.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T d
-        test -f ${RAWDATA_DIR}/ssb-dbgen/lineorder.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T l
-        }
-else
-        test -f ${RAWDATA_DIR}/ssb-dbgen/customer.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T c
-        test -f ${RAWDATA_DIR}/ssb-dbgen/part.tbl  || echo y |  ./dbgen -s ${SSB_GEN_FACTOR} -T p
-        test -f ${RAWDATA_DIR}/ssb-dbgen/supplier.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T s
-        test -f ${RAWDATA_DIR}/ssb-dbgen/date.tbl || echo y |  ./dbgen -s ${SSB_GEN_FACTOR} -T d
-        test -f ${RAWDATA_DIR}/ssb-dbgen/lineorder.tbl || echo y | ./dbgen -s ${SSB_GEN_FACTOR} -T l
-
-fi
-
-filenum=`find ${RAWDATA_DIR}/ssb-dbgen/ -name "*.tbl" | wc -l`
-
-if [ $filenum -ne 5 ];then
-        echo "generate ssb data file *.tbl faild"
-        exit 1
-fi
-
-function kill_instance(){
-instance_alive=1  
-for i in {1..2}
-do
-	pkill clickhouse && sleep 5
-        instance_alive=0        
-        for i in $(seq 0 $[inst_num-1])
-        do
-                netstat -nltp | grep ${ckport[i]} > /dev/null
-                if [ $? -ne 1 ];then
-                        instance_alive=1
-                        break;
-                fi
-        done
-        if [ $instance_alive -eq 0 ];then
-                break;
-        fi        
-done
-if [ $instance_alive -eq 0 ];then
-        echo "kill_instance OK!"
-else
-        echo "kill_instance Failed -> clickhouse server instance still alive due to 10s timeout"
-        exit 1        
-fi
-}
-
-function run_test(){
-is_xml=0
-for i in $(seq 0 $[inst_num-1])
-do
-        if [ -f ${database_dir}/${1}${dir_server[i]}/config_${1}${dir_server[i]}.xml ]; then
-                is_xml=$[is_xml+1]
-        fi
-done
-if [ $is_xml -eq $inst_num ];then
-        echo "Benchmark with $inst_num instance"
-        start_clickhouse_for_insertion ${1}
-
-        for i in $(seq 0 $[inst_num-1])
-        do
-                clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q"show databases;" >/dev/null
-        done
-
-        if [ $? -eq 0 ];then
-                check_table
-        fi
-        kill_instance
-
-        if [ $1 == "deflate" ];then
-	        test -f ${LOG_DIR}/${1}_server_log && deflatemsg=`cat ${LOG_DIR}/${1}_server_log | grep DeflateJobHWPool`
-	        if [ -n "$deflatemsg" ];then
-	                echo ------------------------------------------------------
-	                echo $deflatemsg
-	                echo ------------------------------------------------------
-	        fi
-	fi
-        echo "Check table data required in server_${1} -> Done! "
-        
-        start_clickhouse_for_stressing ${1}
-        for i in $(seq 0 $[inst_num-1])
-        do
-                clickhouse client --host ${ckhost} --port ${ckport[i]} -m -q"show databases;" >/dev/null
-        done
-        if [ $? -eq 0 ];then
-                test -d ${CLIENT_SCRIPTS_DIR}  && cd ${CLIENT_SCRIPTS_DIR}
-                echo "Client stressing... "
-                echo "${CLIENT_BIND_CMD} python3 client_stressing_test.py ${QUERY_FILE} $inst_num &> ${LOG_DIR}/${1}.log"
-                ${CLIENT_BIND_CMD} python3 client_stressing_test.py ${QUERY_FILE} $inst_num &> ${LOG_DIR}/${1}.log
-                echo "Completed client stressing, checking log... "
-                finish_log=`grep "Finished" ${LOG_DIR}/${1}.log | wc -l`
-	        if [ $finish_log -eq 1 ] ;then
-                        kill_instance
-	                test -f ${LOG_DIR}/${1}.log && echo  "${1}.log ===> ${LOG_DIR}/${1}.log"
-	        else
-	                kill_instance
-	                echo "No find 'Finished' in client log -> Performance test may fail"
-	                exit 1
-
-	        fi
-
-	    else
-                echo "${1} clickhouse server start fail"
-                exit 1
-        fi
-else
-        echo "clickhouse server start fail -> Please check xml files required in ${database_dir} for each instance"
-        exit 1
-
-fi
-}
-function clear_log(){
-        if [ -d "$LOG_DIR" ]; then
-                cd ${LOG_DIR} && rm -rf *
-        fi     
-}
-
-function gather_log_for_codec(){
-        cd ${OUTPUT_DIR} && mkdir -p ${LOG_PACK_FILE}/${1}
-        cp -rf ${LOG_DIR} ${OUTPUT_DIR}/${LOG_PACK_FILE}/${1}
-}
-
-function pack_log(){
-        if [ -e "${OUTPUT_DIR}/run.log" ]; then
-                cp ${OUTPUT_DIR}/run.log ${OUTPUT_DIR}/${LOG_PACK_FILE}/
-        fi
-        echo "Please check all log information in ${OUTPUT_DIR}/${LOG_PACK_FILE}"
-}
-
-function setup_check(){
-
-        iax_dev_num=`accel-config list | grep iax | wc -l`
-	if [ $iax_dev_num -eq 0 ] ;then
-                iax_dev_num=`accel-config list | grep iax | wc -l`
-                if [ $iax_dev_num -eq 0 ] ;then
-                        echo "No IAA devices available -> Please check IAA hardware setup manually!"
-                        exit 1
-                else
-	                echo "IAA enabled devices number:$iax_dev_num"
-                fi
-	else
-	        echo "IAA enabled devices number:$iax_dev_num"
-	fi        
-        libaccel_version=`accel-config -v`
-        clickhouser_version=`clickhouse server --version`
-        kernel_dxd_log=`dmesg | grep dxd`
-        echo "libaccel_version:$libaccel_version"
-        echo "clickhouser_version:$clickhouser_version"
-        echo -e "idxd section in kernel log:\n$kernel_dxd_log"
-}
-
-setup_check
-export CLICKHOUSE_WATCHDOG_ENABLE=0
-for i in  ${CODEC_CONFIG[@]}
-do
-        clear_log
-        codec=${i}
-        echo "run test------------$codec"
-        run_test $codec
-        gather_log_for_codec $codec
-done
-
-pack_log
-echo "Done."

contrib/qpl-cmake/benchmark_sample/client_scripts/client_stressing_test.py

@@ -1,278 +0,0 @@
-from operator import eq
-import os
-import random
-import time
-import sys
-from clickhouse_driver import Client
-import numpy as np
-import subprocess
-import multiprocessing
-from multiprocessing import Manager
-
-warmup_runs = 10
-calculated_runs = 10
-seconds = 30
-max_instances_number = 8
-retest_number = 3
-retest_tolerance = 10
-
-
-def checkInt(str):
-    try:
-        int(str)
-        return True
-    except ValueError:
-        return False
-
-
-def setup_client(index):
-    if index < 4:
-        port_idx = index
-    else:
-        port_idx = index + 4
-    client = Client(
-        host="localhost",
-        database="default",
-        user="default",
-        password="",
-        port="900%d" % port_idx,
-    )
-    union_mode_query = "SET union_default_mode='DISTINCT'"
-    client.execute(union_mode_query)
-    return client
-
-
-def warm_client(clientN, clientL, query, loop):
-    for c_idx in range(clientN):
-        for _ in range(loop):
-            clientL[c_idx].execute(query)
-
-
-def read_queries(queries_list):
-    queries = list()
-    queries_id = list()
-    with open(queries_list, "r") as f:
-        for line in f:
-            line = line.rstrip()
-            line = line.split("$")
-            queries_id.append(line[0])
-            queries.append(line[1])
-    return queries_id, queries
-
-
-def run_task(client, cname, query, loop, query_latency):
-    start_time = time.time()
-    for i in range(loop):
-        client.execute(query)
-        query_latency.append(client.last_query.elapsed)
-
-    end_time = time.time()
-    p95 = np.percentile(query_latency, 95)
-    print(
-        "CLIENT: {0} end. -> P95: %f, qps: %f".format(cname)
-        % (p95, loop / (end_time - start_time))
-    )
-
-
-def run_multi_clients(clientN, clientList, query, loop):
-    client_pids = {}
-    start_time = time.time()
-    manager = multiprocessing.Manager()
-    query_latency_list0 = manager.list()
-    query_latency_list1 = manager.list()
-    query_latency_list2 = manager.list()
-    query_latency_list3 = manager.list()
-    query_latency_list4 = manager.list()
-    query_latency_list5 = manager.list()
-    query_latency_list6 = manager.list()
-    query_latency_list7 = manager.list()
-
-    for c_idx in range(clientN):
-        client_name = "Role_%d" % c_idx
-        if c_idx == 0:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list0),
-            )
-        elif c_idx == 1:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list1),
-            )
-        elif c_idx == 2:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list2),
-            )
-        elif c_idx == 3:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list3),
-            )
-        elif c_idx == 4:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list4),
-            )
-        elif c_idx == 5:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list5),
-            )
-        elif c_idx == 6:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list6),
-            )
-        elif c_idx == 7:
-            client_pids[c_idx] = multiprocessing.Process(
-                target=run_task,
-                args=(clientList[c_idx], client_name, query, loop, query_latency_list7),
-            )
-        else:
-            print("ERROR: CLIENT number dismatch!!")
-            exit()
-        print("CLIENT: %s start" % client_name)
-        client_pids[c_idx].start()
-
-    for c_idx in range(clientN):
-        client_pids[c_idx].join()
-    end_time = time.time()
-    totalT = end_time - start_time
-
-    query_latencyTotal = list()
-    for item in query_latency_list0:
-        query_latencyTotal.append(item)
-    for item in query_latency_list1:
-        query_latencyTotal.append(item)
-    for item in query_latency_list2:
-        query_latencyTotal.append(item)
-    for item in query_latency_list3:
-        query_latencyTotal.append(item)
-    for item in query_latency_list4:
-        query_latencyTotal.append(item)
-    for item in query_latency_list5:
-        query_latencyTotal.append(item)
-    for item in query_latency_list6:
-        query_latencyTotal.append(item)
-    for item in query_latency_list7:
-        query_latencyTotal.append(item)
-
-    totalP95 = np.percentile(query_latencyTotal, 95) * 1000
-    return totalT, totalP95
-
-
-def run_task_caculated(client, cname, query, loop):
-    query_latency = list()
-    start_time = time.time()
-    for i in range(loop):
-        client.execute(query)
-        query_latency.append(client.last_query.elapsed)
-    end_time = time.time()
-    p95 = np.percentile(query_latency, 95)
-
-
-def run_multi_clients_caculated(clientN, clientList, query, loop):
-    client_pids = {}
-    start_time = time.time()
-    for c_idx in range(clientN):
-        client_name = "Role_%d" % c_idx
-        client_pids[c_idx] = multiprocessing.Process(
-            target=run_task_caculated,
-            args=(clientList[c_idx], client_name, query, loop),
-        )
-        client_pids[c_idx].start()
-    for c_idx in range(clientN):
-        client_pids[c_idx].join()
-    end_time = time.time()
-    totalT = end_time - start_time
-    return totalT
-
-
-if __name__ == "__main__":
-    client_number = 1
-    queries = list()
-    queries_id = list()
-
-    if len(sys.argv) != 3:
-        print(
-            "usage: python3 client_stressing_test.py [queries_file_path] [client_number]"
-        )
-        sys.exit()
-    else:
-        queries_list = sys.argv[1]
-        client_number = int(sys.argv[2])
-        print(
-            "queries_file_path: %s, client_number: %d" % (queries_list, client_number)
-        )
-        if not os.path.isfile(queries_list) or not os.access(queries_list, os.R_OK):
-            print("please check the right path for queries file")
-            sys.exit()
-        if (
-            not checkInt(sys.argv[2])
-            or int(sys.argv[2]) > max_instances_number
-            or int(sys.argv[2]) < 1
-        ):
-            print("client_number should be in [1~%d]" % max_instances_number)
-            sys.exit()
-
-    client_list = {}
-    queries_id, queries = read_queries(queries_list)
-
-    for c_idx in range(client_number):
-        client_list[c_idx] = setup_client(c_idx)
-    # clear cache
-    os.system("sync; echo 3 > /proc/sys/vm/drop_caches")
-
-    print("###Polit Run Begin")
-    for i in queries:
-        warm_client(client_number, client_list, i, 1)
-    print("###Polit Run End -> Start stressing....")
-
-    query_index = 0
-    for q in queries:
-        print(
-            "\n###START -> Index: %d, ID: %s, Query: %s"
-            % (query_index, queries_id[query_index], q)
-        )
-        warm_client(client_number, client_list, q, warmup_runs)
-        print("###Warm Done!")
-        for j in range(0, retest_number):
-            totalT = run_multi_clients_caculated(
-                client_number, client_list, q, calculated_runs
-            )
-            curr_loop = int(seconds * calculated_runs / totalT) + 1
-            print(
-                "###Calculation Done! -> loopN: %d, expected seconds:%d"
-                % (curr_loop, seconds)
-            )
-
-            print("###Stress Running! -> %d iterations......" % curr_loop)
-
-            totalT, totalP95 = run_multi_clients(
-                client_number, client_list, q, curr_loop
-            )
-
-            if totalT > (seconds - retest_tolerance) and totalT < (
-                seconds + retest_tolerance
-            ):
-                break
-            else:
-                print(
-                    "###totalT:%d is far way from expected seconds:%d. Run again ->j:%d!"
-                    % (totalT, seconds, j)
-                )
-
-        print(
-            "###Completed! -> ID: %s, clientN: %d, totalT: %.2f s, latencyAVG: %.2f ms, P95: %.2f ms, QPS_Final: %.2f"
-            % (
-                queries_id[query_index],
-                client_number,
-                totalT,
-                totalT * 1000 / (curr_loop * client_number),
-                totalP95,
-                ((curr_loop * client_number) / totalT),
-            )
-        )
-        query_index += 1
-    print("###Finished!")

contrib/qpl-cmake/benchmark_sample/client_scripts/queries_ssb.sql

@@ -1,10 +0,0 @@
-Q1.1$SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toYear(LO_ORDERDATE) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;
-Q2.1$SELECT sum(LO_REVENUE),toYear(LO_ORDERDATE) AS year,P_BRAND FROM lineorder_flat WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA' GROUP BY year,P_BRAND ORDER BY year,P_BRAND;
-Q2.2$SELECT sum(LO_REVENUE),toYear(LO_ORDERDATE) AS year,P_BRAND FROM lineorder_flat WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA' GROUP BY year,P_BRAND ORDER BY year,P_BRAND;
-Q2.3$SELECT sum(LO_REVENUE),toYear(LO_ORDERDATE) AS year,P_BRAND FROM lineorder_flat WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE' GROUP BY year,P_BRAND ORDER BY year,P_BRAND;
-Q3.1$SELECT C_NATION,S_NATION,toYear(LO_ORDERDATE) AS year,sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997 GROUP BY C_NATION,S_NATION,year ORDER BY year ASC,revenue DESC;
-Q3.2$SELECT C_CITY,S_CITY,toYear(LO_ORDERDATE) AS year,sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997 GROUP BY C_CITY,S_CITY,year ORDER BY year ASC,revenue DESC;
-Q3.3$SELECT C_CITY,S_CITY,toYear(LO_ORDERDATE) AS year,sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997 GROUP BY C_CITY,S_CITY,year ORDER BY year ASC,revenue DESC;
-Q4.1$SELECT toYear(LO_ORDERDATE) AS year,C_NATION,sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year,C_NATION ORDER BY year ASC,C_NATION ASC;
-Q4.2$SELECT toYear(LO_ORDERDATE) AS year,S_NATION,P_CATEGORY,sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year,S_NATION,P_CATEGORY ORDER BY year ASC,S_NATION ASC,P_CATEGORY ASC;
-Q4.3$SELECT toYear(LO_ORDERDATE) AS year,S_CITY,P_BRAND,sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14' GROUP BY year,S_CITY,P_BRAND ORDER BY year ASC,S_CITY ASC,P_BRAND ASC;

contrib/qpl-cmake/benchmark_sample/client_scripts/run_ssb.sh

@@ -1,6 +0,0 @@
-WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
-if [ ! -d "${WORKING_DIR}/output" ]; then
-mkdir ${WORKING_DIR}/output
-fi
-bash allin1_ssb.sh 2 > ${WORKING_DIR}/output/run.log
-echo "Please check log in: ${WORKING_DIR}/output/run.log"

contrib/qpl-cmake/benchmark_sample/database_dir/deflate/config_deflate.xml

@@ -1,49 +0,0 @@
-<!-- This file was generated automatically.
-     Do not edit it: it is likely to be discarded and generated again before it's read next time.
-     Files used to generate this file:
-       config.xml      -->
-
-<!-- Config that is used when server is run without config file. --><clickhouse>
-    <logger>
-        <level>trace</level>
-        <console>true</console>
-    </logger>
-
-    <http_port>8123</http_port>
-    <tcp_port>9000</tcp_port>
-    <mysql_port>9004</mysql_port>
-
-    <path>./</path>
-
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <mlock_executable>true</mlock_executable>
-
-    <compression>
-        <case>
-            <method>deflate_qpl</method>
-        </case>
-    </compression>
-
-    <users>
-        <default>
-            <password/>
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-            <quota>default</quota>
-            <access_management>1</access_management>
-        </default>
-    </users>
-
-    <profiles>
-        <default/>
-    </profiles>
-
-    <quotas>
-        <default/>
-    </quotas>
-</clickhouse>

contrib/qpl-cmake/benchmark_sample/database_dir/deflate_s2/config_deflate_s2.xml

@@ -1,49 +0,0 @@
-<!-- This file was generated automatically.
-     Do not edit it: it is likely to be discarded and generated again before it's read next time.
-     Files used to generate this file:
-       config.xml      -->
-
-<!-- Config that is used when server is run without config file. --><clickhouse>
-    <logger>
-        <level>trace</level>
-        <console>true</console>
-    </logger>
-
-    <http_port>8124</http_port>
-    <tcp_port>9001</tcp_port>
-    <mysql_port>9005</mysql_port>
-
-    <path>./</path>
-
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <mlock_executable>true</mlock_executable>
-
-    <compression>
-        <case>
-            <method>deflate_qpl</method>
-        </case>
-    </compression>
-
-    <users>
-        <default>
-            <password/>
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-            <quota>default</quota>
-            <access_management>1</access_management>
-        </default>
-    </users>
-
-    <profiles>
-        <default/>
-    </profiles>
-
-    <quotas>
-        <default/>
-    </quotas>
-</clickhouse>

contrib/qpl-cmake/benchmark_sample/database_dir/lz4/config_lz4.xml

@@ -1,49 +0,0 @@
-<!-- This file was generated automatically.
-     Do not edit it: it is likely to be discarded and generated again before it's read next time.
-     Files used to generate this file:
-       config.xml      -->
-
-<!-- Config that is used when server is run without config file. --><clickhouse>
-    <logger>
-        <level>trace</level>
-        <console>true</console>
-    </logger>
-
-    <http_port>8123</http_port>
-    <tcp_port>9000</tcp_port>
-    <mysql_port>9004</mysql_port>
-
-    <path>./</path>
-
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <mlock_executable>true</mlock_executable>
-
-    <compression>
-        <case>
-            <method>lz4</method>
-        </case>
-    </compression>
-
-    <users>
-        <default>
-            <password/>
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-            <quota>default</quota>
-            <access_management>1</access_management>
-        </default>
-    </users>
-
-    <profiles>
-        <default/>
-    </profiles>
-
-    <quotas>
-        <default/>
-    </quotas>
-</clickhouse>

contrib/qpl-cmake/benchmark_sample/database_dir/lz4_s2/config_lz4_s2.xml

@@ -1,49 +0,0 @@
-<!-- This file was generated automatically.
-     Do not edit it: it is likely to be discarded and generated again before it's read next time.
-     Files used to generate this file:
-       config.xml      -->
-
-<!-- Config that is used when server is run without config file. --><clickhouse>
-    <logger>
-        <level>trace</level>
-        <console>true</console>
-    </logger>
-
-    <http_port>8124</http_port>
-    <tcp_port>9001</tcp_port>
-    <mysql_port>9005</mysql_port>
-
-    <path>./</path>
-
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <mlock_executable>true</mlock_executable>
-
-    <compression>
-        <case>
-            <method>lz4</method>
-        </case>
-    </compression>
-
-    <users>
-        <default>
-            <password/>
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-            <quota>default</quota>
-            <access_management>1</access_management>
-        </default>
-    </users>
-
-    <profiles>
-        <default/>
-    </profiles>
-
-    <quotas>
-        <default/>
-    </quotas>
-</clickhouse>

contrib/qpl-cmake/benchmark_sample/database_dir/zstd/config_zstd.xml

@@ -1,49 +0,0 @@
-<!-- This file was generated automatically.
-     Do not edit it: it is likely to be discarded and generated again before it's read next time.
-     Files used to generate this file:
-       config.xml      -->
-
-<!-- Config that is used when server is run without config file. --><clickhouse>
-    <logger>
-        <level>trace</level>
-        <console>true</console>
-    </logger>
-
-    <http_port>8123</http_port>
-    <tcp_port>9000</tcp_port>
-    <mysql_port>9004</mysql_port>
-
-    <path>./</path>
-
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <mlock_executable>true</mlock_executable>
-
-    <compression>
-        <case>
-            <method>zstd</method>
-        </case>
-    </compression>
-
-    <users>
-        <default>
-            <password/>
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-            <quota>default</quota>
-            <access_management>1</access_management>
-        </default>
-    </users>
-
-    <profiles>
-        <default/>
-    </profiles>
-
-    <quotas>
-        <default/>
-    </quotas>
-</clickhouse>

contrib/qpl-cmake/benchmark_sample/database_dir/zstd_s2/config_zstd_s2.xml

@@ -1,49 +0,0 @@
-<!-- This file was generated automatically.
-     Do not edit it: it is likely to be discarded and generated again before it's read next time.
-     Files used to generate this file:
-       config.xml      -->
-
-<!-- Config that is used when server is run without config file. --><clickhouse>
-    <logger>
-        <level>trace</level>
-        <console>true</console>
-    </logger>
-
-    <http_port>8124</http_port>
-    <tcp_port>9001</tcp_port>
-    <mysql_port>9005</mysql_port>
-
-    <path>./</path>
-
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <mlock_executable>true</mlock_executable>
-
-    <compression>
-        <case>
-            <method>zstd</method>
-        </case>
-    </compression>
-
-    <users>
-        <default>
-            <password/>
-
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-            <quota>default</quota>
-            <access_management>1</access_management>
-        </default>
-    </users>
-
-    <profiles>
-        <default/>
-    </profiles>
-
-    <quotas>
-        <default/>
-    </quotas>
-</clickhouse>

contrib/re2-cmake/CMakeLists.txt

@@ -27,6 +27,17 @@ set(RE2_SOURCES
 
 add_library(_re2 ${RE2_SOURCES})
 target_include_directories(_re2 PUBLIC "${SRC_DIR}")
-target_link_libraries(_re2 ch_contrib::abseil_str_format)
+target_link_libraries(_re2 PRIVATE
+    absl::base
+    absl::core_headers
+    absl::fixed_array
+    absl::flat_hash_map
+    absl::flat_hash_set
+    absl::inlined_vector
+    absl::strings
+    absl::str_format
+    absl::synchronization
+    absl::optional
+    absl::span)
 
 add_library(ch_contrib::re2 ALIAS _re2)

contrib/rocksdb-cmake/CMakeLists.txt

@@ -76,7 +76,6 @@ else()
   endif()
 endif()
 
-include(CheckCCompilerFlag)
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
   if(POWER9)
     set(HAS_POWER9 1)
@@ -88,26 +87,15 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
-  CHECK_C_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC)
+  set(HAS_ARMV8_CRC 1)
-  if(HAS_ARMV8_CRC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
-    message(STATUS " HAS_ARMV8_CRC yes")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
-  endif(HAS_ARMV8_CRC)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
 
 
-include(CheckCXXSourceCompiles)
+if(ENABLE_AVX2 AND ENABLE_PCLMULQDQ)
-if(NOT MSVC)
-  set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
-endif()
-
-unset(CMAKE_REQUIRED_FLAGS)
-if(HAVE_SSE42)
   add_definitions(-DHAVE_SSE42)
   add_definitions(-DHAVE_PCLMUL)
-elseif(FORCE_SSE42)
-  message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
 endif()
 
 set (HAVE_THREAD_LOCAL 1)
@@ -121,75 +109,18 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
   add_definitions(-DOS_LINUX)
 elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
   add_definitions(-DOS_SOLARIS)
-elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-  add_definitions(-DOS_GNU_KFREEBSD)
 elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   add_definitions(-DOS_FREEBSD)
-elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-  add_definitions(-DOS_NETBSD)
-elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-  add_definitions(-DOS_OPENBSD)
-elseif(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
-  add_definitions(-DOS_DRAGONFLYBSD)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Android")
   add_definitions(-DOS_ANDROID)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
-  add_definitions(-DWIN32 -DOS_WIN -D_MBCS -DWIN64 -DNOMINMAX)
-  if(MINGW)
-    add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_VISTA)
-  endif()
 endif()
 
-if(NOT WIN32)
+add_definitions(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX)
-  add_definitions(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX)
-endif()
 
-option(WITH_FALLOCATE "build with fallocate" ON)
+if (OS_LINUX OR OS_FREEBSD)
-if(WITH_FALLOCATE)
-  CHECK_C_SOURCE_COMPILES("
-#include <fcntl.h>
-#include <linux/falloc.h>
-int main() {
- int fd = open(\"/dev/null\", 0);
- fallocate(fd, FALLOC_FL_KEEP_SIZE, 0, 1024);
-}
-" HAVE_FALLOCATE)
-  if(HAVE_FALLOCATE)
-    add_definitions(-DROCKSDB_FALLOCATE_PRESENT)
-  endif()
-endif()
-
-CHECK_C_SOURCE_COMPILES("
-#include <fcntl.h>
-int main() {
-  int fd = open(\"/dev/null\", 0);
-  sync_file_range(fd, 0, 1024, SYNC_FILE_RANGE_WRITE);
-}
-" HAVE_SYNC_FILE_RANGE_WRITE)
-if(HAVE_SYNC_FILE_RANGE_WRITE)
-  add_definitions(-DROCKSDB_RANGESYNC_PRESENT)
-endif()
-
-CHECK_C_SOURCE_COMPILES("
-#include <pthread.h>
-int main() {
-  (void) PTHREAD_MUTEX_ADAPTIVE_NP;
-}
-" HAVE_PTHREAD_MUTEX_ADAPTIVE_NP)
-if(HAVE_PTHREAD_MUTEX_ADAPTIVE_NP)
   add_definitions(-DROCKSDB_PTHREAD_ADAPTIVE_MUTEX)
 endif()
 
-include(CheckCXXSymbolExists)
-if (OS_FREEBSD)
-  check_cxx_symbol_exists(malloc_usable_size "${ROCKSDB_SOURCE_DIR}/malloc_np.h" HAVE_MALLOC_USABLE_SIZE)
-else()
-  check_cxx_symbol_exists(malloc_usable_size "${ROCKSDB_SOURCE_DIR}/malloc.h" HAVE_MALLOC_USABLE_SIZE)
-endif()
-if(HAVE_MALLOC_USABLE_SIZE)
-  add_definitions(-DROCKSDB_MALLOC_USABLE_SIZE)
-endif()
-
 if (OS_LINUX)
   add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT)
   add_definitions(-DROCKSDB_AUXV_SYSAUXV_PRESENT)
@@ -204,7 +135,6 @@ include_directories("${ROCKSDB_SOURCE_DIR}/include")
 if(WITH_FOLLY_DISTRIBUTED_MUTEX)
   include_directories("${ROCKSDB_SOURCE_DIR}/third-party/folly")
 endif()
-find_package(Threads REQUIRED)
 
 # Main library source code
 
@@ -497,7 +427,7 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/range/range_tree/lib/util/memarena.cc
     rocksdb_build_version.cc)
 
-if(HAVE_SSE42 AND NOT MSVC)
+if(ENABLE_SSE42 AND ENABLE_PCLMULQDQ)
   set_source_files_properties(
     "${ROCKSDB_SOURCE_DIR}/util/crc32c.cc"
     PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul")

contrib/thrift-cmake/CMakeLists.txt

@@ -47,8 +47,6 @@ set(thriftcpp_threads_SOURCES
         "${LIBRARY_DIR}/src/thrift/concurrency/Mutex.cpp"
         )
 
-include("${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake") # makes config.h
-
 set (HAVE_ARPA_INET_H 1)
 set (HAVE_FCNTL_H 1)
 set (HAVE_GETOPT_H 1)
@@ -81,10 +79,6 @@ if (OS_LINUX AND NOT USE_MUSL)
     set (STRERROR_R_CHAR_P 1)
 endif ()
 
-#set(PACKAGE ${PACKAGE_NAME})
-#set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-#set(VERSION ${thrift_VERSION})
-
 # generate a config.h file
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/thrift/config.h")
 

contrib/update-submodules.sh

@@ -9,4 +9,16 @@ cd $GIT_DIR
 contrib/sparse-checkout/setup-sparse-checkout.sh
 git submodule init
 git submodule sync
-git config --file .gitmodules --get-regexp .*path | sed 's/[^ ]* //' | xargs -I _ --max-procs 64 git submodule update --depth=1 --single-branch _
+# NOTE: do not use --remote for `git submodule update`[1] command, since the submodule references to the specific commit SHA1 in the subproject.
+#       It may cause unexpected behavior. Instead you need to commit a new SHA1 for a submodule.
+#
+#       [1] - https://git-scm.com/book/en/v2/Git-Tools-Submodules
+git config --file .gitmodules --get-regexp '.*path' | sed 's/[^ ]* //' | xargs -I _ --max-procs 64 git submodule update --depth=1 --single-branch _
+
+# We don't want to depend on any third-party CMake files.
+# To check it, find and delete them.
+grep -o -P '"contrib/[^"]+"' .gitmodules |
+  grep -v -P 'contrib/(llvm-project|google-protobuf|grpc|abseil-cpp|corrosion)' |
+  xargs -I@ find @ \
+    -'(' -name 'CMakeLists.txt' -or -name '*.cmake' -')' -and -not -name '*.h.cmake' \
+    -delete

contrib/xz-cmake/CMakeLists.txt

@@ -98,8 +98,6 @@ if (ARCH_S390X)
     add_compile_definitions(WORDS_BIGENDIAN)
 endif ()
 
-find_package(Threads REQUIRED)
-
 
 add_library(_liblzma
     ${SRC_DIR}/src/common/mythread.h

docker/docs/builder/Dockerfile

@@ -4,8 +4,8 @@ FROM node:16-alpine
 
 RUN apk add --no-cache git openssh bash
 
-# At this point we want to really update /opt/clickhouse-docs
+# At this point we want to really update /opt/clickhouse-docs directory
-# despite the cached images
+# So we reset the cache
 ARG CACHE_INVALIDATOR=0
 
 RUN git clone https://github.com/ClickHouse/clickhouse-docs.git \

docker/keeper/Dockerfile

@@ -34,7 +34,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="23.10.3.5"
+ARG VERSION="23.10.5.20"
 ARG PACKAGES="clickhouse-keeper"
 
 # user/group precreated explicitly with fixed uid/gid on purpose.

docker/packager/binary/Dockerfile

@@ -6,29 +6,27 @@ FROM clickhouse/test-util:latest AS cctools
 ENV CC=clang-${LLVM_VERSION}
 ENV CXX=clang++-${LLVM_VERSION}
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# DO NOT PUT ANYTHING BEFORE THREE NEXT `RUN` DIRECTIVES
+# DO NOT PUT ANYTHING BEFORE THE NEXT TWO `RUN` DIRECTIVES
 # THE MOST HEAVY OPERATION MUST BE THE FIRST IN THE CACHE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # libtapi is required to support .tbh format from recent MacOS SDKs
-RUN git clone --depth 1 https://github.com/tpoechtrager/apple-libtapi.git \
+RUN git clone https://github.com/tpoechtrager/apple-libtapi.git \
     && cd apple-libtapi \
+    && git checkout 15dfc2a8c9a2a89d06ff227560a69f5265b692f9 \
     && INSTALLPREFIX=/cctools ./build.sh \
     && ./install.sh \
     && cd .. \
     && rm -rf apple-libtapi
 
 # Build and install tools for cross-linking to Darwin (x86-64)
-RUN git clone --depth 1 https://github.com/tpoechtrager/cctools-port.git \
+# Build and install tools for cross-linking to Darwin (aarch64)
+RUN git clone https://github.com/tpoechtrager/cctools-port.git \
     && cd cctools-port/cctools \
+    && git checkout 2a3e1c2a6ff54a30f898b70cfb9ba1692a55fad7 \
     && ./configure --prefix=/cctools --with-libtapi=/cctools \
         --target=x86_64-apple-darwin \
     && make install -j$(nproc) \
-    && cd ../.. \
+    && make clean \
-    && rm -rf cctools-port
-
-# Build and install tools for cross-linking to Darwin (aarch64)
-RUN git clone --depth 1 https://github.com/tpoechtrager/cctools-port.git \
-    && cd cctools-port/cctools \
     && ./configure --prefix=/cctools --with-libtapi=/cctools \
         --target=aarch64-apple-darwin \
     && make install -j$(nproc) \
@@ -62,19 +60,12 @@ RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
     rustup target add aarch64-unknown-linux-musl && \
     rustup target add riscv64gc-unknown-linux-gnu
 
-# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
 # A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
     && apt-get update \
     && apt-get install --yes \
         binutils-riscv64-linux-gnu \
         build-essential \
-        g++-11 \
-        gcc-11 \
-        gcc-aarch64-linux-gnu \
-        libc6 \
-        libc6-dev \
-        libc6-dev-arm64-cross \
         python3-boto3 \
         yasm \
         zstd \

docker/packager/binary/build.sh

@@ -22,6 +22,7 @@ if [ "$EXTRACT_TOOLCHAIN_DARWIN" = "1" ]; then
   fi
 fi
 
+
 # Uncomment to debug ccache. Don't put ccache log in /output right away, or it
 # will be confusingly packed into the "performance" package.
 # export CCACHE_LOGFILE=/build/ccache.log
@@ -32,6 +33,7 @@ mkdir -p /build/build_docker
 cd /build/build_docker
 rm -f CMakeCache.txt
 
+
 if [ -n "$MAKE_DEB" ]; then
   rm -rf /build/packages/root
   # NOTE: this is for backward compatibility with previous releases,
@@ -177,11 +179,12 @@ then
     tar c -C /build/ --exclude='.git/modules/**' .git | tar x -C "$PERF_OUTPUT"/ch
     # Create branch pr and origin/master to have them for the following performance comparison
     git -C "$PERF_OUTPUT"/ch branch pr
-    git -C "$PERF_OUTPUT"/ch fetch --no-tags --depth 50 origin master:origin/master
+    git -C "$PERF_OUTPUT"/ch fetch --no-tags --no-recurse-submodules --depth 50 origin master:origin/master
     # Clean remote, to not have it stale
     git -C "$PERF_OUTPUT"/ch remote | xargs -n1 git -C "$PERF_OUTPUT"/ch remote remove
     # And clean all tags
-    git -C "$PERF_OUTPUT"/ch tag | xargs git -C "$PERF_OUTPUT"/ch tag -d
+    echo "Deleting $(git -C "$PERF_OUTPUT"/ch tag | wc -l) tags"
+    git -C "$PERF_OUTPUT"/ch tag | xargs git -C "$PERF_OUTPUT"/ch tag -d >/dev/null
     git -C "$PERF_OUTPUT"/ch reset --soft pr
     git -C "$PERF_OUTPUT"/ch log -5
     (

docker/packager/packager

@@ -236,16 +236,14 @@ def parse_env_variables(
         cc = compiler
         result.append("DEB_ARCH=amd64")
 
-    cxx = cc.replace("gcc", "g++").replace("clang", "clang++")
+    cxx = cc.replace("clang", "clang++")
 
     if package_type == "deb":
-        # NOTE: This are the env for packages/build script
+        # NOTE: This is the env for packages/build script
         result.append("MAKE_DEB=true")
         cmake_flags.append("-DENABLE_TESTS=0")
         cmake_flags.append("-DENABLE_UTILS=0")
-        cmake_flags.append("-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON")
         cmake_flags.append("-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON")
-        cmake_flags.append("-DCMAKE_AUTOGEN_VERBOSE=ON")
         cmake_flags.append("-DCMAKE_INSTALL_PREFIX=/usr")
         cmake_flags.append("-DCMAKE_INSTALL_SYSCONFDIR=/etc")
         cmake_flags.append("-DCMAKE_INSTALL_LOCALSTATEDIR=/var")
@@ -265,12 +263,7 @@ def parse_env_variables(
     elif package_type == "fuzzers":
         cmake_flags.append("-DENABLE_FUZZING=1")
         cmake_flags.append("-DENABLE_PROTOBUF=1")
-        cmake_flags.append("-DUSE_INTERNAL_PROTOBUF_LIBRARY=1")
         cmake_flags.append("-DWITH_COVERAGE=1")
-        cmake_flags.append("-DCMAKE_AUTOGEN_VERBOSE=ON")
-        # cmake_flags.append("-DCMAKE_INSTALL_PREFIX=/usr")
-        # cmake_flags.append("-DCMAKE_INSTALL_SYSCONFDIR=/etc")
-        # cmake_flags.append("-DCMAKE_INSTALL_LOCALSTATEDIR=/var")
         # Reduce linking and building time by avoid *install/all dependencies
         cmake_flags.append("-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON")
 

docker/server/.dockerignore

@@ -1,8 +0,0 @@
-# post / preinstall scripts (not needed, we do it in Dockerfile)
-alpine-root/install/*
-
-# docs (looks useless)
-alpine-root/usr/share/doc/*
-
-# packages, etc. (used by alpine-build.sh)
-tgz-packages/*

docker/server/Dockerfile.alpine

@@ -32,7 +32,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="23.10.3.5"
+ARG VERSION="23.10.5.20"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 # user/group precreated explicitly with fixed uid/gid on purpose.

docker/server/Dockerfile.ubuntu

@@ -30,7 +30,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
 
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="23.10.3.5"
+ARG VERSION="23.10.5.20"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 # set non-empty deb_location_url url to create a docker image

docker/test/base/setup_export_logs.sh

@@ -126,6 +126,9 @@ function setup_logs_replication
     # It's doesn't make sense to try creating tables if SYNC fails
     echo "SYSTEM SYNC DATABASE REPLICA default" | clickhouse-client "${CONNECTION_ARGS[@]}" || return 0
 
+    debug_or_sanitizer_build=$(clickhouse-client -q "WITH ((SELECT value FROM system.build_options WHERE name='BUILD_TYPE') AS build, (SELECT value FROM system.build_options WHERE name='CXX_FLAGS') as flags) SELECT build='Debug' OR flags LIKE '%fsanitize%'")
+    echo "Build is debug or sanitizer: $debug_or_sanitizer_build"
+
     # For each system log table:
     echo 'Create %_log tables'
     clickhouse-client --query "SHOW TABLES FROM system LIKE '%\\_log'" | while read -r table
@@ -133,7 +136,14 @@ function setup_logs_replication
         if [[ "$table" = "trace_log" ]]
         then
             EXTRA_COLUMNS_FOR_TABLE="${EXTRA_COLUMNS_TRACE_LOG}"
-            EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION_TRACE_LOG}"
+            # Do not try to resolve stack traces in case of debug/sanitizers
+            # build, since it is too slow (flushing of trace_log can take ~1min
+            # with such MV attached)
+            if [[ "$debug_or_sanitizer_build" = 1 ]]; then
+                EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION}"
+            else
+                EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION_TRACE_LOG}"
+            fi
         else
             EXTRA_COLUMNS_FOR_TABLE="${EXTRA_COLUMNS}"
             EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION}"
@@ -182,3 +192,13 @@ function setup_logs_replication
         " || continue
     done
 )
+
+function stop_logs_replication
+{
+    echo "Detach all logs replication"
+    clickhouse-client --query "select database||'.'||table from system.tables where database = 'system' and (table like '%_sender' or table like '%_watcher')" | {
+        tee /dev/stderr
+    } | {
+        xargs -n1 -r -i clickhouse-client --query "drop table {}"
+    }
+}

docker/test/fasttest/run.sh

@@ -206,7 +206,7 @@ function build
     (
         cd "$FASTTEST_BUILD"
         TIMEFORMAT=$'\nreal\t%3R\nuser\t%3U\nsys\t%3S'
-        ( time ninja clickhouse-bundle) |& ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
+        ( time ninja clickhouse-bundle clickhouse-stripped) |& ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
         BUILD_SECONDS_ELAPSED=$(awk '/^....-..-.. ..:..:.. real\t[0-9]/ {print $4}' < "$FASTTEST_OUTPUT/build_log.txt")
         echo "build_clickhouse_fasttest_binary: [ OK ] $BUILD_SECONDS_ELAPSED sec." \
           | ts '%Y-%m-%d %H:%M:%S' \
@@ -215,7 +215,6 @@ function build
             mkdir -p "$FASTTEST_OUTPUT/binaries/"
             cp programs/clickhouse "$FASTTEST_OUTPUT/binaries/clickhouse"
 
-            strip programs/clickhouse -o programs/clickhouse-stripped
             zstd --threads=0 programs/clickhouse-stripped -o "$FASTTEST_OUTPUT/binaries/clickhouse-stripped.zst"
         fi
         ccache_status

docker/test/fuzzer/generate-test-j2.py

@@ -3,6 +3,7 @@
 from argparse import ArgumentParser
 import os
 import jinja2
+import itertools
 
 
 def removesuffix(text, suffix):
@@ -47,6 +48,7 @@ def main(args):
         loader=jinja2.FileSystemLoader(suite_dir),
         keep_trailing_newline=True,
     )
+    j2env.globals.update(product=itertools.product)
 
     test_names = os.listdir(suite_dir)
     for test_name in test_names:

docker/test/fuzzer/query-fuzzer-tweaks-users.xml

@@ -23,11 +23,6 @@
                     <max>10G</max>
                 </max_memory_usage>
 
-                <!-- Analyzer is unstable, not ready for testing. -->
-                <allow_experimental_analyzer>
-                    <readonly/>
-                </allow_experimental_analyzer>
-
                 <table_function_remote_max_addresses>
                     <max>200</max>
                 </table_function_remote_max_addresses>

docker/test/fuzzer/run-fuzzer.sh

@@ -212,11 +212,11 @@ quit
 
     gdb -batch -command script.gdb -p $server_pid &
     sleep 5
-    # gdb will send SIGSTOP, spend some time loading debug info and then send SIGCONT, wait for it (up to send_timeout, 300s)
+    # gdb will send SIGSTOP, spend some time loading debug info, and then send SIGCONT, wait for it (up to send_timeout, 300s)
     time clickhouse-client --query "SELECT 'Connected to clickhouse-server after attaching gdb'" ||:
 
     # Check connectivity after we attach gdb, because it might cause the server
-    # to freeze and the fuzzer will fail. In debug build it can take a lot of time.
+    # to freeze, and the fuzzer will fail. In debug build, it can take a lot of time.
     for _ in {1..180}
     do
         if clickhouse-client --query "select 1"
@@ -226,14 +226,15 @@ quit
         sleep 1
     done
     kill -0 $server_pid # This checks that it is our server that is started and not some other one
-    echo 'Server started and responded'
+    echo 'Server started and responded.'
 
     setup_logs_replication
 
     # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.
-    # SC2046: Quote this to prevent word splitting. Actually I need word splitting.
+    # SC2046: Quote this to prevent word splitting. Actually, I need word splitting.
     # shellcheck disable=SC2012,SC2046
     timeout -s TERM --preserve-status 30m clickhouse-client \
+        --max_memory_usage_in_client=1000000000 \
         --receive_timeout=10 \
         --receive_data_timeout_ms=10000 \
         --stacktrace \
@@ -253,10 +254,10 @@ quit
     wait "$fuzzer_pid" || fuzzer_exit_code=$?
     echo "Fuzzer exit code is $fuzzer_exit_code"
 
-    # If the server dies, most often the fuzzer returns code 210: connetion
+    # If the server dies, most often the fuzzer returns Code 210: Connetion
     # refused, and sometimes also code 32: attempt to read after eof. For
-    # simplicity, check again whether the server is accepting connections, using
+    # simplicity, check again whether the server is accepting connections using
-    # clickhouse-client. We don't check for existence of server process, because
+    # clickhouse-client. We don't check for the existence of the server process, because
     # the process is still present while the server is terminating and not
     # accepting the connections anymore.
 

docker/test/integration/mysql_java_client/MySQLJavaClientTest.java

@@ -39,8 +39,7 @@ public class MySQLJavaClientTest {
 
         // useServerPrepStmts=true -> COM_STMT_PREPARE + COM_STMT_EXECUTE -> binary
         // useServerPrepStmts=false -> COM_QUERY -> text
-        String jdbcUrl = String.format("jdbc:mysql://%s:%s/%s?useSSL=false&useServerPrepStmts=%s",
+        String jdbcUrl = String.format("jdbc:mysql://%s:%s/%s?useSSL=false&useServerPrepStmts=%s", host, port, database, binary);
-                host, port, database, binary);
 
         try {
             Class.forName("com.mysql.cj.jdbc.Driver");
@@ -67,21 +66,21 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i8"), rs.getInt("i8"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "i8"), rs.getInt("i8"), rs.wasNull());
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i16"), rs.getInt("i16"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "i16"), rs.getInt("i16"), rs.wasNull());
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i32"), rs.getInt("i32"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "i32"), rs.getInt("i32"), rs.wasNull());
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "i64"), rs.getLong("i64"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "i64"), rs.getLong("i64"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "i128"), rs.getString("i128"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "i128"), rs.getString("i128"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "i256"), rs.getString("i256"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "i256"), rs.getString("i256"), rs.wasNull());
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "ui8"), rs.getInt("ui8"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "ui8"), rs.getInt("ui8"), rs.wasNull());
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "ui16"), rs.getInt("ui16"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "ui16"), rs.getInt("ui16"), rs.wasNull());
-            System.out.printf("%s, value: %d\n", getMysqlType(rs, "ui32"), rs.getLong("ui32"));
+            System.out.printf("%s, value: %d, wasNull: %b\n", getMysqlType(rs, "ui32"), rs.getLong("ui32"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ui64"), rs.getString("ui64"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "ui64"), rs.getString("ui64"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ui128"), rs.getString("ui128"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "ui128"), rs.getString("ui128"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ui256"), rs.getString("ui256"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "ui256"), rs.getString("ui256"), rs.wasNull());
-            System.out.printf("%s, value: %f\n", getMysqlType(rs, "f32"), rs.getFloat("f32"));
+            System.out.printf("%s, value: %f, wasNull: %b\n", getMysqlType(rs, "f32"), rs.getFloat("f32"), rs.wasNull());
-            System.out.printf("%s, value: %f\n", getMysqlType(rs, "f64"), rs.getFloat("f64"));
+            System.out.printf("%s, value: %f, wasNull: %b\n", getMysqlType(rs, "f64"), rs.getFloat("f64"), rs.wasNull());
-            System.out.printf("%s, value: %b\n", getMysqlType(rs, "b"), rs.getBoolean("b"));
+            System.out.printf("%s, value: %b, wasNull: %b\n", getMysqlType(rs, "b"), rs.getBoolean("b"), rs.wasNull());
         }
         System.out.println();
     }
@@ -92,10 +91,10 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "s"), rs.getString("s"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "s"), rs.getString("s"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "sn"), rs.getString("sn"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "sn"), rs.getString("sn"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "lc"), rs.getString("lc"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "lc"), rs.getString("lc"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "nlc"), rs.getString("nlc"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "nlc"), rs.getString("nlc"), rs.wasNull());
         }
         System.out.println();
     }
@@ -106,10 +105,10 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ilc"), rs.getInt("ilc"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "ilc"), rs.getInt("ilc"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dlc"), rs.getDate("dlc"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dlc"), rs.getDate("dlc"), rs.wasNull());
             // NULL int is represented as zero
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "ni"), rs.getInt("ni"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "ni"), rs.getInt("ni"), rs.wasNull());
         }
         System.out.println();
     }
@@ -120,12 +119,11 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d32"), rs.getBigDecimal("d32").toPlainString());
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d32"), rs.getBigDecimal("d32").toPlainString(), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d64"), rs.getBigDecimal("d64").toPlainString());
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d64"), rs.getBigDecimal("d64").toPlainString(), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d128_native"),
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d128_native"), rs.getBigDecimal("d128_native").toPlainString(), rs.wasNull());
-                    rs.getBigDecimal("d128_native").toPlainString());
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d128_text"), rs.getString("d128_text"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d128_text"), rs.getString("d128_text"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d256"), rs.getString("d256"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d256"), rs.getString("d256"));
         }
         System.out.println();
     }
@@ -136,12 +134,12 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d"), rs.getDate("d"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d"), rs.getDate("d"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d32"), rs.getDate("d32"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d32"), rs.getDate("d32"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_3"), rs.getTimestamp("dt64_3"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_3"), rs.getTimestamp("dt64_3"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_6"), rs.getTimestamp("dt64_6"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_6"), rs.getTimestamp("dt64_6"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_9"), rs.getTimestamp("dt64_9"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_9"), rs.getTimestamp("dt64_9"), rs.wasNull());
         }
         System.out.println();
     }
@@ -152,13 +150,13 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_0"), rs.getTimestamp("dt64_0"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_0"), rs.getTimestamp("dt64_0"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_1"), rs.getTimestamp("dt64_1"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_1"), rs.getTimestamp("dt64_1"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_2"), rs.getTimestamp("dt64_2"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_2"), rs.getTimestamp("dt64_2"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_4"), rs.getTimestamp("dt64_4"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_4"), rs.getTimestamp("dt64_4"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_5"), rs.getTimestamp("dt64_5"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_5"), rs.getTimestamp("dt64_5"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_7"), rs.getTimestamp("dt64_7"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_7"), rs.getTimestamp("dt64_7"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_8"), rs.getTimestamp("dt64_8"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_8"), rs.getTimestamp("dt64_8"), rs.wasNull());
         }
         System.out.println();
     }
@@ -169,8 +167,8 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt64_3"), rs.getTimestamp("dt64_3"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt64_3"), rs.getTimestamp("dt64_3"), rs.wasNull());
         }
         System.out.println();
     }
@@ -181,10 +179,10 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "a"), rs.getString("a"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "a"), rs.getString("a"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "u"), rs.getString("u"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "u"), rs.getString("u"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "t"), rs.getString("t"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "t"), rs.getString("t"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "m"), rs.getString("m"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "m"), rs.getString("m"), rs.wasNull());
         }
         System.out.println();
     }
@@ -196,17 +194,15 @@ public class MySQLJavaClientTest {
         int rowNum = 1;
         while (rs.next()) {
             System.out.printf("Row #%d\n", rowNum++);
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "f"), rs.getFloat("f"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "f"), rs.getFloat("f"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "d"), rs.getDate("d"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "d"), rs.getDate("d"), rs.wasNull());
-            System.out.printf("%s, value: %s\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"));
+            System.out.printf("%s, value: %s, wasNull: %b\n", getMysqlType(rs, "dt"), rs.getTimestamp("dt"), rs.wasNull());
         }
         System.out.println();
     }
 
     private static String getMysqlType(ResultSet rs, String columnLabel) throws SQLException {
         ResultSetMetaData meta = rs.getMetaData();
-        return String.format("%s type is %s", columnLabel,
+        return String.format("%s type is %s", columnLabel, MysqlType.getByJdbcType(meta.getColumnType(rs.findColumn(columnLabel))));
-                MysqlType.getByJdbcType(meta.getColumnType(rs.findColumn(columnLabel))));
     }
-
 }