Skip to content

Commit ea4397b

Browse files
yugo-nhackorum
authored andcommitted
Rename EXISTS-to-ANY converted subplan to exists_to_any
1 parent b597835 commit ea4397b

5 files changed

Lines changed: 30 additions & 30 deletions

File tree

contrib/pg_plan_advice/expected/alternatives.out

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ VACUUM ANALYZE alt_t2;
1212
EXPLAIN (COSTS OFF, PLAN_ADVICE)
1313
SELECT * FROM alt_t1
1414
WHERE EXISTS (SELECT 1 FROM alt_t2 WHERE alt_t2.a = alt_t1.a) OR alt_t1.a < 0;
15-
QUERY PLAN
16-
-------------------------------------------------------------------
15+
QUERY PLAN
16+
--------------------------------------------------------------------------
1717
Seq Scan on alt_t1
18-
Filter: ((ANY (a = (hashed SubPlan exists_2).col1)) OR (a < 0))
19-
SubPlan exists_2
18+
Filter: ((ANY (a = (hashed SubPlan exists_to_any_1).col1)) OR (a < 0))
19+
SubPlan exists_to_any_1
2020
-> Seq Scan on alt_t2
2121
Generated Plan Advice:
22-
SEQ_SCAN(alt_t1 alt_t2@exists_2)
23-
NO_GATHER(alt_t1 alt_t2@exists_2)
22+
SEQ_SCAN(alt_t1 alt_t2@exists_to_any_1)
23+
NO_GATHER(alt_t1 alt_t2@exists_to_any_1)
2424
DO_NOT_SCAN(alt_t2@exists_1)
2525
(8 rows)
2626

@@ -31,21 +31,21 @@ SET LOCAL pg_plan_advice.advice = 'DO_NOT_SCAN(alt_t2@exists_1)';
3131
EXPLAIN (COSTS OFF, PLAN_ADVICE)
3232
SELECT * FROM alt_t1
3333
WHERE EXISTS (SELECT 1 FROM alt_t2 WHERE alt_t2.a = alt_t1.a) OR alt_t1.a < 0;
34-
QUERY PLAN
35-
-------------------------------------------------------------------
34+
QUERY PLAN
35+
--------------------------------------------------------------------------
3636
Seq Scan on alt_t1
37-
Filter: ((ANY (a = (hashed SubPlan exists_2).col1)) OR (a < 0))
38-
SubPlan exists_2
37+
Filter: ((ANY (a = (hashed SubPlan exists_to_any_1).col1)) OR (a < 0))
38+
SubPlan exists_to_any_1
3939
-> Seq Scan on alt_t2
4040
Supplied Plan Advice:
4141
DO_NOT_SCAN(alt_t2@exists_1) /* matched */
4242
Generated Plan Advice:
43-
SEQ_SCAN(alt_t1 alt_t2@exists_2)
44-
NO_GATHER(alt_t1 alt_t2@exists_2)
43+
SEQ_SCAN(alt_t1 alt_t2@exists_to_any_1)
44+
NO_GATHER(alt_t1 alt_t2@exists_to_any_1)
4545
DO_NOT_SCAN(alt_t2@exists_1)
4646
(10 rows)
4747

48-
SET LOCAL pg_plan_advice.advice = 'DO_NOT_SCAN(alt_t2@exists_2)';
48+
SET LOCAL pg_plan_advice.advice = 'DO_NOT_SCAN(alt_t2@exists_to_any_1)';
4949
EXPLAIN (COSTS OFF, PLAN_ADVICE)
5050
SELECT * FROM alt_t1
5151
WHERE EXISTS (SELECT 1 FROM alt_t2 WHERE alt_t2.a = alt_t1.a) OR alt_t1.a < 0;
@@ -57,12 +57,12 @@ WHERE EXISTS (SELECT 1 FROM alt_t2 WHERE alt_t2.a = alt_t1.a) OR alt_t1.a < 0;
5757
-> Index Only Scan using alt_t2_a_idx on alt_t2
5858
Index Cond: (a = alt_t1.a)
5959
Supplied Plan Advice:
60-
DO_NOT_SCAN(alt_t2@exists_2) /* matched */
60+
DO_NOT_SCAN(alt_t2@exists_to_any_1) /* matched */
6161
Generated Plan Advice:
6262
SEQ_SCAN(alt_t1)
6363
INDEX_ONLY_SCAN(alt_t2@exists_1 public.alt_t2_a_idx)
6464
NO_GATHER(alt_t1 alt_t2@exists_1)
65-
DO_NOT_SCAN(alt_t2@exists_2)
65+
DO_NOT_SCAN(alt_t2@exists_to_any_1)
6666
(12 rows)
6767

6868
COMMIT;

