Skip to content

Commit e7c251a

Browse files
committed
Fix after cherry-pick
1 parent e205c50 commit e7c251a

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

src/Core/SettingsChangesHistory.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
7070
{
7171
// Altinity Antalya modifications atop of 25.3
7272
{"lock_object_storage_task_distribution_ms", 0, 0, "New setting."},
73-
{"geotoh3_lon_lat_input_order", true, false, "A new setting for legacy behaviour to set lon and lat order"},
74-
{"secondary_indices_enable_bulk_filtering", false, true, "A new algorithm for filtering by data skipping indices"},
75-
{"implicit_table_at_top_level", "", "", "A new setting, used in clickhouse-local"},
76-
{"use_skip_indexes_if_final_exact_mode", 0, 0, "This setting was introduced to help FINAL query return correct results with skip indexes"},
77-
{"parallel_replicas_insert_select_local_pipeline", false, false, "Use local pipeline during distributed INSERT SELECT with parallel replicas. Currently disabled due to performance issues"},
78-
{"page_cache_block_size", 1048576, 1048576, "Made this setting adjustable on a per-query level."},
79-
{"page_cache_lookahead_blocks", 16, 16, "Made this setting adjustable on a per-query level."},
80-
{"output_format_pretty_glue_chunks", "0", "auto", "A new setting to make Pretty formats prettier."},
8173
{"allow_experimental_delta_kernel_rs", false, false, "New setting"},
8274
});
8375
addSettingsChanges(settings_changes_history, "25.2.1.20000",

src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
128128
{
129129
_assertInitialized();
130130
return (*settings)[DataLakeStorageSetting::allow_dynamic_metadata_for_data_lakes]
131-
&& current_metadata->supportsExternalMetadataChange();
131+
&& current_metadata->supportsSchemaEvolution();
132132
}
133133

134134
bool supportsFileIterator() const override { return true; }

src/Storages/ObjectStorage/StorageObjectStorageSettings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ using StorageObjectStorageSettingsPtr = std::shared_ptr<StorageObjectStorageSett
7979

8080
#define LIST_OF_STORAGE_OBJECT_STORAGE_SETTINGS(M, ALIAS) \
8181
STORAGE_OBJECT_STORAGE_RELATED_SETTINGS(M, ALIAS) \
82+
OBSOLETE_SETTINGS(M, ALIAS) \
8283
LIST_OF_ALL_FORMAT_SETTINGS(M, ALIAS)
8384

8485
}

0 commit comments

Comments
 (0)