mirror of
https://github.com/postgres/postgres.git
synced 2025-08-19 23:22:23 +03:00
Fix bug in cbc127917
to handle nested Append correctly
A non-leaf partition with a subplan that is an Append node was omitted from PlannedStmt.unprunableRelids because it was mistakenly included in PlannerGlobal.prunableRelids due to the way PartitionedRelPruneInfo.leafpart_rti_map[] is constructed. This happened when a non-leaf partition used an unflattened Append or MergeAppend. As a result, ExecGetRangeTableRelation() reported an error when called from CreatePartitionPruneState() to process the partition's own PartitionPruneInfo, since it was treated as prunable when it should not have been. Reported-by: Alexander Lakhin <exclusion@gmail.com> (via sqlsmith) Diagnosed-by: Tender Wang <tndrwang@gmail.com> Reviewed-by: Tender Wang <tndrwang@gmail.com> Discussion: https://postgr.es/m/74839af6-aadc-4f60-ae77-ae65f94bf607@gmail.com
This commit is contained in:
@@ -2589,9 +2589,9 @@ ExecFindMatchingSubPlans(PartitionPruneState *prunestate,
|
||||
* find_matching_subplans_recurse
|
||||
* Recursive worker function for ExecFindMatchingSubPlans
|
||||
*
|
||||
* Adds valid (non-prunable) subplan IDs to *validsubplans and the RT indexes
|
||||
* of their corresponding leaf partitions to *validsubplan_rtis if
|
||||
* it's non-NULL.
|
||||
* Adds valid (non-prunable) subplan IDs to *validsubplans. If
|
||||
* *validsubplan_rtis is non-NULL, it also adds the RT indexes of their
|
||||
* corresponding partitions, but only if they are leaf partitions.
|
||||
*/
|
||||
static void
|
||||
find_matching_subplans_recurse(PartitionPruningData *prunedata,
|
||||
@@ -2628,7 +2628,12 @@ find_matching_subplans_recurse(PartitionPruningData *prunedata,
|
||||
{
|
||||
*validsubplans = bms_add_member(*validsubplans,
|
||||
pprune->subplan_map[i]);
|
||||
if (validsubplan_rtis)
|
||||
|
||||
/*
|
||||
* Only report leaf partitions. Non-leaf partitions may appear
|
||||
* here when they use an unflattened Append or MergeAppend.
|
||||
*/
|
||||
if (validsubplan_rtis && pprune->leafpart_rti_map[i])
|
||||
*validsubplan_rtis = bms_add_member(*validsubplan_rtis,
|
||||
pprune->leafpart_rti_map[i]);
|
||||
}
|
||||
|
Reference in New Issue
Block a user