From fe17c2460de87a261254f9aa5aa7b12399b3a2eb Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Fri, 29 Aug 2025 15:09:37 +0200 Subject: [PATCH 1/2] Turned on some experimental catalogs DBs for DataLakeCatalog BD engine by default allow_experimental_database_iceberg = true allow_experimental_database_unity_catalog = true allow_experimental_database_glue_catalog = true --- src/Core/Settings.cpp | 6 +++--- src/Core/SettingsChangesHistory.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Core/Settings.cpp b/src/Core/Settings.cpp index 77db44fe35d7..f1ab62710872 100644 --- a/src/Core/Settings.cpp +++ b/src/Core/Settings.cpp @@ -6821,13 +6821,13 @@ Allow to create database with Engine=MaterializedPostgreSQL(...). DECLARE(Bool, allow_experimental_query_deduplication, false, R"( Experimental data deduplication for SELECT queries based on part UUIDs )", EXPERIMENTAL) \ - DECLARE(Bool, allow_experimental_database_iceberg, false, R"( + DECLARE(Bool, allow_experimental_database_iceberg, true, R"( Allow experimental database engine DataLakeCatalog with catalog_type = 'iceberg' )", EXPERIMENTAL) \ - DECLARE(Bool, allow_experimental_database_unity_catalog, false, R"( + DECLARE(Bool, allow_experimental_database_unity_catalog, true, R"( Allow experimental database engine DataLakeCatalog with catalog_type = 'unity' )", EXPERIMENTAL) \ - DECLARE(Bool, allow_experimental_database_glue_catalog, false, R"( + DECLARE(Bool, allow_experimental_database_glue_catalog, true, R"( Allow experimental database engine DataLakeCatalog with catalog_type = 'glue' )", EXPERIMENTAL) \ DECLARE(Bool, allow_experimental_database_hms_catalog, false, R"( diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp index 6e6bfe580117..5bad960ee8d2 100644 --- a/src/Core/SettingsChangesHistory.cpp +++ b/src/Core/SettingsChangesHistory.cpp @@ -67,6 +67,13 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory() /// controls new feature and it's 'true' by default, use 'false' as previous_value). /// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972) /// Note: please check if the key already exists to prevent duplicate entries. + + addSettingsChanges(settings_changes_history, "25.6.5.2000", + { + {"allow_experimental_database_iceberg", false, true, "Turned ON by default for Antalya"}, + {"allow_experimental_database_unity_catalog", false, true, "Turned ON by default for Antalya"}, + {"allow_experimental_database_glue_catalog", false, true, "Turned ON by default for Antalya"}, + }); addSettingsChanges(settings_changes_history, "25.6", { {"output_format_native_use_flattened_dynamic_and_json_serialization", false, false, "Add flattened Dynamic/JSON serializations to Native format"}, From 3fdd6a22bc672014f86eff071a533f521b153dc8 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Wed, 3 Sep 2025 20:34:36 +0200 Subject: [PATCH 2/2] Added Antalya exceptions --- ...experimental_settings_cannot_be_enabled_by_default.sql | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql b/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql index 718eb63ad923..b693a57d053a 100644 --- a/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql +++ b/tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql @@ -4,5 +4,11 @@ -- However, some settings in the experimental tier are meant to control another experimental feature, and then they can be enabled as long as the feature itself is disabled. -- These are in the exceptions list inside NOT IN. -SELECT name, value FROM system.settings WHERE tier = 'Experimental' AND type = 'Bool' AND value != '0' AND name NOT IN ('throw_on_unsupported_query_inside_transaction'); +SELECT name, value FROM system.settings WHERE tier = 'Experimental' AND type = 'Bool' AND value != '0' AND name NOT IN ( + 'throw_on_unsupported_query_inside_transaction', +-- turned ON for Altinity Antalya builds specifically + 'allow_experimental_database_iceberg', + 'allow_experimental_database_unity_catalog', + 'allow_experimental_database_glue_catalog' +); SELECT name, value FROM system.merge_tree_settings WHERE tier = 'Experimental' AND type = 'Bool' AND value != '0' AND name NOT IN ('remove_rolled_back_parts_immediately');