Fix setrefs.c's failure to do expression processing on prune steps.

We should run the expression subtrees of PartitionedRelPruneInfo
structs through fix_scan_expr.  Failure to do so means that
AlternativeSubPlans within those expressions won't be cleaned up
properly, resulting in "unrecognized node type" errors since v14.

It seems fairly likely that at least some of the other steps done
by fix_scan_expr are important here as well, resulting in as-yet-
undetected bugs.  Therefore, I've chosen to back-patch this to
all supported branches including v13, even though the known
symptom doesn't manifest in v13.

Per bug #18778 from Alexander Lakhin.

Discussion: https://postgr.es/m/18778-24cd399df6c806af@postgresql.org

diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index fff2655595605946ab56bbf26fe692845d361943..1e7b7bc6ffc941c3d1a3044f4f1b701084bdb144 100644 (file)
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -1795,6 +1795,12 @@ set_append_references(PlannerInfo *root,
                                PartitionedRelPruneInfo *pinfo = lfirst(l2);
 
                                pinfo->rtindex += rtoffset;
+                               pinfo->initial_pruning_steps =
+                                       fix_scan_list(root, pinfo->initial_pruning_steps,
+                                                                 rtoffset, 1);
+                               pinfo->exec_pruning_steps =
+                                       fix_scan_list(root, pinfo->exec_pruning_steps,
+                                                                 rtoffset, 1);
                        }
                }
        }
@@ -1871,6 +1877,12 @@ set_mergeappend_references(PlannerInfo *root,
                                PartitionedRelPruneInfo *pinfo = lfirst(l2);
 
                                pinfo->rtindex += rtoffset;
+                               pinfo->initial_pruning_steps =
+                                       fix_scan_list(root, pinfo->initial_pruning_steps,
+                                                                 rtoffset, 1);
+                               pinfo->exec_pruning_steps =
+                                       fix_scan_list(root, pinfo->exec_pruning_steps,
+                                                                 rtoffset, 1);
                        }
                }
        }

diff --git a/src/test/regress/expected/partition_prune.out b/src/test/regress/expected/partition_prune.out
index c52bc40e8129e38cbf89a47af1a0f196de7f40aa..f0707e7f7ea83cd70d4ef4b3e6a90348bc48f29d 100644 (file)
--- a/src/test/regress/expected/partition_prune.out
+++ b/src/test/regress/expected/partition_prune.out
@@ -1893,6 +1893,35 @@ explain (costs off) select * from rparted_by_int2 where a > 100_000_000_000_000;
 (2 rows)
 
 drop table lp, coll_pruning, rlp, mc3p, mc2p, boolpart, iboolpart, boolrangep, rp, coll_pruning_multi, like_op_noprune, lparted_by_int2, rparted_by_int2;
+-- check that AlternativeSubPlan within a pruning expression gets cleaned up
+create table asptab (id int primary key) partition by range (id);
+create table asptab0 partition of asptab for values from (0) to (1);
+create table asptab1 partition of asptab for values from (1) to (2);
+explain (costs off)
+select * from
+  (select exists (select 1 from int4_tbl tinner where f1 = touter.f1) as b
+   from int4_tbl touter) ss,
+  asptab
+where asptab.id > ss.b::int;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
+ Nested Loop
+   ->  Seq Scan on int4_tbl touter
+   ->  Append
+         ->  Index Only Scan using asptab0_pkey on asptab0 asptab_1
+               Index Cond: (id > (EXISTS(SubPlan 3))::integer)
+               SubPlan 4
+                 ->  Seq Scan on int4_tbl tinner_2
+         ->  Index Only Scan using asptab1_pkey on asptab1 asptab_2
+               Index Cond: (id > (EXISTS(SubPlan 3))::integer)
+         SubPlan 3
+           ->  Seq Scan on int4_tbl tinner_1
+                 Filter: (f1 = touter.f1)
+   SubPlan 2
+     ->  Seq Scan on int4_tbl tinner
+(14 rows)
+
+drop table asptab;
 --
 -- Test Partition pruning for HASH partitioning
 --

diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql
index d67598d5c7f32a0f8fdb0caa7fd50f797d5c7af2..ea9a4fe4a2327d187bc4dc4dc581ec600d042c17 100644 (file)
--- a/src/test/regress/sql/partition_prune.sql
+++ b/src/test/regress/sql/partition_prune.sql
@@ -388,6 +388,21 @@ explain (costs off) select * from rparted_by_int2 where a > 100_000_000_000_000;
 
 drop table lp, coll_pruning, rlp, mc3p, mc2p, boolpart, iboolpart, boolrangep, rp, coll_pruning_multi, like_op_noprune, lparted_by_int2, rparted_by_int2;
 
+-- check that AlternativeSubPlan within a pruning expression gets cleaned up
+
+create table asptab (id int primary key) partition by range (id);
+create table asptab0 partition of asptab for values from (0) to (1);
+create table asptab1 partition of asptab for values from (1) to (2);
+
+explain (costs off)
+select * from
+  (select exists (select 1 from int4_tbl tinner where f1 = touter.f1) as b
+   from int4_tbl touter) ss,
+  asptab
+where asptab.id > ss.b::int;
+
+drop table asptab;
+
 --
 -- Test Partition pruning for HASH partitioning
 --