Merge branch 'master' into chesema-deduplicate-sync-inserts

Author: CheSema

base/base/find_symbols.h

@@ -274,7 +274,7 @@ inline const char * find_first_symbols_sse42(const char * const begin, const cha
     const char * pos = begin;
 
 #if defined(__SSE4_2__)
-    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;
+    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;  // NOLINT(misc-redundant-expression)
 
     __m128i set = _mm_setr_epi8(c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16);
 

ci/docker/binary-builder/Dockerfile

@@ -5,7 +5,7 @@ ENV CC=clang-${LLVM_VERSION}
 ENV CXX=clang++-${LLVM_VERSION}
 
 # If the cctools is updated, then first build it in the CI, then update here in a different commit
-COPY --from=clickhouse/cctools:a551cc7348883028fb53 /cctools /cctools
+COPY --from=clickhouse/cctools:4670e95dde3de689f103 /cctools /cctools
 
 # A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
 RUN apt-get update \

ci/docker/fasttest/Dockerfile

@@ -67,7 +67,7 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
-COPY --from=clickhouse/cctools:a551cc7348883028fb53 /opt/gdb /opt/gdb
+COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
 # Give suid to gdb to grant it attach permissions
 RUN chmod u+s /opt/gdb/bin/gdb
 ENV PATH="/opt/gdb/bin:${PATH}"

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

@@ -2836,6 +2836,8 @@ stochasticlinearregression
 stochasticlogisticregression
 storages
 storig
+stringBytesEntropy
+stringBytesUniq
 stringCompare
 stringJaccardIndex
 stringJaccardIndexUTF

ci/jobs/scripts/workflow_hooks/filter_job.py

@@ -19,11 +19,10 @@ def only_docs(changed_files):
     return True
 
 
-ONLY_DOCS_JOBS = [
+DO_NOT_TEST_JOBS = [
     JobNames.STYLE_CHECK,
     JobNames.DOCKER_BUILDS_ARM,
     JobNames.DOCKER_BUILDS_AMD,
-    JobNames.Docs,
 ]
 
 PRELIMINARY_JOBS = [
@@ -56,10 +55,7 @@ def should_skip_job(job_name):
         print("WARNING: no changed files found for PR - do not filter jobs")
         return False, ""
 
-    if only_docs(changed_files) and job_name not in ONLY_DOCS_JOBS:
-        return True, "Docs only update"
-
-    if Labels.DO_NOT_TEST in _info_cache.pr_labels and job_name not in ONLY_DOCS_JOBS:
+    if Labels.DO_NOT_TEST in _info_cache.pr_labels and job_name not in DO_NOT_TEST_JOBS:
         return True, f"Skipped, labeled with '{Labels.DO_NOT_TEST}'"
 
     if Labels.NO_FAST_TESTS in _info_cache.pr_labels and job_name in PRELIMINARY_JOBS:

ci/praktika/result.py

@@ -448,7 +448,9 @@ def from_commands_run(
                     # Run shell command in a specified directory with logging and verbosity
                     exit_code = Shell.run(command_, verbose=True, log_file=log_file)
                     if with_info or (with_info_on_failure and exit_code != 0):
-                        with open(log_file, "r") as f:
+                        with open(
+                            log_file, "r", encoding="utf-8", errors="ignore"
+                        ) as f:
                             error_infos.append(f.read().strip())
                     res = exit_code == 0
 

contrib/corrosion-cmake/CMakeLists.txt

@@ -77,7 +77,7 @@ if (USE_MUSL)
     set(RUST_CXXFLAGS "${RUST_CXXFLAGS} -D_LIBCPP_HAS_MUSL_LIBC=1")
 endif ()
 
-if(CCACHE_EXECUTABLE MATCHES "/sccache$")
+if(CCACHE_EXECUTABLE MATCHES "/chcache$")
     message(STATUS "Using RUSTC_WRAPPER: ${CCACHE_EXECUTABLE}")
     set(RUSTCWRAPPER "${CCACHE_EXECUTABLE}")
 else()
@@ -157,10 +157,10 @@ function(clickhouse_config_crate_flags target_name)
     corrosion_set_env_vars(${target_name} "RUSTFLAGS=${RUSTFLAGS}")
     corrosion_set_env_vars(${target_name} "RUSTDOCFLAGS=${RUSTFLAGS}")
 
-    # Disabled because sccache seems to be broken and mixes up builds
-    # if (NOT "${RUSTCWRAPPER}" STREQUAL "")
-    #    corrosion_set_env_vars(${target_name} "CARGO_BUILD_RUSTC_WRAPPER=${RUSTCWRAPPER}")
-    # endif()
+    # sccache seems to be broken and mixes up builds
+    if (NOT "${RUSTCWRAPPER}" STREQUAL "")
+       corrosion_set_env_vars(${target_name} "CARGO_BUILD_RUSTC_WRAPPER=${RUSTCWRAPPER}")
+    endif()
 
     if (NOT "${RUST_CARGO_BUILD_STD}" STREQUAL "")
         corrosion_set_cargo_flags(${target_name} "${RUST_CARGO_BUILD_STD}")

contrib/delta-kernel-rs

@@ -9,6 +9,7 @@ echo '/src/aws-cpp-sdk-core/*' >> $FILES_TO_CHECKOUT
 echo '/generated/src/aws-cpp-sdk-s3/*' >> $FILES_TO_CHECKOUT
 echo '/generated/src/aws-cpp-sdk-aws/*' >> $FILES_TO_CHECKOUT
 echo '/generated/src/aws-cpp-sdk-glue/*' >> $FILES_TO_CHECKOUT
+echo '/generated/src/aws-cpp-sdk-kms/*' >> $FILES_TO_CHECKOUT
 
 git config core.sparsecheckout true
 git checkout $1