From 598ad247c121eedbc277987a1c80b8fdffde8dfb Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Fri, 11 Jul 2025 09:12:05 -0400 Subject: [PATCH 01/44] Fixed "not official build" message --- src/Common/SignalHandlers.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/SignalHandlers.cpp b/src/Common/SignalHandlers.cpp index 26498403291e..86eea90c9206 100644 --- a/src/Common/SignalHandlers.cpp +++ b/src/Common/SignalHandlers.cpp @@ -549,14 +549,14 @@ try } /// Advice the user to send it manually. - if (std::string_view(VERSION_OFFICIAL).contains("official build")) + if (std::string_view(VERSION_OFFICIAL).contains("altinity build")) { const auto & date_lut = DateLUT::instance(); /// Approximate support period, upper bound. if (time(nullptr) - date_lut.makeDate(2000 + VERSION_MAJOR, VERSION_MINOR, 1) < (365 + 30) * 86400) { - LOG_FATAL(log, "Report this error to https://github.com/ClickHouse/ClickHouse/issues"); + LOG_FATAL(log, "Report this error to https://github.com/Altinity/ClickHouse/issues"); } else { @@ -565,7 +565,7 @@ try } else { - LOG_FATAL(log, "This ClickHouse version is not official and should be upgraded to the official build."); + // LOG_FATAL(log, "This ClickHouse version is not official and should be upgraded to the official build."); } } From 6dadf253d6f2374db76e029fe0531693a5b2b411 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Thu, 26 Jun 2025 08:19:34 +0200 Subject: [PATCH 02/44] Merge pull request #870 from Altinity/fix_branding_25.3 --- docker/server/README.md | 2 +- docker/server/README.src/logo.svg | 56 ++++++---------------- docs/ru/images/logo.svg | 17 ++++++- docs/zh/images/logo.svg | 17 ++++++- packages/clickhouse-client.yaml | 6 +-- packages/clickhouse-common-static-dbg.yaml | 6 +-- packages/clickhouse-keeper-dbg.yaml | 6 +-- packages/clickhouse-keeper.yaml | 6 +-- packages/clickhouse-server.yaml | 6 +-- programs/server/binary.html | 4 +- programs/server/dashboard.html | 2 +- programs/server/play.html | 7 +-- utils/tests-visualizer/index.html | 2 +- 13 files changed, 71 insertions(+), 66 deletions(-) diff --git a/docker/server/README.md b/docker/server/README.md index 5f6144d0633a..ff3d68643e4b 100644 --- a/docker/server/README.md +++ b/docker/server/README.md @@ -177,4 +177,4 @@ EOSQL ## License -View [license information](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) for the software contained in this image. +View [license information](https://github.com/Altinity/ClickHouse/blob/antalya/LICENSE) for the software contained in this image. diff --git a/docker/server/README.src/logo.svg b/docker/server/README.src/logo.svg index a50dd81a1645..886f4f0e4ddd 100644 --- a/docker/server/README.src/logo.svg +++ b/docker/server/README.src/logo.svg @@ -1,43 +1,17 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/docs/ru/images/logo.svg b/docs/ru/images/logo.svg index b5ab923ff653..7d2e34d4b320 100644 --- a/docs/ru/images/logo.svg +++ b/docs/ru/images/logo.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/docs/zh/images/logo.svg b/docs/zh/images/logo.svg index b5ab923ff653..5d0a9a6b64fd 100644 --- a/docs/zh/images/logo.svg +++ b/docs/zh/images/logo.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + diff --git a/packages/clickhouse-client.yaml b/packages/clickhouse-client.yaml index 34b42d92adfe..c8469b1744c5 100644 --- a/packages/clickhouse-client.yaml +++ b/packages/clickhouse-client.yaml @@ -11,12 +11,12 @@ description: | arch: "${DEB_ARCH}" # amd64, arm64 platform: "linux" version: "${CLICKHOUSE_VERSION_STRING}" -vendor: "ClickHouse Inc." -homepage: "https://clickhouse.com" +vendor: "Altinity Inc." +homepage: "https://altinity.com" license: "Apache" section: "database" priority: "optional" -maintainer: "ClickHouse Dev Team " +maintainer: "Altinity Server Dev Team " deb: fields: Source: clickhouse diff --git a/packages/clickhouse-common-static-dbg.yaml b/packages/clickhouse-common-static-dbg.yaml index 74b7fa8381bc..c656fb372a0b 100644 --- a/packages/clickhouse-common-static-dbg.yaml +++ b/packages/clickhouse-common-static-dbg.yaml @@ -11,12 +11,12 @@ description: | arch: "${DEB_ARCH}" # amd64, arm64 platform: "linux" version: "${CLICKHOUSE_VERSION_STRING}" -vendor: "ClickHouse Inc." -homepage: "https://clickhouse.com" +vendor: "Altinity Inc." +homepage: "https://altinity.com" license: "Apache" section: "database" priority: "optional" -maintainer: "ClickHouse Dev Team " +maintainer: "Altinity Server Dev Team " deb: fields: Source: clickhouse diff --git a/packages/clickhouse-keeper-dbg.yaml b/packages/clickhouse-keeper-dbg.yaml index 28d53b39518d..d992eaf2375f 100644 --- a/packages/clickhouse-keeper-dbg.yaml +++ b/packages/clickhouse-keeper-dbg.yaml @@ -11,12 +11,12 @@ description: | arch: "${DEB_ARCH}" # amd64, arm64 platform: "linux" version: "${CLICKHOUSE_VERSION_STRING}" -vendor: "ClickHouse Inc." -homepage: "https://clickhouse.com" +vendor: "Altinity Inc." +homepage: "https://altinity.com" license: "Apache" section: "database" priority: "optional" -maintainer: "ClickHouse Dev Team " +maintainer: "Altinity Server Dev Team " deb: fields: Source: clickhouse diff --git a/packages/clickhouse-keeper.yaml b/packages/clickhouse-keeper.yaml index 9dad5382c082..e6a0d18d9242 100644 --- a/packages/clickhouse-keeper.yaml +++ b/packages/clickhouse-keeper.yaml @@ -11,12 +11,12 @@ description: | arch: "${DEB_ARCH}" # amd64, arm64 platform: "linux" version: "${CLICKHOUSE_VERSION_STRING}" -vendor: "ClickHouse Inc." -homepage: "https://clickhouse.com" +vendor: "Altinity Inc." +homepage: "https://altinity.com" license: "Apache" section: "database" priority: "optional" -maintainer: "ClickHouse Dev Team " +maintainer: "Altinity Server Dev Team " deb: fields: Source: clickhouse diff --git a/packages/clickhouse-server.yaml b/packages/clickhouse-server.yaml index dc183ead1020..d1d36e4a4ba5 100644 --- a/packages/clickhouse-server.yaml +++ b/packages/clickhouse-server.yaml @@ -11,12 +11,12 @@ description: | arch: "${DEB_ARCH}" # amd64, arm64 platform: "linux" version: "${CLICKHOUSE_VERSION_STRING}" -vendor: "ClickHouse Inc." -homepage: "https://clickhouse.com" +vendor: "Altinity Inc." +homepage: "https://altinity.com" license: "Apache" section: "database" priority: "optional" -maintainer: "ClickHouse Dev Team " +maintainer: "Altinity Server Dev Team " deb: fields: Source: clickhouse diff --git a/programs/server/binary.html b/programs/server/binary.html index eec39cd44638..836994a2eeb0 100644 --- a/programs/server/binary.html +++ b/programs/server/binary.html @@ -2,7 +2,7 @@ - + ClickHouse Binary Viewer