Skip to content

Commit 1f2390b

Browse files
KochetovNicolaiKochetovNicolai
authored
Merge pull request ClickHouse#12840 from ClickHouse/remove-wrong-threads-limiting
Remove thread limiting.
2 parents da32e62 + a59e1c2 commit 1f2390b

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

‎src/Processors/QueryPlan/ReadFromStorageStep.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ ReadFromStorageStep::ReadFromStorageStep(
114114
}
115115
}
116116

117-
if (pipes.size() == 1 && !storage->isView())
118-
pipeline->setMaxThreads(1);
119-
120117
for (auto & pipe : pipes)
121118
pipe.enableQuota();
122119

‎tests/performance/local_replica.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<test>
2+
<query>select sum(number) from remote('127.0.0.{{1|2}}', numbers_mt(1000000000)) group by bitAnd(number, 1)</query>
3+
</test>

‎tests/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.reference‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
249999500000
2+
250000000000
3+
1

‎tests/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set log_queries = 1;
2+
set max_threads = 16;
3+
4+
select sum(number) from remote('127.0.0.{1|2}', numbers_mt(1000000)) group by number % 2 order by number % 2;
5+
6+
system flush logs;
7+
select length(thread_ids) >= 16 from system.query_log where event_date >= today() - 1 and lower(query) like '%select sum(number) from remote(_127.0.0.{1|2}_, numbers_mt(1000000)) group by number %' and type = 'QueryFinish' order by query_start_time desc limit 1;

0 commit comments

Comments
 (0)