mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-26 17:41:59 +00:00
Don't fall-back to in-order pool when max_streams = 1
for remote fs (#57334)
* impl * update tests * update one more test
This commit is contained in:
parent
8a68d51261
commit
2362bb2cc9
@ -612,7 +612,8 @@ Pipe ReadFromMergeTree::read(
|
||||
if (read_type == ReadType::ParallelReplicas)
|
||||
return readFromPoolParallelReplicas(std::move(parts_with_range), std::move(required_columns), std::move(pool_settings));
|
||||
|
||||
if (read_type == ReadType::Default && max_streams > 1)
|
||||
/// Reading from default thread pool is beneficial for remote storage because of new prefetches.
|
||||
if (read_type == ReadType::Default && (max_streams > 1 || checkAllPartsOnRemoteFS(parts_with_range)))
|
||||
return readFromPool(std::move(parts_with_range), std::move(required_columns), std::move(pool_settings));
|
||||
|
||||
auto pipe = readInOrder(parts_with_range, required_columns, pool_settings, read_type, /*limit=*/ 0);
|
||||
|
@ -1,5 +1,6 @@
|
||||
-- Tags: no-random-merge-tree-settings, no-tsan, no-debug
|
||||
-- Tags: no-random-merge-tree-settings, no-tsan, no-debug, no-s3-storage
|
||||
-- no-tsan: too slow
|
||||
-- no-s3-storage: for remote tables we use thread pool even when reading with one stream, so memory consumption is higher
|
||||
|
||||
SET use_uncompressed_cache = 0;
|
||||
SET allow_prefetched_read_pool_for_remote_filesystem=0;
|
||||
|
@ -1,3 +1,5 @@
|
||||
-- Tags: no-s3-storage
|
||||
|
||||
drop table if exists data_02233;
|
||||
create table data_02233 (parent_key Int, child_key Int, value Int) engine=MergeTree() order by parent_key;
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
-- Tags: no-s3-storage
|
||||
|
||||
-- produces different pipeline if enabled
|
||||
set enable_memory_bound_merging_of_aggregation_results = 0;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Tags: long
|
||||
-- Tags: long, no-s3-storage
|
||||
|
||||
set max_threads = 16;
|
||||
set allow_aggregate_partitions_independently = 1;
|
||||
|
@ -1,3 +1,5 @@
|
||||
-- Tags: no-s3-storage
|
||||
|
||||
DROP TABLE IF EXISTS test_grouping_sets_predicate;
|
||||
|
||||
CREATE TABLE test_grouping_sets_predicate
|
||||
|
@ -1,3 +1,5 @@
|
||||
-- Tags: no-s3-storage
|
||||
|
||||
drop table if exists t;
|
||||
|
||||
create table t(a UInt64) engine=MergeTree order by tuple();
|
||||
|
Loading…
Reference in New Issue
Block a user