Merge remote-tracking branch 'origin/master' into simplify_lwd_projection_drop_logic

Author: jsc0218

.github/workflows/create_release.yml

@@ -128,7 +128,7 @@ jobs:
         run: |
           python3 ./tests/ci/create_release.py --set-progress-started --progress "update changelog, docker version, security"
 
-          git checkout master  # in case WF started from feature branch
+          # git checkout master  # in case WF started from feature branch
           echo "List versions"
           ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
           echo "Update docker version"

CHANGELOG.md

@@ -14,7 +14,7 @@
 
 # 2025 Changelog
 
-### <a id="254"></a> ClickHouse release 25.4 LTS, 2025-04-22
+### <a id="254"></a> ClickHouse release 25.4, 2025-04-22
 
 #### Backward Incompatible Change
 * Check if all columns in a materialized view match the target table when `allow_materialized_view_with_bad_select` is `false`. [#74481](https://github.com/ClickHouse/ClickHouse/pull/74481) ([Christoph Wurm](https://github.com/cwurm)).

SECURITY.md

@@ -14,9 +14,10 @@ The following versions of ClickHouse server are currently supported with securit
 
 | Version | Supported |
 |:-|:-|
+| 25.4 | ✔️ |
 | 25.3 | ✔️ |
 | 25.2 | ✔️ |
-| 25.1 | ✔️ |
+| 25.1 | ❌ |
 | 24.12 | ❌ |
 | 24.11 | ❌ |
 | 24.10 | ❌ |

ci/jobs/build_clickhouse.py

@@ -13,7 +13,7 @@
 temp_dir = f"{current_directory}/ci/tmp"
 
 BUILD_TYPE_TO_CMAKE = {
-    BuildTypes.AMD_DEBUG: f"    cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=Debug -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON",
+    BuildTypes.AMD_DEBUG: f"    cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=Debug -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DENABLE_XRAY=1",
     BuildTypes.AMD_RELEASE: f"  cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=1 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON -DSPLIT_DEBUG_SYMBOLS=ON -DBUILD_STANDALONE_KEEPER=1",
     BuildTypes.AMD_BINARY: f"   cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=          -DENABLE_CHECK_HEAVY_BUILDS=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=0 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON",
     BuildTypes.AMD_ASAN: f"     cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_BUILD_TYPE=None  -DENABLE_THINLTO=0 -DSANITIZE=address   -DENABLE_CHECK_HEAVY_BUILDS=1 -DENABLE_CLICKHOUSE_SELF_EXTRACTING=1 -DCMAKE_C_COMPILER={ToolSet.COMPILER_C} -DCMAKE_CXX_COMPILER={ToolSet.COMPILER_CPP} -DCOMPILER_CACHE=sccache -DENABLE_BUILD_PROFILING=1 -DENABLE_TESTS=1 -DENABLE_UTILS=0 -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON",
@@ -156,7 +156,6 @@ def main():
                 name="Cmake configuration",
                 command=cmake_cmd,
                 workdir=build_dir,
-                with_log=True,
             )
         )
         res = results[-1].is_ok()
@@ -177,7 +176,6 @@ def main():
                 name="Build ClickHouse",
                 command=f"ninja {targets}",
                 workdir=build_dir,
-                with_log=True,
             )
         )
         run_shell("sccache stats", "sccache --show-stats")
@@ -208,7 +206,6 @@ def main():
                     f"cd {Utils.cwd()}/packages/ && OUTPUT_DIR={temp_dir} BUILD_TYPE={BUILD_TYPE_TO_DEB_PACKAGE_TYPE[build_type]} VERSION_STRING={version_dict['string']} DEB_ARCH={deb_arch} ./build --deb {'--rpm --tgz' if 'release' in build_type else ''}",
                 ],
                 workdir=build_dir,
-                with_log=True,
             )
         )
         res = results[-1].is_ok()

ci/jobs/clickbench.py

@@ -36,7 +36,6 @@ def start():
             Result.from_commands_run(
                 name="Start ClickHouse",
                 command=[start, log_export_config, setup_logs_replication],
-                with_log=True,
             )
         )
         res = results[-1].is_ok()

ci/jobs/collect_statistics.py

@@ -139,9 +139,7 @@ def get_all_job_names():
         return True
 
     results.append(
-        Result.from_commands_run(
-            name="Get all job names", command=get_all_job_names, with_info=True
-        )
+        Result.from_commands_run(name="Get all job names", command=get_all_job_names)
     )
     if not results[-1].is_ok():
         sys.exit()

ci/jobs/docker_server_job.py

@@ -103,11 +103,7 @@ def main():
     command = f"docker buildx build --platform {platforms} \
                     -t {image_repo}:tmp {image_path} -f {docker_path}/Dockerfile.ubuntu"
 
-    results.append(
-        Result.from_commands_run(
-            name=f"{image_repo}:tmp", command=command, with_log=True
-        )
-    )
+    results.append(Result.from_commands_run(name=f"{image_repo}:tmp", command=command))
 
     Result.create_from(results=results, stopwatch=stopwatch).complete_job()
 

ci/jobs/fast_test.py

@@ -175,7 +175,6 @@ def main():
                 -DENABLE_TESTS=0 -DENABLE_UTILS=0 -DENABLE_THINLTO=0 -DENABLE_NURAFT=1 -DENABLE_SIMDJSON=1 \
                 -DENABLE_JEMALLOC=1 -DENABLE_LIBURING=1 -DENABLE_YAML_CPP=1 -DCOMPILER_CACHE=sccache",
                 workdir=build_dir,
-                with_log=True,
             )
         )
         res = results[-1].is_ok()
@@ -187,7 +186,6 @@ def main():
                 name="Build ClickHouse",
                 command="ninja clickhouse-bundle clickhouse-stripped",
                 workdir=build_dir,
-                with_log=True,
             )
         )
         Shell.check("sccache --show-stats")
@@ -205,7 +203,6 @@ def main():
                 name="Check and Compress binary",
                 command=commands,
                 workdir=build_dir,
-                with_log=True,
             )
         )
         res = results[-1].is_ok()
@@ -223,7 +220,6 @@ def main():
             Result.from_commands_run(
                 name="Install ClickHouse Config",
                 command=commands,
-                with_log=True,
             )
         )
         res = results[-1].is_ok()

ci/jobs/functional_stateful_tests.py

@@ -104,9 +104,7 @@ def main():
             f"clickhouse-server --version",
         ]
         results.append(
-            Result.from_commands_run(
-                name="Install ClickHouse", command=commands, with_log=True
-            )
+            Result.from_commands_run(name="Install ClickHouse", command=commands)
         )
         res = results[-1].is_ok()
 

ci/jobs/functional_stateless_tests.py

@@ -121,9 +121,7 @@ def main():
             f"clickhouse-server --version",
         ]
         results.append(
-            Result.from_commands_run(
-                name="Install ClickHouse", command=commands, with_log=True
-            )
+            Result.from_commands_run(name="Install ClickHouse", command=commands)
         )
         res = results[-1].is_ok()