From c8473ee49192322d52426600595626dea8300677 Mon Sep 17 00:00:00 2001 From: Anton Ivashkin Date: Mon, 13 Apr 2026 17:29:58 +0200 Subject: [PATCH 1/2] Fix version parsing for Antalya branch --- src/Common/ClickHouseVersion.cpp | 10 +++++++++- src/Common/ClickHouseVersion.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Common/ClickHouseVersion.cpp b/src/Common/ClickHouseVersion.cpp index 5c3182ec2ff4..52e9cd50a70c 100644 --- a/src/Common/ClickHouseVersion.cpp +++ b/src/Common/ClickHouseVersion.cpp @@ -25,6 +25,11 @@ ClickHouseVersion::ClickHouseVersion(std::string_view version) for (const auto & split_element : split) { + if (split_element == "altinityantalya") + { + is_antalya = true; + continue; + } size_t component; ReadBufferFromString buf(split_element); if (!tryReadIntText(component, buf) || !buf.eof()) @@ -35,7 +40,10 @@ ClickHouseVersion::ClickHouseVersion(std::string_view version) String ClickHouseVersion::toString() const { - return fmt::format("{}", fmt::join(components, ".")); + auto res = fmt::format("{}", fmt::join(components, ".")); + if (is_antalya) + res += ".altinityantalya"; + return res; } } diff --git a/src/Common/ClickHouseVersion.h b/src/Common/ClickHouseVersion.h index 46c350213ee0..563aeedaf6b9 100644 --- a/src/Common/ClickHouseVersion.h +++ b/src/Common/ClickHouseVersion.h @@ -18,6 +18,7 @@ class ClickHouseVersion private: std::vector components; + bool is_antalya = false; }; } From 2fbf4c23fd1627ad420167208444a1f5976974e3 Mon Sep 17 00:00:00 2001 From: Anton Ivashkin Date: Tue, 14 Apr 2026 09:39:56 +0200 Subject: [PATCH 2/2] Check version format --- src/Common/ClickHouseVersion.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Common/ClickHouseVersion.cpp b/src/Common/ClickHouseVersion.cpp index 52e9cd50a70c..d3de355d3712 100644 --- a/src/Common/ClickHouseVersion.cpp +++ b/src/Common/ClickHouseVersion.cpp @@ -27,6 +27,9 @@ ClickHouseVersion::ClickHouseVersion(std::string_view version) { if (split_element == "altinityantalya") { + /// version like '26.3.1.20001.altinityantalya' + if (components.size() != 4 || split.size() != 5) + throw Exception{ErrorCodes::BAD_ARGUMENTS, "Cannot parse ClickHouse version here: {}", version}; is_antalya = true; continue; }