diff --git a/dbms/src/Interpreters/Settings.h b/dbms/src/Interpreters/Settings.h index 354c03a9411..6442f9c8dd6 100644 --- a/dbms/src/Interpreters/Settings.h +++ b/dbms/src/Interpreters/Settings.h @@ -317,8 +317,6 @@ struct Settings \ M(SettingDouble, dt_page_gc_threshold, 0.5, "Max valid rate of deciding to do a GC in PageStorage") \ M(SettingBool, dt_enable_read_thread, false, "Enable storage read thread or not") \ - M(SettingDouble, dt_block_slots_scale, 1.0, "Block slots limit of a read request") \ - M(SettingDouble, dt_active_segments_scale, 1.0, "Acitve segments limit of a read request") \ \ M(SettingChecksumAlgorithm, dt_checksum_algorithm, ChecksumAlgo::XXH3, "Checksum algorithm for delta tree stable storage") \ M(SettingCompressionMethod, dt_compression_method, CompressionMethod::LZ4, "The method of data compression when writing.") \ diff --git a/dbms/src/Storages/DeltaMerge/SegmentReadTaskPool.cpp b/dbms/src/Storages/DeltaMerge/SegmentReadTaskPool.cpp index 80ff8487c21..88dc0742c89 100644 --- a/dbms/src/Storages/DeltaMerge/SegmentReadTaskPool.cpp +++ b/dbms/src/Storages/DeltaMerge/SegmentReadTaskPool.cpp @@ -222,8 +222,7 @@ int64_t SegmentReadTaskPool::decreaseUnorderedInputStreamRefCount() int64_t SegmentReadTaskPool::getFreeBlockSlots() const { - double block_slots_scale = dm_context->db_context.getSettingsRef().dt_block_slots_scale; - auto block_slots = static_cast(std::ceil(unordered_input_stream_ref_count.load(std::memory_order_relaxed) * block_slots_scale)); + auto block_slots = unordered_input_stream_ref_count.load(std::memory_order_relaxed); if (block_slots < 3) { block_slots = 3; @@ -233,8 +232,7 @@ int64_t SegmentReadTaskPool::getFreeBlockSlots() const int64_t SegmentReadTaskPool::getFreeActiveSegmentCountUnlock() { - double active_segments_scale = dm_context->db_context.getSettingsRef().dt_active_segments_scale; - auto active_segment_limit = static_cast(std::ceil(unordered_input_stream_ref_count.load(std::memory_order_relaxed) * active_segments_scale)); + auto active_segment_limit = unordered_input_stream_ref_count.load(std::memory_order_relaxed); if (active_segment_limit < 2) { active_segment_limit = 2;