Skip to content

Commit 52ed730

Browse files
tglsfdctglsfdc
committed
Remove some unnecessary fields from Plan trees.
In the wake of commit f234365, we no longer need some fields that were used before to control executor lock acquisitions: * PlannedStmt.nonleafResultRelations can go away entirely. * partitioned_rels can go away from Append, MergeAppend, and ModifyTable. However, ModifyTable still needs to know the RT index of the partition root table if any, which was formerly kept in the first entry of that list. Add a new field "rootRelation" to remember that. rootRelation is partly redundant with nominalRelation, in that if it's set it will have the same value as nominalRelation. However, the latter field has a different purpose so it seems best to keep them distinct. Amit Langote, reviewed by David Rowley and Jesper Pedersen, and whacked around a bit more by me Discussion: https://postgr.es/m/468c85d9-540e-66a2-1dde-fec2b741e688@lab.ntt.co.jp
1 parent 39808e8 commit 52ed730

File tree

13 files changed

+61
-154
lines changed

13 files changed

+61
-154
lines changed

‎contrib/postgres_fdw/postgres_fdw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2050,7 +2050,7 @@ postgresBeginForeignInsert(ModifyTableState *mtstate,
20502050
* Vars contained in those expressions.
20512051
*/
20522052
if (plan && plan->operation == CMD_UPDATE &&
2053-
resultRelation == plan->nominalRelation)
2053+
resultRelation == plan->rootRelation)
20542054
resultRelation = mtstate->resultRelInfo[0].ri_RangeTableIndex;
20552055
}
20562056

‎src/backend/executor/execParallel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ ExecSerializePlan(Plan *plan, EState *estate)
183183
pstmt->planTree = plan;
184184
pstmt->rtable = estate->es_range_table;
185185
pstmt->resultRelations = NIL;
186-
pstmt->nonleafResultRelations = NIL;
187186

188187
/*
189188
* Transfer only parallel-safe subplans, leaving a NULL "hole" in the list

‎src/backend/executor/execPartition.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ ExecInitPartitionInfo(ModifyTableState *mtstate,
355355
leaf_part_rri = makeNode(ResultRelInfo);
356356
InitResultRelInfo(leaf_part_rri,
357357
partrel,
358-
node ? node->nominalRelation : 1,
358+
node ? node->rootRelation : 1,
359359
rootrel,
360360
estate->es_instrument);
361361

‎src/backend/nodes/copyfuncs.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ _copyPlannedStmt(const PlannedStmt *from)
9191
COPY_NODE_FIELD(planTree);
9292
COPY_NODE_FIELD(rtable);
9393
COPY_NODE_FIELD(resultRelations);
94-
COPY_NODE_FIELD(nonleafResultRelations);
9594
COPY_NODE_FIELD(rootResultRelations);
9695
COPY_NODE_FIELD(subplans);
9796
COPY_BITMAPSET_FIELD(rewindPlanIDs);
@@ -204,7 +203,7 @@ _copyModifyTable(const ModifyTable *from)
204203
COPY_SCALAR_FIELD(operation);
205204
COPY_SCALAR_FIELD(canSetTag);
206205
COPY_SCALAR_FIELD(nominalRelation);
207-
COPY_NODE_FIELD(partitioned_rels);
206+
COPY_SCALAR_FIELD(rootRelation);
208207
COPY_SCALAR_FIELD(partColsUpdated);
209208
COPY_NODE_FIELD(resultRelations);
210209
COPY_SCALAR_FIELD(resultRelIndex);
@@ -244,7 +243,6 @@ _copyAppend(const Append *from)
244243
*/
245244
COPY_NODE_FIELD(appendplans);
246245
COPY_SCALAR_FIELD(first_partial_plan);
247-
COPY_NODE_FIELD(partitioned_rels);
248246
COPY_NODE_FIELD(part_prune_info);
249247

250248
return newnode;
@@ -266,7 +264,6 @@ _copyMergeAppend(const MergeAppend *from)
266264
/*
267265
* copy remainder of node
268266
*/
269-
COPY_NODE_FIELD(partitioned_rels);
270267
COPY_NODE_FIELD(mergeplans);
271268
COPY_SCALAR_FIELD(numCols);
272269
COPY_POINTER_FIELD(sortColIdx, from->numCols * sizeof(AttrNumber));

‎src/backend/nodes/outfuncs.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
280280
WRITE_NODE_FIELD(planTree);
281281
WRITE_NODE_FIELD(rtable);
282282
WRITE_NODE_FIELD(resultRelations);
283-
WRITE_NODE_FIELD(nonleafResultRelations);
284283
WRITE_NODE_FIELD(rootResultRelations);
285284
WRITE_NODE_FIELD(subplans);
286285
WRITE_BITMAPSET_FIELD(rewindPlanIDs);
@@ -376,7 +375,7 @@ _outModifyTable(StringInfo str, const ModifyTable *node)
376375
WRITE_ENUM_FIELD(operation, CmdType);
377376
WRITE_BOOL_FIELD(canSetTag);
378377
WRITE_UINT_FIELD(nominalRelation);
379-
WRITE_NODE_FIELD(partitioned_rels);
378+
WRITE_UINT_FIELD(rootRelation);
380379
WRITE_BOOL_FIELD(partColsUpdated);
381380
WRITE_NODE_FIELD(resultRelations);
382381
WRITE_INT_FIELD(resultRelIndex);
@@ -405,7 +404,6 @@ _outAppend(StringInfo str, const Append *node)
405404

