This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new f8a4eb81faa Fix error for partition selector
f8a4eb81faa is described below
commit f8a4eb81faa3476a74e0f716b9e30490d238136f
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Nov 10 21:33:49 2025 +0800
Fix error for partition selector
---
src/backend/executor/execPartition.c | 4 +---
src/backend/executor/nodePartitionSelector.c | 4 +---
src/include/executor/execPartition.h | 3 +++
src/test/regress/serial_schedule | 4 ++--
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/backend/executor/execPartition.c
b/src/backend/executor/execPartition.c
index 7bad41f294e..1620eb8d3ed 100644
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -193,8 +193,6 @@ static char *ExecBuildSlotPartitionKeyDescription(Relation
rel,
int maxfieldlen);
static List *adjust_partition_colnos(List *colnos, ResultRelInfo
*leaf_part_rri);
static List *adjust_partition_colnos_using_map(List *colnos, AttrMap *attrMap);
-static PartitionPruneState *CreatePartitionPruneState(PlanState *planstate,
-
PartitionPruneInfo *pruneinfo);
static void InitPartitionPruneContext(PartitionPruneContext *context,
List
*pruning_steps,
PartitionDesc partdesc,
@@ -1947,7 +1945,7 @@ ExecInitPartitionPruning(PlanState *planstate,
* re-evaluate which partitions match the pruning steps provided in each
* PartitionedRelPruneInfo.
*/
-static PartitionPruneState *
+PartitionPruneState *
CreatePartitionPruneState(PlanState *planstate, PartitionPruneInfo *pruneinfo)
{
EState *estate = planstate->state;
diff --git a/src/backend/executor/nodePartitionSelector.c
b/src/backend/executor/nodePartitionSelector.c
index 7e4fceb5f9e..7999a1a4d71 100644
--- a/src/backend/executor/nodePartitionSelector.c
+++ b/src/backend/executor/nodePartitionSelector.c
@@ -78,7 +78,6 @@ PartitionSelectorState *
ExecInitPartitionSelector(PartitionSelector *node, EState *estate, int eflags)
{
PartitionSelectorState *psstate;
- Bitmapset *validsubplans;
/* check for unsupported flags */
Assert (!(eflags & (EXEC_FLAG_MARK | EXEC_FLAG_BACKWARD)));
@@ -103,8 +102,7 @@ ExecInitPartitionSelector(PartitionSelector *node, EState
*estate, int eflags)
/* Create the working data structure for pruning. */
/* MERGE16_FIXME: This use of ExecInitPartitionPruning may be incorrect
*/
- psstate->prune_state = ExecInitPartitionPruning(&psstate->ps,
node->paramid,
-
node->part_prune_info, &validsubplans);
+ 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 193a07d4a07..22c4fc9a5e6 100644
--- a/src/include/executor/execPartition.h
+++ b/src/include/executor/execPartition.h
@@ -148,4 +148,7 @@ extern PartitionPruneState
*ExecInitPartitionPruning(PlanState *planstate,
PartitionPruneInfo *pruneinfo,
Bitmapset **initially_valid_subplans);
+extern PartitionPruneState *CreatePartitionPruneState(PlanState *planstate,
+
PartitionPruneInfo *pruneinfo);
+
#endif /* EXECPARTITION_H */
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 2020290ab22..68d50d4fb10 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -72,8 +72,8 @@ test: create_aggregate
test: create_cast
test: constraints
test: triggers
-# test: select
-# test: inherit
+test: select
+test: inherit
# test: typed_table
# test: vacuum
# test: drop_if_exists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]