diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-08-01 19:42:46 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-08-01 19:42:52 -0400 |
| commit | 1c2cb2744bf3d8ad751cd5cf3b347f10f48492b3 (patch) | |
| tree | 78cbab7db4dacbac9f47b4c78974ba3c8f6c9184 /src/backend/executor/nodeMergeAppend.c | |
| parent | c40489e449ea08e154cd62fa055785873f7bdac8 (diff) | |
| download | postgresql-1c2cb2744bf3d8ad751cd5cf3b347f10f48492b3.tar.gz postgresql-1c2cb2744bf3d8ad751cd5cf3b347f10f48492b3.zip | |
Fix run-time partition pruning for appends with multiple source rels.
The previous coding here supposed that if run-time partitioning applied to
a particular Append/MergeAppend plan, then all child plans of that node
must be members of a single partitioning hierarchy. This is totally wrong,
since an Append could be formed from a UNION ALL: we could have multiple
hierarchies sharing the same Append, or child plans that aren't part of any
hierarchy.
To fix, restructure the related plan-time and execution-time data
structures so that we can have a separate list or array for each
partitioning hierarchy. Also track subplans that are not part of any
hierarchy, and make sure they don't get pruned.
Per reports from Phil Florent and others. Back-patch to v11, since
the bug originated there.
David Rowley, with a lot of cosmetic adjustments by me; thanks also
to Amit Langote for review.
Discussion: https://postgr.es/m/HE1PR03MB17068BB27404C90B5B788BCABA7B0@HE1PR03MB1706.eurprd03.prod.outlook.com
Diffstat (limited to 'src/backend/executor/nodeMergeAppend.c')
| -rw-r--r-- | src/backend/executor/nodeMergeAppend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index be43014cb89..9a72d3a0ace 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -90,7 +90,7 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags) mergestate->ms_noopscan = false; /* If run-time partition pruning is enabled, then set that up now */ - if (node->part_prune_infos != NIL) + if (node->part_prune_info != NULL) { PartitionPruneState *prunestate; @@ -98,7 +98,7 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags) ExecAssignExprContext(estate, &mergestate->ps); prunestate = ExecCreatePartitionPruneState(&mergestate->ps, - node->part_prune_infos); + node->part_prune_info); mergestate->ms_prune_state = prunestate; /* Perform an initial partition prune, if required. */ |