Skip to content

Commit c189bd9

Browse files
authored
Merge pull request #128142 from ClickHouse/pr-multiple-tables-probe-both-implementations
Make `03354_pr_disable_for_multiple_tables_query` work with plan-based parallel replicas
2 parents 129258f + e8ae2b3 commit c189bd9

2 files changed

Lines changed: 38 additions & 25 deletions

File tree

‎tests/queries/0_stateless/03354_pr_disable_for_multiple_tables_query.reference‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
0
99
1
1010
0
11-
2
11+
1
1212
0
13-
2
13+
1
1414
0
1515
1
1616
1
17-
2
17+
1
1818
0
19-
3
19+
1
2020
0
Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
-- Checks that `parallel_replicas_for_queries_with_multiple_tables` reaches every place that plans a
2-
-- part of a multi-table query, by looking for `ReadFromRemoteParallelReplicas` in the query plan.
2+
-- part of a multi-table query, by looking for the read from the other replicas in the query plan:
3+
-- `ReadFromRemoteParallelReplicas`, or `ReadFromParallelReplicas` with `parallel_replicas_plan_based`.
4+
-- Each probe prints whether there is one, not how many: the two implementations split the same query
5+
-- into a different number of reads.
36
-- The probes that cannot be seen in `EXPLAIN` live in `05137_pr_disable_for_multiple_tables_execution`.
47

58
drop table if exists X;
69
drop table if exists Y;
10+
drop table if exists Z;
11+
drop table if exists W;
712

813
create table X (id Int32, x_a String, x_b Nullable(Int32)) engine MergeTree order by id settings index_granularity=1;
914
create table Y (id Int32, y_a String, y_b Nullable(String)) engine MergeTree order by id settings index_granularity=1;
15+
-- Copies of `X` for the `UNION` probes: plan-based parallel replicas leave local a union whose branches read
16+
-- the same table, so each branch reads its own.
17+
create table Z as X;
18+
create table W as X;
1019

1120
insert into X (id, x_a, x_b) select number, toString(number), -number from numbers(100);
1221
insert into X (id, x_a, x_b) values (1, 'l1', 1), (2, 'l2', 2), (2, 'l3', 3), (3, 'l4', 4);
1322
insert into X (id, x_a) values (4, 'l5'), (4, 'l6'), (5, 'l7'), (8, 'l8'), (9, 'l9');
1423
insert into X (id, x_a, x_b) select number, toString(number), toString(-number) from numbers(100);
1524
insert into Y (id, y_a) values (1, 'r1'), (1, 'r2'), (2, 'r3'), (3, 'r4'), (3, 'r5');
1625
insert into Y (id, y_a, y_b) values (4, 'r6', 'nr6'), (6, 'r7', 'nr7'), (7, 'r8', 'nr8'), (9, 'r9', 'nr9');
26+
insert into Z select * from X;
27+
insert into W select * from X;
1728

1829
set enable_parallel_replicas = 1, max_parallel_replicas = 3, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
1930

@@ -27,61 +38,63 @@ set automatic_parallel_replicas_mode = 0, parallel_replicas_local_plan = 1, seri
2738
set parallel_replicas_for_non_replicated_merge_tree = 1;
2839