406405
WRITE_NODE_FIELD(appendplans);
407406
WRITE_INT_FIELD(first_partial_plan);
408-
WRITE_NODE_FIELD(partitioned_rels);
409407
WRITE_NODE_FIELD(part_prune_info);
410408
}
411409

@@ -418,7 +416,6 @@ _outMergeAppend(StringInfo str, const MergeAppend *node)
418416

419417
_outPlanInfo(str, (const Plan *) node);
420418

421-
WRITE_NODE_FIELD(partitioned_rels);
422419
WRITE_NODE_FIELD(mergeplans);
423420

424421
WRITE_INT_FIELD(numCols);
@@ -2179,7 +2176,7 @@ _outModifyTablePath(StringInfo str, const ModifyTablePath *node)
21792176
WRITE_ENUM_FIELD(operation, CmdType);
21802177
WRITE_BOOL_FIELD(canSetTag);
21812178
WRITE_UINT_FIELD(nominalRelation);
2182-
WRITE_NODE_FIELD(partitioned_rels);
2179+
WRITE_UINT_FIELD(rootRelation);
21832180
WRITE_BOOL_FIELD(partColsUpdated);
21842181
WRITE_NODE_FIELD(resultRelations);
21852182
WRITE_NODE_FIELD(subpaths);
@@ -2259,7 +2256,6 @@ _outPlannerGlobal(StringInfo str, const PlannerGlobal *node)
22592256
WRITE_NODE_FIELD(finalrtable);
22602257
WRITE_NODE_FIELD(finalrowmarks);
22612258
WRITE_NODE_FIELD(resultRelations);
2262-
WRITE_NODE_FIELD(nonleafResultRelations);
22632259
WRITE_NODE_FIELD(rootResultRelations);
22642260
WRITE_NODE_FIELD(relationOids);
22652261
WRITE_NODE_FIELD(invalItems);

‎src/backend/nodes/readfuncs.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,6 @@ _readPlannedStmt(void)
15041504
READ_NODE_FIELD(planTree);
15051505
READ_NODE_FIELD(rtable);
15061506
READ_NODE_FIELD(resultRelations);
1507-
READ_NODE_FIELD(nonleafResultRelations);
15081507
READ_NODE_FIELD(rootResultRelations);
15091508
READ_NODE_FIELD(subplans);
15101509
READ_BITMAPSET_FIELD(rewindPlanIDs);
@@ -1598,7 +1597,7 @@ _readModifyTable(void)
15981597
READ_ENUM_FIELD(operation, CmdType);
15991598
READ_BOOL_FIELD(canSetTag);
16001599
READ_UINT_FIELD(nominalRelation);
1601-
READ_NODE_FIELD(partitioned_rels);
1600+
READ_UINT_FIELD(rootRelation);
16021601
READ_BOOL_FIELD(partColsUpdated);
16031602
READ_NODE_FIELD(resultRelations);
16041603
READ_INT_FIELD(resultRelIndex);
@@ -1632,7 +1631,6 @@ _readAppend(void)
16321631

16331632
READ_NODE_FIELD(appendplans);
16341633
READ_INT_FIELD(first_partial_plan);
1635-
READ_NODE_FIELD(partitioned_rels);
16361634
READ_NODE_FIELD(part_prune_info);
16371635

16381636
READ_DONE();
@@ -1648,7 +1646,6 @@ _readMergeAppend(void)
16481646

16491647
ReadCommonPlan(&local_node->plan);
16501648

1651-
READ_NODE_FIELD(partitioned_rels);
16521649
READ_NODE_FIELD(mergeplans);
16531650
READ_INT_FIELD(numCols);
16541651
READ_ATTRNUMBER_ARRAY(sortColIdx, local_node->numCols);

