Skip to content

Commit 3dd9b46

Browse files
committed
Fix stateless tests
1 parent 4e9ac7e commit 3dd9b46

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/Core/SettingsChangesHistory.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
4848
{"object_storage_max_nodes", 0, 0, "New setting"},
4949
{"allow_retries_in_cluster_requests", false, false, "New setting"},
5050
{"object_storage_remote_initiator", false, false, "New setting."},
51+
{"allow_experimental_export_merge_tree_part", false, false, "New setting."},
52+
{"export_merge_tree_part_overwrite_file_if_exists", false, false, "New setting."},
5153
});
5254
addSettingsChanges(settings_changes_history, "25.8",
5355
{
@@ -143,24 +145,13 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
143145
{"distributed_plan_force_shuffle_aggregation", 0, 0, "New experimental setting"},
144146
{"allow_experimental_insert_into_iceberg", false, false, "New setting."},
145147
/// RELEASE CLOSED
146-
{"allow_experimental_database_iceberg", false, true, "Turned ON by default for Antalya"},
147-
{"allow_experimental_database_unity_catalog", false, true, "Turned ON by default for Antalya"},
148-
{"allow_experimental_database_glue_catalog", false, true, "Turned ON by default for Antalya"},
149-
{"output_format_parquet_enum_as_byte_array", true, true, "Enable writing Enum as byte array in Parquet by default"},
150-
{"lock_object_storage_task_distribution_ms", 0, 0, "New setting."},
151-
{"object_storage_cluster", "", "", "New setting"},
152-
{"object_storage_max_nodes", 0, 0, "New setting"},
153148
});
154149
addSettingsChanges(settings_changes_history, "25.6.5.2000",
155150
{
156151
{"allow_experimental_database_iceberg", false, true, "Turned ON by default for Antalya"},
157152
{"allow_experimental_database_unity_catalog", false, true, "Turned ON by default for Antalya"},
158153
{"allow_experimental_database_glue_catalog", false, true, "Turned ON by default for Antalya"},
159154
{"output_format_parquet_enum_as_byte_array", true, true, "Enable writing Enum as byte array in Parquet by default"},
160-
{"object_storage_cluster", "", "", "New setting"},
161-
{"object_storage_max_nodes", 0, 0, "New setting"},
162-
{"allow_experimental_export_merge_tree_part", false, false, "New setting."},
163-
{"export_merge_tree_part_overwrite_file_if_exists", false, false, "New setting."},
164155
});
165156
addSettingsChanges(settings_changes_history, "25.6",
166157
{

src/Interpreters/InterpreterInsertQuery.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,9 @@ InterpreterInsertQuery::distributedWriteIntoReplicatedMergeTreeFromClusterStorag
772772
if (!src_storage_cluster)
773773
return {};
774774

775+
if (src_storage_cluster->getOriginalClusterName().empty())
776+
return {};
777+
775778
if (!isInsertSelectTrivialEnoughForDistributedExecution(query))
776779
return {};
777780

0 commit comments

Comments
 (0)