contrib/pg_plan_advice/sql/alternatives.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SET LOCAL pg_plan_advice.advice = 'DO_NOT_SCAN(alt_t2@exists_1)';
2222
EXPLAIN (COSTS OFF, PLAN_ADVICE)
2323
SELECT * FROM alt_t1
2424
WHERE EXISTS (SELECT 1 FROM alt_t2 WHERE alt_t2.a = alt_t1.a) OR alt_t1.a < 0;
25-
SET LOCAL pg_plan_advice.advice = 'DO_NOT_SCAN(alt_t2@exists_2)';
25+
SET LOCAL pg_plan_advice.advice = 'DO_NOT_SCAN(alt_t2@exists_to_any_1)';
2626
EXPLAIN (COSTS OFF, PLAN_ADVICE)
2727
SELECT * FROM alt_t1
2828
WHERE EXISTS (SELECT 1 FROM alt_t2 WHERE alt_t2.a = alt_t1.a) OR alt_t1.a < 0;

src/backend/optimizer/plan/subselect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ make_subplan(PlannerInfo *root, Query *orig_subquery,
272272
char *plan_name;
273273

274274
/* Generate Paths for the ANY subquery; we'll need all rows */
275-
plan_name = choose_plan_name(root->glob, sublinkstr, true);
275+
plan_name = choose_plan_name(root->glob, "exists_to_any", true);
276276
subroot = subquery_planner(root->glob, subquery, plan_name,
277277
root, subroot, false, 0.0, NULL);
278278

src/test/regress/expected/partition_prune.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,15 +1967,15 @@ where asptab.id > ss.b::int;
19671967
-> Seq Scan on int4_tbl touter
19681968
-> Append
19691969
-> Index Only Scan using asptab0_pkey on asptab0 asptab_1
1970-
Index Cond: (id > (EXISTS(SubPlan exists_3))::integer)
1971-
SubPlan exists_4
1970+
Index Cond: (id > (EXISTS(SubPlan exists_2))::integer)
1971+
SubPlan exists_to_any_2
19721972
-> Seq Scan on int4_tbl tinner_2
19731973
-> Index Only Scan using asptab1_pkey on asptab1 asptab_2
1974-
Index Cond: (id > (EXISTS(SubPlan exists_3))::integer)
1975-
SubPlan exists_3
1974+
Index Cond: (id > (EXISTS(SubPlan exists_2))::integer)
1975+
SubPlan exists_2
19761976
-> Seq Scan on int4_tbl tinner_1
19771977
Filter: (f1 = touter.f1)
1978-
SubPlan exists_2
1978+
SubPlan exists_to_any_1
19791979
-> Seq Scan on int4_tbl tinner
19801980
(14 rows)
19811981

src/test/regress/expected/subselect.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,12 +1253,12 @@ rollback; -- to get rid of the bogus operator
12531253
explain (costs off)
12541254
select count(*) from tenk1 t
12551255
where (exists(select 1 from tenk1 k where k.unique1 = t.unique2) or ten < 0);
1256-
QUERY PLAN
1257-
---------------------------------------------------------------------------------
1256+
QUERY PLAN
1257+
----------------------------------------------------------------------------------------
12581258
Aggregate
12591259
-> Seq Scan on tenk1 t
1260-
Filter: ((ANY (unique2 = (hashed SubPlan exists_2).col1)) OR (ten < 0))
1261-
SubPlan exists_2
1260+
Filter: ((ANY (unique2 = (hashed SubPlan exists_to_any_1).col1)) OR (ten < 0))
1261+
SubPlan exists_to_any_1
12621262
-> Index Only Scan using tenk1_unique1 on tenk1 k
12631263
(5 rows)
12641264

@@ -1303,8 +1303,8 @@ analyze exists_tbl;
13031303
explain (costs off)
13041304
select * from exists_tbl t1
13051305
where (exists(select 1 from exists_tbl t2 where t1.c1 = t2.c2) or c3 < 0);
1306-
QUERY PLAN
1307-
---------------------------------------------------------------------------
1306+
QUERY PLAN
1307+
----------------------------------------------------------------------------------
13081308
Append
13091309
-> Seq Scan on exists_tbl_null t1_1
13101310
Filter: (EXISTS(SubPlan exists_1) OR (c3 < 0))
@@ -1315,8 +1315,8 @@ select * from exists_tbl t1
13151315
-> Seq Scan on exists_tbl_def t2_2
13161316
Filter: (t1_1.c1 = c2)
13171317
-> Seq Scan on exists_tbl_def t1_2
1318-
Filter: ((ANY (c1 = (hashed SubPlan exists_2).col1)) OR (c3 < 0))
1319-
SubPlan exists_2
1318+
Filter: ((ANY (c1 = (hashed SubPlan exists_to_any_1).col1)) OR (c3 < 0))
1319+
SubPlan exists_to_any_1
13201320
-> Append
13211321
-> Seq Scan on exists_tbl_null t2_4
13221322
-> Seq Scan on exists_tbl_def t2_5

0 commit comments

Comments
 (0)