2940
set parallel_replicas_for_queries_with_multiple_tables=1;
30-
select count() from (explain select X.*, Y.* from X inner join Y on X.id = Y.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
41+
select count() > 0 from (explain select X.*, Y.* from X inner join Y on X.id = Y.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
3142
set parallel_replicas_for_queries_with_multiple_tables=0;
32-
select count() from (explain select X.*, Y.* from X inner join Y on X.id = Y.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
43+
select count() > 0 from (explain select X.*, Y.* from X inner join Y on X.id = Y.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
3344

3445
set parallel_replicas_for_queries_with_multiple_tables=1;
35-
select count() from (explain select * from (select X.*, Y.* from X inner join Y on X.id = Y.id)) where explain ilike '%ReadFromRemoteParallelReplicas%';
46+
select count() > 0 from (explain select * from (select X.*, Y.* from X inner join Y on X.id = Y.id)) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
3647
set parallel_replicas_for_queries_with_multiple_tables=0;
37-
select count() from (explain select * from (select X.*, Y.* from X inner join Y on X.id = Y.id)) where explain ilike '%ReadFromRemoteParallelReplicas%';
48+
select count() > 0 from (explain select * from (select X.*, Y.* from X inner join Y on X.id = Y.id)) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
3849

3950
set parallel_replicas_for_queries_with_multiple_tables=1;
40-
select count() from (explain select * from (select * from X) as s inner join Y as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
51+
select count() > 0 from (explain select * from (select * from X) as s inner join Y as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
4152
set parallel_replicas_for_queries_with_multiple_tables=0;
42-
select count() from (explain select * from (select * from X) as s inner join Y as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
53+
select count() > 0 from (explain select * from (select * from X) as s inner join Y as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
4354

4455
set parallel_replicas_for_queries_with_multiple_tables=1;
45-
select count() from (explain select * from X as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
56+
select count() > 0 from (explain select * from X as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
4657
set parallel_replicas_for_queries_with_multiple_tables=0;
47-
select count() from (explain select * from X as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
58+
select count() > 0 from (explain select * from X as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
4859

4960
set parallel_replicas_for_queries_with_multiple_tables=1;
50-
select count() from (explain select * from (select * from X) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
61+
select count() > 0 from (explain select * from (select * from X) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
5162
set parallel_replicas_for_queries_with_multiple_tables=0;
52-
select count() from (explain select * from (select * from X) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
63+
select count() > 0 from (explain select * from (select * from X) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
5364

5465
set parallel_replicas_for_queries_with_multiple_tables=1;
55-
select count() from (explain select * from (select * from X) as s inner join (select * from Y order by id) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
66+
select count() > 0 from (explain select * from (select * from X) as s inner join (select * from Y order by id) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
5667
set parallel_replicas_for_queries_with_multiple_tables=0;
57-
select count() from (explain select * from (select * from X) as s inner join (select * from Y order by id) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
68+
select count() > 0 from (explain select * from (select * from X) as s inner join (select * from Y order by id) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
5869

5970
set parallel_replicas_for_queries_with_multiple_tables=1;
60-
select count() from (explain select * from (select * from X order by id) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
71+
select count() > 0 from (explain select * from (select * from X order by id) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
6172
set parallel_replicas_for_queries_with_multiple_tables=0;
62-
select count() from (explain select * from (select * from X order by id) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
73+
select count() > 0 from (explain select * from (select * from X order by id) as s inner join (select * from Y) as j on s.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
6374

6475
-- ARRAY JOIN over a single table is not a multi-table query, so parallel replicas must stay enabled
6576
-- regardless of the setting. The check must count actual joins, not the table expressions stack size,
6677
-- which also includes the ARRAY_JOIN node.
6778
set parallel_replicas_for_queries_with_multiple_tables=1;
68-
select count() from (explain select id, n from X array join [1, 2] as n) where explain ilike '%ReadFromRemoteParallelReplicas%';
79+
select count() > 0 from (explain select id, n from X array join [1, 2] as n) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
6980
set parallel_replicas_for_queries_with_multiple_tables=0;
70-
select count() from (explain select id, n from X array join [1, 2] as n) where explain ilike '%ReadFromRemoteParallelReplicas%';
81+
select count() > 0 from (explain select id, n from X array join [1, 2] as n) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
7182

7283
-- A `UNION` table expression nested under a `JOIN` is planned branch by branch, and every branch is
7384
-- planned by an independent `Planner` built from the branch's own context, so disabling the setting
7485
-- must reach the branch contexts as well, not only the `UnionNode` context.
7586
set parallel_replicas_for_queries_with_multiple_tables=1;
76-
select count() from (explain select * from (select id from X union all select id from X) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
87+
select count() > 0 from (explain select * from (select id from X union all select id from Z) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
7788
set parallel_replicas_for_queries_with_multiple_tables=0;
78-
select count() from (explain select * from (select id from X union all select id from X) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
89+
select count() > 0 from (explain select * from (select id from X union all select id from Z) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
7990

8091
-- The same for a `UNION` nested inside another `UNION`, which requires the descent to be recursive.
8192
set parallel_replicas_for_queries_with_multiple_tables=1;
82-
select count() from (explain select * from (select id from X union all (select id from X union all select id from X)) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
93+
select count() > 0 from (explain select * from (select id from X union all (select id from Z union all select id from W)) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
8394
set parallel_replicas_for_queries_with_multiple_tables=0;
84-
select count() from (explain select * from (select id from X union all (select id from X union all select id from X)) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%';
95+
select count() > 0 from (explain select * from (select id from X union all (select id from Z union all select id from W)) as u inner join Y as j on u.id = j.id) where explain ilike '%ReadFromRemoteParallelReplicas%' or explain ilike '%ReadFromParallelReplicas%';
8596

8697
drop table X;
8798
drop table Y;
99+
drop table Z;
100+
drop table W;

0 commit comments

Comments
 (0)