‎src/backend/optimizer/plan/createplan.c

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ static BitmapHeapScan *create_bitmap_scan_plan(PlannerInfo *root,
124124
static Plan *create_bitmap_subplan(PlannerInfo *root, Path *bitmapqual,
125125
List **qual, List **indexqual, List **indexECs);
126126
static void bitmap_subplan_mark_shared(Plan *plan);
127-
static List *flatten_partitioned_rels(List *partitioned_rels);
128127
static TidScan *create_tidscan_plan(PlannerInfo *root, TidPath *best_path,
129128
List *tlist, List *scan_clauses);
130129
static SubqueryScan *create_subqueryscan_plan(PlannerInfo *root,
@@ -203,8 +202,7 @@ static NamedTuplestoreScan *make_namedtuplestorescan(List *qptlist, List *qpqual
203202
static WorkTableScan *make_worktablescan(List *qptlist, List *qpqual,
204203
Index scanrelid, int wtParam);
205204
static Append *make_append(List *appendplans, int first_partial_plan,
206-
List *tlist, List *partitioned_rels,
207-
PartitionPruneInfo *partpruneinfo);
205+
List *tlist, PartitionPruneInfo *partpruneinfo);
208206
static RecursiveUnion *make_recursive_union(List *tlist,
209207
Plan *lefttree,
210208
Plan *righttree,
@@ -280,7 +278,7 @@ static Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
280278
static ProjectSet *make_project_set(List *tlist, Plan *subplan);
281279
static ModifyTable *make_modifytable(PlannerInfo *root,
282280
CmdType operation, bool canSetTag,
283-
Index nominalRelation, List *partitioned_rels,
281+
Index nominalRelation, Index rootRelation,
284282
bool partColsUpdated,
285283
List *resultRelations, List *subplans, List *subroots,
286284
List *withCheckOptionLists, List *returningLists,
@@ -1110,8 +1108,7 @@ create_append_plan(PlannerInfo *root, AppendPath *best_path)
11101108
*/
11111109

11121110
plan = make_append(subplans, best_path->first_partial_path,
1113-
tlist, best_path->partitioned_rels,
1114-
partpruneinfo);
1111+
tlist, partpruneinfo);
11151112

11161113
copy_generic_path_info(&plan->plan, (Path *) best_path);
11171114

@@ -1253,8 +1250,6 @@ create_merge_append_plan(PlannerInfo *root, MergeAppendPath *best_path)
12531250
prunequal);
12541251
}
12551252

1256-
node->partitioned_rels =
1257-
flatten_partitioned_rels(best_path->partitioned_rels);
12581253
node->mergeplans = subplans;
12591254
node->part_prune_info = partpruneinfo;
12601255

@@ -2411,7 +2406,7 @@ create_modifytable_plan(PlannerInfo *root, ModifyTablePath *best_path)
24112406
best_path->operation,
24122407
best_path->canSetTag,
24132408
best_path->nominalRelation,
2414-
best_path->partitioned_rels,
2409+
best_path->rootRelation,
24152410
best_path->partColsUpdated,
24162411
best_path->resultRelations,
24172412
subplans,
@@ -5005,27 +5000,6 @@ bitmap_subplan_mark_shared(Plan *plan)
50055000
elog(ERROR, "unrecognized node type: %d", nodeTag(plan));
50065001
}
50075002

5008-
/*
5009-
* flatten_partitioned_rels
5010-
* Convert List of Lists into a single List with all elements from the
5011-
* sub-lists.
5012-
*/
5013-
static List *
5014-
flatten_partitioned_rels(List *partitioned_rels)
5015-
{
5016-
List *newlist = NIL;
5017-
ListCell *lc;
5018-
5019-
foreach(lc, partitioned_rels)
5020-
{
5021-
List *sublist = lfirst(lc);
5022-
5023-
newlist = list_concat(newlist, list_copy(sublist));
5024-
}
5025-
5026-
return newlist;
5027-
}
5028-
50295003
/*****************************************************************************
50305004
*
50315005
* PLAN NODE BUILDING ROUTINES
@@ -5368,8 +5342,7 @@ make_foreignscan(List *qptlist,
53685342

53695343
static Append *
53705344
make_append(List *appendplans, int first_partial_plan,
5371-
List *tlist, List *partitioned_rels,
5372-
PartitionPruneInfo *partpruneinfo)
5345+
List *tlist, PartitionPruneInfo *partpruneinfo)
53735346
{
53745347
Append *node = makeNode(Append);
53755348
Plan *plan = &node->plan;
@@ -5380,7 +5353,6 @@ make_append(List *appendplans, int first_partial_plan,
53805353
plan->righttree = NULL;
53815354
node->appendplans = appendplans;
53825355
node->first_partial_plan = first_partial_plan;
5383-
node->partitioned_rels = flatten_partitioned_rels(partitioned_rels);
53845356
node->part_prune_info = partpruneinfo;
53855357
return node;
53865358
}
@@ -6509,7 +6481,7 @@ make_project_set(List *tlist,
65096481
static ModifyTable *
65106482
make_modifytable(PlannerInfo *root,
65116483
CmdType operation, bool canSetTag,
6512-
Index nominalRelation, List *partitioned_rels,
6484+
Index nominalRelation, Index rootRelation,
65136485
bool partColsUpdated,
65146486
List *resultRelations, List *subplans, List *subroots,
65156487
List *withCheckOptionLists, List *returningLists,
@@ -6538,7 +6510,7 @@ make_modifytable(PlannerInfo *root,
65386510
node->operation = operation;
65396511
node->canSetTag = canSetTag;
65406512
node->nominalRelation = nominalRelation;
6541-
node->partitioned_rels = flatten_partitioned_rels(partitioned_rels);
6513+
node->rootRelation = rootRelation;
65426514
node->partColsUpdated = partColsUpdated;
65436515
node->resultRelations = resultRelations;
65446516
node->resultRelIndex = -1; /* will be set correctly in setrefs.c */

0 commit comments

Comments
 (0)