Merge pull request #1084 from Altinity/fixes/25.8/fix_02995_new_settings_history

Test, settings, and configuration

Author: Enmk

programs/server/config.xml

@@ -1733,9 +1733,9 @@
         <!-- the ClickHouse core developers team. -->
         <!-- Doing so at least in pre-production environments is highly appreciated -->
         <!-- The reports are anonymized -->
-        <enabled>true</enabled>
-        <send_logical_errors>true</send_logical_errors>
-        <endpoint>https://crash.clickhouse.com/</endpoint>
+        <enabled>false</enabled>
+        <send_logical_errors>false</send_logical_errors>
+        <endpoint></endpoint>
     </send_crash_reports>
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->

src/Core/Settings.cpp

@@ -6645,13 +6645,13 @@ The timeout in milliseconds for connecting to a remote replica during query exec
     DECLARE(Bool, parallel_replicas_for_cluster_engines, true, R"(
 Replace table function engines with their -Cluster alternatives
 )", 0) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_iceberg, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_iceberg, true, R"(
 Allow experimental database engine DataLakeCatalog with catalog_type = 'iceberg'
 )", BETA, allow_database_iceberg) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_unity_catalog, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_unity_catalog, true, R"(
 Allow experimental database engine DataLakeCatalog with catalog_type = 'unity'
 )", BETA, allow_database_unity_catalog) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_glue_catalog, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_database_glue_catalog, true, R"(
 Allow experimental database engine DataLakeCatalog with catalog_type = 'glue'
 )", BETA, allow_database_glue_catalog) \
     DECLARE_WITH_ALIAS(Bool, allow_experimental_analyzer, true, R"(
@@ -7083,7 +7083,7 @@ Execute request to object storage as remote on one of object_storage_cluster nod
     DECLARE_WITH_ALIAS(Bool, allow_experimental_time_series_aggregate_functions, false, R"(
 Experimental timeSeries* aggregate functions for Prometheus-like timeseries resampling, rate, delta calculation.
 )", EXPERIMENTAL, allow_experimental_ts_to_grid_aggregate_function) \
-    DECLARE_WITH_ALIAS(Bool, allow_experimental_export_merge_tree_part, false, R"(
+    DECLARE_WITH_ALIAS(Bool, allow_experimental_export_merge_tree_part, true, R"(
 Experimental export merge tree part.
 )", EXPERIMENTAL, allow_experimental_export_merge_tree_part) \
     \

src/Core/SettingsChangesHistory.cpp

@@ -44,10 +44,9 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"allow_experimental_iceberg_read_optimization", true, true, "New setting."},
             {"object_storage_cluster_join_mode", "allow", "allow", "New setting"},
             {"lock_object_storage_task_distribution_ms", 500, 500, "Raised the value to 500 to avoid hoping tasks between executors."},
-            {"object_storage_cluster", "", "", "New setting"},
-            {"object_storage_max_nodes", 0, 0, "New setting"},
             {"allow_retries_in_cluster_requests", false, false, "New setting"},
             {"object_storage_remote_initiator", false, false, "New setting."},
+            {"allow_experimental_export_merge_tree_part", false, true, "Turned ON by default for Antalya."},
         });
         addSettingsChanges(settings_changes_history, "25.8",
         {
@@ -143,13 +142,6 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"distributed_plan_force_shuffle_aggregation", 0, 0, "New experimental setting"},
             {"allow_experimental_insert_into_iceberg", false, false, "New setting."},
             /// RELEASE CLOSED
-            {"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"},
-            {"output_format_parquet_enum_as_byte_array", true, true, "Enable writing Enum as byte array in Parquet by default"},
-            {"lock_object_storage_task_distribution_ms", 0, 0, "New setting."},
-            {"object_storage_cluster", "", "", "New setting"},
-            {"object_storage_max_nodes", 0, 0, "New setting"},
         });
         addSettingsChanges(settings_changes_history, "25.6.5.2000",
         {
@@ -161,6 +153,7 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"object_storage_max_nodes", 0, 0, "New setting"},
             {"allow_experimental_export_merge_tree_part", false, false, "New setting."},
             {"export_merge_tree_part_overwrite_file_if_exists", false, false, "New setting."},
+            {"lock_object_storage_task_distribution_ms", 0, 0, "New setting."},
         });
         addSettingsChanges(settings_changes_history, "25.6",
         {

tests/queries/0_stateless/02995_new_settings_history.sh

@@ -23,8 +23,8 @@ fi
 
 # Note that this is a broad check. A per version check is done in the upgrade test
 # Baselines generated with v25.7.1 (pre-release)
-# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_settings_25_7_1.tsv
-# clickhouse local --query "select name, value from system.merge_tree_settings order by name format TSV" > 02995_merge_tree_settings_settings_25_7_1.tsv
+# clickhouse local --query "select name, default from system.settings WHERE NOT has((select flatten(groupArray(changes.name)) from system.settings_changes where version >= '25.8'), name) order by name format TSV" > 02995_settings_25_7_1.tsv
+# clickhouse local --query "select name, value from system.merge_tree_settings WHERE NOT has((select flatten(groupArray(changes.name)) from system.settings_changes where version >= '25.8'), name) order by name format TSV" > 02995_merge_tree_settings_settings_25_7_1.tsv
 $CLICKHOUSE_LOCAL --query "
     WITH old_settings AS
     (

tests/queries/0_stateless/02995_settings_25_7_1.tsv

@@ -26,15 +26,16 @@ allow_experimental_bigint_types	1
 allow_experimental_codecs	0
 allow_experimental_correlated_subqueries	0
 allow_experimental_database_atomic	1
-allow_experimental_database_glue_catalog	0
+allow_experimental_database_glue_catalog	1
 allow_experimental_database_hms_catalog	0
-allow_experimental_database_iceberg	0
+allow_experimental_database_iceberg	1
 allow_experimental_database_materialized_mysql	0
 allow_experimental_database_materialized_postgresql	0
 allow_experimental_database_replicated	1
-allow_experimental_database_unity_catalog	0
+allow_experimental_database_unity_catalog	1
 allow_experimental_delta_kernel_rs	1
 allow_experimental_dynamic_type	1
+allow_experimental_export_merge_tree_part	0
 allow_experimental_full_text_index	0
 allow_experimental_funnel_functions	0
 allow_experimental_geo_types	1
@@ -360,6 +361,7 @@ engine_url_skip_empty_files	0
 errors_output_format	CSV
 exact_rows_before_limit	0
 except_default_mode	ALL
+export_merge_tree_part_overwrite_file_if_exists	0
 external_storage_connect_timeout_sec	10
 external_storage_max_read_bytes	0
 external_storage_max_read_rows	0
@@ -584,13 +586,13 @@ input_format_parquet_case_insensitive_column_matching	0
 input_format_parquet_enable_json_parsing	1
 input_format_parquet_enable_row_group_prefetch	1
 input_format_parquet_filter_push_down	1
-input_format_parquet_use_metadata_cache	1
 input_format_parquet_import_nested	0
 input_format_parquet_local_file_min_bytes_for_seek	8192
 input_format_parquet_max_block_size	65409
 input_format_parquet_prefer_block_bytes	16744704
 input_format_parquet_preserve_order	0
 input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference	0
+input_format_parquet_use_metadata_cache	1
 input_format_parquet_use_native_reader	0
 input_format_protobuf_flatten_google_wrappers	0
 input_format_protobuf_skip_fields_with_unsupported_types_in_schema_inference	0
@@ -863,6 +865,8 @@ network_zstd_compression_level	1
 normalize_function_names	1
 number_of_mutations_to_delay	0
 number_of_mutations_to_throw	0
+object_storage_cluster	
+object_storage_max_nodes	0
 odbc_bridge_connection_pool_size	16
 odbc_bridge_use_connection_pooling	1
 odbc_max_field_size	0

tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql

@@ -7,6 +7,7 @@
 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_iceberg_read_optimization'
+  'allow_experimental_iceberg_read_optimization',
+  'allow_experimental_export_merge_tree_part',
 );
 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');