Merge remote-tracking branch 'upstream/master' into azure-remove-redundant-list

Author: jkartseva

.github/workflows/master.yml

@@ -776,7 +776,7 @@ jobs:
           fi
 
   build_amd_compat:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, builder]
     needs: [config_workflow, dockers_build_amd_and_merge, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
     name: "Build (amd_compat)"

.github/workflows/pull_request.yml

@@ -930,7 +930,7 @@ jobs:
           fi
 
   build_amd_compat:
-    runs-on: [self-hosted, builder-aarch64]
+    runs-on: [self-hosted, builder]
     needs: [config_workflow, dockers_build_amd_and_merge, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan]
     if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
     name: "Build (amd_compat)"

README.md

@@ -47,16 +47,18 @@ Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
 You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
 
 Upcoming meetups
-* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/306549810/) - April 1, 2025
-* [Oslo Meetup](https://www.meetup.com/open-source-real-time-data-warehouse-real-time-analytics/events/306414327/) - April 8, 2025
-* [Ho Chi Minh Meetup with AWS & Infinite Lambda](https://www.meetup.com/clickhouse-vietnam-meetup-group/events/306810105/) - April 12, 2025
 * [Tokyo Meetup with Confluent](https://www.meetup.com/clickhouse-tokyo-user-group/events/306832118/) - April 15, 2025
 * [Kuala Lumper Meetup with CNCF](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/306697678/) - April 16, 2025
 * [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
+* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
+* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
 * [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
 * [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
 
 Recent meetups
+* [Ho Chi Minh Meetup with AWS & Infinite Lambda](https://www.meetup.com/clickhouse-vietnam-meetup-group/events/306810105/) - April 12, 2025
+* [Oslo Meetup](https://www.meetup.com/open-source-real-time-data-warehouse-real-time-analytics/events/306414327/) - April 8, 2025
+* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/306549810/) - April 1, 2025
 * [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/306439995) - March 27, 2025
 * [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/305916369) - March 26, 2025
 * [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/306434754/) - March 26, 2025
@@ -76,11 +78,7 @@ Recent meetups
 * [Auckland Meetup](https://www.meetup.com/clickhouse-auckland-meetup-group/events/305666103/) - Feb 19, 2025
 * [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - Feb 10, 2025
 * [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/305497951/) - Feb 8, 2025
-* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/305146729/) - Feb 5, 2025
-* [FOSDEM Dinner](https://clickhouse.com/company/events/202502-emea-brussels-fosdem-dinner) - Feb 1, 2025
-* [Mumbai Meetup](https://www.meetup.com/clickhouse-mumbai-user-group/events/305497320/) - Feb 1, 2025
-* [Zagreb Meetup](https://www.meetup.com/clickhouse-croatia-user-group/events/305455877/) - Jan 30, 2025
-* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/305126993/) - Jan 23, 2025
+
 
 
 ## Recent Recordings

base/base/BFloat16.h

@@ -155,6 +155,11 @@ class BFloat16
         res.x = x ^ 0b1000000000000000;
         return res;
     }
+
+    constexpr const UInt16 & raw() const
+    {
+        return x;
+    }
 };
 
 

base/poco/NetSSL_OpenSSL/src/Context.cpp

@@ -504,18 +504,18 @@ void Context::createSSLContext()
  * if TLS1.x was removed at OpenSSL library build time via Configure options.
  */
         case TLSV1_1_CLIENT_USE:
-            _pSSLContext = SSL_CTX_new(TLSv1_1_client_method());
+            _pSSLContext = SSL_CTX_new(TLS_client_method());
             break;
         case TLSV1_1_SERVER_USE:
-            _pSSLContext = SSL_CTX_new(TLSv1_1_server_method());
+            _pSSLContext = SSL_CTX_new(TLS_server_method());
             break;
 #endif
 #if defined(SSL_OP_NO_TLSv1_2) && !defined(OPENSSL_NO_TLS1)
         case TLSV1_2_CLIENT_USE:
-            _pSSLContext = SSL_CTX_new(TLSv1_2_client_method());
+            _pSSLContext = SSL_CTX_new(TLS_client_method());
             break;
         case TLSV1_2_SERVER_USE:
-            _pSSLContext = SSL_CTX_new(TLSv1_2_server_method());
+            _pSSLContext = SSL_CTX_new(TLS_server_method());
             break;
 #endif
 		default:

ci/defs/job_configs.py

@@ -273,7 +273,7 @@ class JobConfigs:
             RunnerLabels.BUILDER_ARM,  # BuildTypes.ARM_V80COMPAT,
             RunnerLabels.BUILDER_AMD,  # BuildTypes.AMD_FREEBSD,
             RunnerLabels.BUILDER_ARM,  # BuildTypes.PPC64LE,
-            RunnerLabels.BUILDER_ARM,  # BuildTypes.AMD_COMPAT,
+            RunnerLabels.BUILDER_AMD,  # BuildTypes.AMD_COMPAT,
             RunnerLabels.BUILDER_AMD,  # BuildTypes.AMD_MUSL,
             RunnerLabels.BUILDER_ARM,  # BuildTypes.RISCV64,
             RunnerLabels.BUILDER_AMD,  # BuildTypes.S390X,
@@ -738,6 +738,9 @@ class JobConfigs:
         name=JobNames.ASTFUZZER,
         runs_on=["..params.."],
         command=f"cd ./tests/ci && python3 ci.py --run-from-praktika",
+        digest_config=Job.CacheDigestConfig(
+            include_paths=["./docker/test/fuzzer", "./tests/ci/ci_fuzzer_check.py"],
+        ),
         allow_merge_on_failure=True,
     ).parametrize(
         parameter=[
@@ -766,6 +769,9 @@ class JobConfigs:
         name=JobNames.BUZZHOUSE,
         runs_on=["..params.."],
         command=f"cd ./tests/ci && python3 ci.py --run-from-praktika",
+        digest_config=Job.CacheDigestConfig(
+            include_paths=["./docker/test/fuzzer", "./tests/ci/ci_fuzzer_check.py"],
+        ),
         allow_merge_on_failure=True,
     ).parametrize(
         parameter=[

ci/jobs/performance_tests.py

@@ -162,7 +162,7 @@ def run_test(
             f"./tests/performance/scripts/perf.py --host localhost localhost \
                 --port {cls.LEFT_SERVER_PORT} {cls.RIGHT_SERVER_PORT} \
                 --runs {runs} --max-queries {max_queries} \
-                --profile-seconds 0 \
+                --profile-seconds 10 \
                 {test_file}",
             verbose=True,
         )
@@ -621,7 +621,7 @@ def too_many_slow(msg):
     # attach all logs with errors
     Shell.check(f"rm -f {perf_wd}/logs.tar.zst")
     Shell.check(
-        f'cd {perf_wd} && find . -type f \( -name "*.log" -o -name "*.tsv" -o -name "*.txt" -o -name "*.rep" \) ! -path "*/db/*" !  -path "*/db0/*" -print0 | tar --null -T - -cf - | zstd -o ./logs.tar.zst',
+        f'cd {perf_wd} && find . -type f \( -name "*.log" -o -name "*.tsv" -o -name "*.txt" -o -name "*.rep" -o -name "*.svg" \) ! -path "*/db/*" !  -path "*/db0/*" -print0 | tar --null -T - -cf - | zstd -o ./logs.tar.zst',
         verbose=True,
     )
     if Path(f"{perf_wd}/logs.tar.zst").is_file():

ci/jobs/scripts/perf/compare.sh

@@ -1104,7 +1104,7 @@ do
             | cut -f 5- \
             | sed 's/\t/ /g' \
             | tee "report/tmp/$query_file.stacks.$version.tsv" \
-            | ~/fg/flamegraph.pl --hash > "$query_file.$version.svg" &
+            | /fg/flamegraph.pl --hash > "$query_file.$version.svg" &
     done
 done
 wait
@@ -1113,10 +1113,10 @@ unset IFS
 # Create differential flamegraphs.
 while IFS= read -r query_file
 do
-    ~/fg/difffolded.pl "report/tmp/$query_file.stacks.left.tsv" \
+    /fg/difffolded.pl "report/tmp/$query_file.stacks.left.tsv" \
             "report/tmp/$query_file.stacks.right.tsv" \
         | tee "report/tmp/$query_file.stacks.diff.tsv" \
-        | ~/fg/flamegraph.pl > "$query_file.diff.svg" &
+        | /fg/flamegraph.pl > "$query_file.diff.svg" &
 done < report/query-files.txt
 wait
 

ci/jobs/scripts/workflow_hooks/store_data.py

@@ -1,4 +1,7 @@
-from ci.jobs.scripts.clickhouse_version import CHVersion
+import copy
+
+from ci.defs.job_configs import JobConfigs
+from ci.praktika.digest import Digest
 from ci.praktika.info import Info
 from ci.praktika.utils import Shell
 
@@ -19,6 +22,13 @@
         changed_files = changed_files_str.split("\n")
         info.store_custom_data("changed_files", changed_files)
 
+    # hack to get build digest
+    some_build_job = copy.deepcopy(JobConfigs.build_jobs[0])
+    some_build_job.run_in_docker = ""
+    some_build_job.provides = []
+    digest = Digest().calc_job_digest(some_build_job, {}, {}).split("-")[0]
+    info.store_custom_data("build_digest", digest)
+
     if info.git_branch == "master" and info.repo_name == "ClickHouse/ClickHouse":
         # store previous commits for perf tests
         raw = Shell.get_output(

ci/praktika/_environment.py

@@ -56,7 +56,7 @@ def from_env(cls) -> "_Environment":
         RUN_URL = f"https://github.com/{REPOSITORY}/actions/runs/{RUN_ID}"
         BASE_BRANCH = os.getenv("GITHUB_BASE_REF", "")
         USER_LOGIN = ""
-        FORK_NAME = ""
+        FORK_NAME = REPOSITORY
         PR_BODY = ""
         PR_TITLE = ""
         PR_LABELS = []