thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove part of the changes, to be moved to Sync

Browse Source
This commit is contained in:
kssenii 2024-10-18 12:05:48 +02:00
parent 66bbf11e07
commit 5c422be620
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Settings.cpp
View File

@ -4842,9 +4842,6 @@ Limit on size of a single batch of file segments that a read buffer can request
)", 0) \
M(UInt64, filesystem_cache_reserve_space_wait_lock_timeout_milliseconds, 1000, R"(
Wait time to lock cache for space reservation in filesystem cache
)", 0) \
M(Bool, filesystem_cache_enable_background_download_for_metadata_files, true, R"(
Enable background download for metadata files in filesystem cache (related to background_download_threads cache settings)
)", 0) \
M(UInt64, temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds, (10 * 60 * 1000), R"(
Wait time to lock cache for space reservation for temporary data in filesystem cache

1
src/Core/SettingsChangesHistory.cpp
View File

@ -104,7 +104,6 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
{"allow_reorder_prewhere_conditions", false, true, "New setting"},
{"input_format_parquet_bloom_filter_push_down", false, true, "When reading Parquet files, skip whole row groups based on the WHERE/PREWHERE expressions and bloom filter in the Parquet metadata."},
{"date_time_64_output_format_cut_trailing_zeros_align_to_groups_of_thousands", false, false, "Dynamically trim the trailing zeros of datetime64 values to adjust the output scale to (0, 3, 6), corresponding to 'seconds', 'milliseconds', and 'microseconds'."}
{"filesystem_cache_enable_background_download_for_metadata_files", true, true, "New setting"},
}
},
{"24.9",

2
src/Interpreters/Cache/FileSegment.cpp
View File

@ -28,6 +28,7 @@ namespace ProfileEvents
extern const Event FileSegmentFailToIncreasePriority;
extern const Event FilesystemCacheHoldFileSegments;
extern const Event FilesystemCacheUnusedHoldFileSegments;
extern const Event FilesystemCacheBackgroundDownloadQueuePush;
}
namespace CurrentMetrics
@ -706,6 +707,7 @@ void FileSegment::complete(bool allow_background_download)
bool added_to_download_queue = false;
if (allow_background_download && background_download_enabled && remote_file_reader)
{
ProfileEvents::increment(ProfileEvents::FilesystemCacheBackgroundDownloadQueuePush);
added_to_download_queue = locked_key->addToDownloadQueue(offset(), segment_lock); /// Finish download in background.
}

2
src/Interpreters/Context.cpp
View File

@ -239,7 +239,6 @@ namespace Setting
extern const SettingsUInt64 use_structure_from_insertion_table_in_table_functions;
extern const SettingsString workload;
extern const SettingsString compatibility;
extern const SettingsBool filesystem_cache_enable_background_download_for_metadata_files;
}
namespace MergeTreeSetting
@ -5688,7 +5687,6 @@ ReadSettings Context::getReadSettings() const
res.filesystem_cache_segments_batch_size = settings_ref[Setting::filesystem_cache_segments_batch_size];
res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds
= settings_ref[Setting::filesystem_cache_reserve_space_wait_lock_timeout_milliseconds];
res.filesystem_cache_allow_background_download = settings_ref[Setting::filesystem_cache_enable_background_download_for_metadata_files];
res.filesystem_cache_max_download_size = settings_ref[Setting::filesystem_cache_max_download_size];
res.skip_download_if_exceeds_query_cache = settings_ref[Setting::skip_download_if_exceeds_query_cache];