diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2023-05-04 12:09:59 +0200 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2023-05-04 12:09:59 +0200 |
| commit | 5472743d9e8583638a897b47558066167cc14583 (patch) | |
| tree | 5c983ffbf40157062fe6922f1b0c448e8b7d011f /src/backend/executor/execPartition.c | |
| parent | 919c486a275bcdd83d2add77da87b6edbd91418c (diff) | |
| download | postgresql-5472743d9e8583638a897b47558066167cc14583.tar.gz postgresql-5472743d9e8583638a897b47558066167cc14583.zip | |
Revert "Move PartitionPruneInfo out of plan nodes into PlannedStmt"
This reverts commit ec386948948c and its fixup 589bb816499e.
This change was intended to support query planning avoiding acquisition
of locks on partitions that were going to be pruned; however, the
overall project took a different direction at [1] and this bit is no
longer needed. Put things back the way they were as agreed in [2], to
avoid unnecessary complexity.
Discussion: [1] https://postgr.es/m/4191508.1674157166@sss.pgh.pa.us
Discussion: [2] https://postgr.es/m/20230502175409.kcoirxczpdha26wt@alvherre.pgsql
Diffstat (limited to 'src/backend/executor/execPartition.c')
| -rw-r--r-- | src/backend/executor/execPartition.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c index 9799968a428..eb8a87fd632 100644 --- a/src/backend/executor/execPartition.c +++ b/src/backend/executor/execPartition.c @@ -1778,9 +1778,6 @@ adjust_partition_colnos_using_map(List *colnos, AttrMap *attrMap) * Initialize data structure needed for run-time partition pruning and * do initial pruning if needed * - * 'root_parent_relids' identifies the relation to which both the parent plan - * and the PartitionPruneInfo given by 'part_prune_index' belong. - * * On return, *initially_valid_subplans is assigned the set of indexes of * child subplans that must be initialized along with the parent plan node. * Initial pruning is performed here if needed and in that case only the @@ -1793,24 +1790,11 @@ adjust_partition_colnos_using_map(List *colnos, AttrMap *attrMap) PartitionPruneState * ExecInitPartitionPruning(PlanState *planstate, int n_total_subplans, - int part_prune_index, - Bitmapset *root_parent_relids, + PartitionPruneInfo *pruneinfo, Bitmapset **initially_valid_subplans) { PartitionPruneState *prunestate; EState *estate = planstate->state; - PartitionPruneInfo *pruneinfo; - - /* Obtain the pruneinfo we need, and make sure it's the right one */ - pruneinfo = list_nth(estate->es_part_prune_infos, part_prune_index); - if (!bms_equal(root_parent_relids, pruneinfo->root_parent_relids)) - ereport(ERROR, - errcode(ERRCODE_INTERNAL_ERROR), - errmsg_internal("mismatching PartitionPruneInfo found at part_prune_index %d", - part_prune_index), - errdetail_internal("plan node relids %s, pruneinfo relids %s", - bmsToString(root_parent_relids), - bmsToString(pruneinfo->root_parent_relids))); /* We may need an expression context to evaluate partition exprs */ ExecAssignExprContext(estate, planstate); |