This is an automated email from the ASF dual-hosted git repository. tuhaihe pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 3fd1fbacb90e63ba749bca6d8912ea5b190c9cfd Author: liushengsong <[email protected]> AuthorDate: Mon Jun 15 10:19:45 2026 +0800 Remove MERGE16_FIXME in PartitionSelector and dead declarations The CreatePartitionPruneState() call in nodePartitionSelector.c is correct -- PartitionSelector only needs the pruning data structure, not the initial pruning and subplan map renumbering that ExecInitPartitionPruning() adds on top. Remove the incorrect FIXME. Also remove two dead declarations in execPartition.h: - ExecCreatePartitionPruneState: renamed to CreatePartitionPruneState in PG15 (commit 297daa9d435), declaration was never cleaned up - ExecFindInitialMatchingSubPlans: folded into ExecFindMatchingSubPlans in the same refactor, declaration was never cleaned up --- src/backend/executor/nodePartitionSelector.c | 1 - src/include/executor/execPartition.h | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/backend/executor/nodePartitionSelector.c b/src/backend/executor/nodePartitionSelector.c index 7999a1a4d71..1a1e3affa85 100644 --- a/src/backend/executor/nodePartitionSelector.c +++ b/src/backend/executor/nodePartitionSelector.c @@ -101,7 +101,6 @@ ExecInitPartitionSelector(PartitionSelector *node, EState *estate, int eflags) outerPlanState(psstate) = ExecInitNode(outerPlan(node), estate, eflags); /* Create the working data structure for pruning. */ - /* MERGE16_FIXME: This use of ExecInitPartitionPruning may be incorrect */ psstate->prune_state = CreatePartitionPruneState(&psstate->ps, node->part_prune_info); return psstate; diff --git a/src/include/executor/execPartition.h b/src/include/executor/execPartition.h index 22c4fc9a5e6..91bc97db8c6 100644 --- a/src/include/executor/execPartition.h +++ b/src/include/executor/execPartition.h @@ -130,14 +130,10 @@ extern ResultRelInfo *ExecFindPartition(ModifyTableState *mtstate, EState *estate); extern void ExecCleanupTupleRouting(ModifyTableState *mtstate, PartitionTupleRouting *proute); -extern PartitionPruneState *ExecCreatePartitionPruneState(PlanState *planstate, - PartitionPruneInfo *partitionpruneinfo); extern Bitmapset *ExecFindMatchingSubPlans(PartitionPruneState *prunestate, bool initial_prune, EState *estate, int nplans, List *join_prune_paramids); -extern Bitmapset *ExecFindInitialMatchingSubPlans(PartitionPruneState *prunestate, - int nsubplans); extern int get_partition_for_tuple(PartitionKey key, PartitionDesc partdesc, Datum *values, bool *isnull); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
