Skip to content

Commit fb5883d

Browse files
hlinnakahlinnaka
committed
Remove PartitionRoutingInfo struct.
The extra indirection neeeded to access its members via its enclosing ResultRelInfo seems pointless. Move all the fields from PartitionRoutingInfo to ResultRelInfo. Author: Amit Langote Reviewed-by: Alvaro Herrera Discussion: https://www.postgresql.org/message-id/CA%2BHiwqFViT47Zbr_ASBejiK7iDG8%3DQ1swQ-tjM6caRPQ67pT%3Dw%40mail.gmail.com
1 parent 6973533 commit fb5883d

File tree

7 files changed

+45
-65
lines changed

7 files changed

+45
-65
lines changed

‎src/backend/commands/copy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,15 +3119,15 @@ CopyFrom(CopyState cstate)
31193119
* We might need to convert from the root rowtype to the partition
31203120
* rowtype.
31213121
*/
3122-
map = resultRelInfo->ri_PartitionInfo->pi_RootToPartitionMap;
3122+
map = resultRelInfo->ri_RootToPartitionMap;
31233123
if (insertMethod == CIM_SINGLE || !leafpart_use_multi_insert)
31243124
{
31253125
/* non batch insert */
31263126
if (map != NULL)
31273127
{
31283128
TupleTableSlot *new_slot;
31293129

3130-
new_slot = resultRelInfo->ri_PartitionInfo->pi_PartitionTupleSlot;
3130+
new_slot = resultRelInfo->ri_PartitionTupleSlot;
31313131
myslot = execute_attr_map_slot(map->attrMap, myslot, new_slot);
31323132
}
31333133
}

‎src/backend/executor/execMain.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,9 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
12431243
resultRelInfo->ri_TrigOldSlot = NULL;
12441244
resultRelInfo->ri_TrigNewSlot = NULL;
12451245
resultRelInfo->ri_PartitionRoot = partition_root;
1246-
resultRelInfo->ri_PartitionInfo = NULL; /* may be set later */
1246+
resultRelInfo->ri_RootToPartitionMap = NULL; /* set by
1247+
* ExecInitRoutingInfo */
1248+
resultRelInfo->ri_PartitionTupleSlot = NULL; /* ditto */
12471249
resultRelInfo->ri_ChildToRootMap = NULL;
12481250
resultRelInfo->ri_CopyMultiInsertBuffer = NULL;
12491251
}

‎src/backend/executor/execPartition.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ ExecSetupPartitionTupleRouting(EState *estate, ModifyTableState *mtstate,
261261
* If the partition's ResultRelInfo does not yet exist in 'proute' then we set
262262
* one up or reuse one from mtstate's resultRelInfo array. When reusing a
263263
* ResultRelInfo from the mtstate we verify that the relation is a valid
264-
* target for INSERTs and then set up a PartitionRoutingInfo for it.
264+
* target for INSERTs and initialize tuple routing information.
265265
*
266266
* rootResultRelInfo is the relation named in the query.
267267
*
@@ -307,6 +307,7 @@ ExecFindPartition(ModifyTableState *mtstate,
307307
while (dispatch != NULL)
308308
{
309309
int partidx = -1;
310+
bool is_leaf;
310311

311312
CHECK_FOR_INTERRUPTS();
312313

@@ -346,8 +347,10 @@ ExecFindPartition(ModifyTableState *mtstate,
346347
errtable(rel)));
347348
}
348349

349-
if (partdesc->is_leaf[partidx])
350+
is_leaf = partdesc->is_leaf[partidx];
351+
if (is_leaf)
350352
{
353+
351354
/*
352355
* We've reached the leaf -- hurray, we're done. Look to see if
353356
* we've already got a ResultRelInfo for this partition.
@@ -382,7 +385,10 @@ ExecFindPartition(ModifyTableState *mtstate,
382385
/* Verify this ResultRelInfo allows INSERTs */
383386
CheckValidResultRel(rri, CMD_INSERT);
384387

385-
/* Set up the PartitionRoutingInfo for it */
388+
/*
389+
* Initialize information needed to insert this and
390+
* subsequent tuples routed to this partition.
391+
*/
386392
ExecInitRoutingInfo(mtstate, estate, proute, dispatch,
387393
rri, partidx);
388394
}
@@ -464,8 +470,6 @@ ExecFindPartition(ModifyTableState *mtstate,
464470
*/
465471
if (partidx == partdesc->boundinfo->default_index)
466472
{
467-
PartitionRoutingInfo *partrouteinfo = rri->ri_PartitionInfo;
468-
469473
/*
470474
* The tuple must match the partition's layout for the constraint
471475
* expression to be evaluated successfully. If the partition is
@@ -478,13 +482,13 @@ ExecFindPartition(ModifyTableState *mtstate,
478482
* So if we have to convert, do it from the root slot; if not, use
479483
* the root slot as-is.
480484
*/
481-
if (partrouteinfo)
485+
if (is_leaf)
482486
{
483-
TupleConversionMap *map = partrouteinfo->pi_RootToPartitionMap;
487+
TupleConversionMap *map = rri->ri_RootToPartitionMap;
484488

485489
if (map)
486490
slot = execute_attr_map_slot(map->attrMap, rootslot,
487-
partrouteinfo->pi_PartitionTupleSlot);
491+
rri->ri_PartitionTupleSlot);
488492
else
489493
slot = rootslot;
490494
}
@@ -788,7 +792,7 @@ ExecInitPartitionInfo(ModifyTableState *mtstate, EState *estate,
788792
{
789793
TupleConversionMap *map;
790794

791-
map = leaf_part_rri->ri_PartitionInfo->pi_RootToPartitionMap;
795+
map = leaf_part_rri->ri_RootToPartitionMap;
792796

793797
Assert(node->onConflictSet != NIL);
794798
Assert(rootResultRelInfo->ri_onConflict != NULL);
@@ -949,18 +953,15 @@ ExecInitRoutingInfo(ModifyTableState *mtstate,
949953
int partidx)
950954
{
951955
MemoryContext oldcxt;
952-
PartitionRoutingInfo *partrouteinfo;
953956
int rri_index;
954957

955958
oldcxt = MemoryContextSwitchTo(proute->memcxt);
956959

957-
partrouteinfo = palloc(sizeof(PartitionRoutingInfo));
958-
959960
/*
960961
* Set up a tuple conversion map to convert a tuple routed to the
961962
* partition from the parent's type to the partition's.
962963
*/
963-
partrouteinfo->pi_RootToPartitionMap =
964+
partRelInfo->ri_RootToPartitionMap =
964965
convert_tuples_by_name(RelationGetDescr(partRelInfo->ri_PartitionRoot),
965966
RelationGetDescr(partRelInfo->ri_RelationDesc));
966967

@@ -970,7 +971,7 @@ ExecInitRoutingInfo(ModifyTableState *mtstate,
970971
* for various operations that are applied to tuples after routing, such
971972
* as checking constraints.
972973
*/
973-
if (partrouteinfo->pi_RootToPartitionMap != NULL)
974+
if (partRelInfo->ri_RootToPartitionMap != NULL)
974975
{
975976
Relation partrel = partRelInfo->ri_RelationDesc;
976977

@@ -979,11 +980,11 @@ ExecInitRoutingInfo(ModifyTableState *mtstate,
979980
* partition's TupleDesc; TupleDesc reference will be released at the
980981
* end of the command.
981982
*/
982-
partrouteinfo->pi_PartitionTupleSlot =
983+
partRelInfo->ri_PartitionTupleSlot =
983984
table_slot_create(partrel, &estate->es_tupleTable);
984985
}
985986
else
986-
partrouteinfo->pi_PartitionTupleSlot = NULL;
987+
partRelInfo->ri_PartitionTupleSlot = NULL;
987988

988989
/*
989990
* If the partition is a foreign table, let the FDW init itself for
@@ -993,7 +994,6 @@ ExecInitRoutingInfo(ModifyTableState *mtstate,
993994
partRelInfo->ri_FdwRoutine->BeginForeignInsert != NULL)
994995
partRelInfo->ri_FdwRoutine->BeginForeignInsert(mtstate, partRelInfo);
995996

996-
partRelInfo->ri_PartitionInfo = partrouteinfo;
997997
partRelInfo->ri_CopyMultiInsertBuffer = NULL;
998998

999999
/*

‎src/backend/executor/nodeModifyTable.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,8 +1172,8 @@ ExecCrossPartitionUpdate(ModifyTableState *mtstate,
11721172
planSlot, estate, canSetTag);
11731173

11741174
/*
1175-
* Reset the transition state that may possibly have been written
1176-
* by INSERT.
1175+
* Reset the transition state that may possibly have been written by
1176+
* INSERT.
11771177
*/
11781178
if (mtstate->mt_transition_capture)
11791179
mtstate->mt_transition_capture->tcs_original_insert_tuple = NULL;
@@ -1874,7 +1874,6 @@ ExecPrepareTupleRouting(ModifyTableState *mtstate,
18741874
ResultRelInfo **partRelInfo)
18751875
{
18761876
ResultRelInfo *partrel;
1877-
PartitionRoutingInfo *partrouteinfo;
18781877
TupleConversionMap *map;
18791878

18801879
/*
@@ -1885,8 +1884,6 @@ ExecPrepareTupleRouting(ModifyTableState *mtstate,
18851884
* UPDATE to another partition becomes a DELETE+INSERT.
18861885
*/
18871886
partrel = ExecFindPartition(mtstate, targetRelInfo, proute, slot, estate);
1888-
partrouteinfo = partrel->ri_PartitionInfo;
1889-
Assert(partrouteinfo != NULL);
18901887

18911888
/*
18921889
* If we're capturing transition tuples, we might need to convert from the
@@ -1909,10 +1906,10 @@ ExecPrepareTupleRouting(ModifyTableState *mtstate,
19091906
/*
19101907
* Convert the tuple, if necessary.
19111908
*/
1912-
map = partrouteinfo->pi_RootToPartitionMap;
1909+
map = partrel->ri_RootToPartitionMap;
19131910
if (map != NULL)
19141911
{
1915-
TupleTableSlot *new_slot = partrouteinfo->pi_PartitionTupleSlot;
1912+
TupleTableSlot *new_slot = partrel->ri_PartitionTupleSlot;
19161913

19171914
slot = execute_attr_map_slot(map->attrMap, slot, new_slot);
19181915
}
@@ -2327,8 +2324,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
23272324
* to the format of the table mentioned in the query (root relation).
23282325
* It's needed for update tuple routing, because the routing starts
23292326
* from the root relation. It's also needed for capturing transition
2330-
* tuples, because the transition tuple store can only store tuples
2331-
* in the root table format.
2327+
* tuples, because the transition tuple store can only store tuples in
2328+
* the root table format.
23322329
*
23332330
* For INSERT, the map is only initialized for a given partition when
23342331
* the partition itself is first initialized by ExecFindPartition().
@@ -2363,9 +2360,9 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
23632360
ExecSetupPartitionTupleRouting(estate, mtstate, rel);
23642361

23652362
/*
2366-
* For update row movement we'll need a dedicated slot to store the
2367-
* tuples that have been converted from partition format to the root
2368-
* table format.
2363+
* For update row movement we'll need a dedicated slot to store the tuples
2364+
* that have been converted from partition format to the root table
2365+
* format.
23692366
*/
23702367
if (update_tuple_routing_needed)
23712368
mtstate->mt_root_tuple_slot = table_slot_create(rel, NULL);

‎src/backend/replication/logical/worker.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,6 @@ apply_handle_tuple_routing(ResultRelInfo *relinfo,
15721572
ResultRelInfo *partrelinfo;
15731573
Relation partrel;
15741574
TupleTableSlot *remoteslot_part;
1575-
PartitionRoutingInfo *partinfo;
15761575
TupleConversionMap *map;
15771576
MemoryContext oldctx;
15781577

@@ -1599,11 +1598,10 @@ apply_handle_tuple_routing(ResultRelInfo *relinfo,
15991598
* partition's rowtype. Convert if needed or just copy, using a dedicated
16001599
* slot to store the tuple in any case.
16011600
*/
1602-
partinfo = partrelinfo->ri_PartitionInfo;
1603-
remoteslot_part = partinfo->pi_PartitionTupleSlot;
1601+
remoteslot_part = partrelinfo->ri_PartitionTupleSlot;
16041602
if (remoteslot_part == NULL)
16051603
remoteslot_part = table_slot_create(partrel, &estate->es_tupleTable);
1606-
map = partinfo->pi_RootToPartitionMap;
1604+
map = partrelinfo->ri_RootToPartitionMap;
16071605
if (map != NULL)
16081606
remoteslot_part = execute_attr_map_slot(map->attrMap, remoteslot,
16091607
remoteslot_part);
@@ -1748,12 +1746,11 @@ apply_handle_tuple_routing(ResultRelInfo *relinfo,
17481746
*/
17491747
oldctx = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
17501748
partrel = partrelinfo_new->ri_RelationDesc;
1751-
partinfo = partrelinfo_new->ri_PartitionInfo;
1752-
remoteslot_part = partinfo->pi_PartitionTupleSlot;
1749+
remoteslot_part = partrelinfo_new->ri_PartitionTupleSlot;
17531750
if (remoteslot_part == NULL)
17541751
remoteslot_part = table_slot_create(partrel,
17551752
&estate->es_tupleTable);
1756-
map = partinfo->pi_RootToPartitionMap;
1753+
map = partrelinfo_new->ri_RootToPartitionMap;
17571754
if (map != NULL)
17581755
{
17591756
remoteslot_part = execute_attr_map_slot(map->attrMap,

‎src/include/executor/execPartition.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,6 @@
2222
typedef struct PartitionDispatchData *PartitionDispatch;
2323
typedef struct PartitionTupleRouting PartitionTupleRouting;
2424

25-
/*
26-
* PartitionRoutingInfo
27-
*
28-
* Additional result relation information specific to routing tuples to a
29-
* table partition.
30-
*/
31-
typedef struct PartitionRoutingInfo
32-
{
33-
/*
34-
* Map for converting tuples in root partitioned table format into
35-
* partition format, or NULL if no conversion is required.
36-
*/
37-
TupleConversionMap *pi_RootToPartitionMap;
38-
39-
/*
40-
* Slot to store tuples in partition format, or NULL when no translation
41-
* is required between root and partition.
42-
*/
43-
TupleTableSlot *pi_PartitionTupleSlot;
44-
} PartitionRoutingInfo;
45-
4625
/*
4726
* PartitionedRelPruningData - Per-partitioned-table data for run-time pruning
4827
* of partitions. For a multilevel partitioned table, we have one of these

‎src/include/nodes/execnodes.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "utils/tuplestore.h"
3434

3535
struct PlanState; /* forward references in this file */
36-
struct PartitionRoutingInfo;
3736
struct ParallelHashJoinState;
3837
struct ExecRowMark;
3938
struct ExprState;
@@ -480,11 +479,17 @@ typedef struct ResultRelInfo
480479
/* partition check expression state (NULL if not set up yet) */
481480
ExprState *ri_PartitionCheckExpr;
482481

483-
/* relation descriptor for partitioned table's root, if any */
482+
/*
483+
* Information needed by tuple routing target relations
484+
*
485+
* PartitionRoot gives the target relation mentioned in the query.
486+
* RootToPartitionMap and PartitionTupleSlot, initialized by
487+
* ExecInitRoutingInfo, are non-NULL if partition has a different tuple
488+
* format than the root table.
489+
*/
484490
Relation ri_PartitionRoot;
485-
486-
/* info for partition tuple routing (NULL if not set up yet) */
487-
struct PartitionRoutingInfo *ri_PartitionInfo;
491+
TupleConversionMap *ri_RootToPartitionMap;
492+
TupleTableSlot *ri_PartitionTupleSlot;
488493

489494
/*
490495
* Map to convert child result relation tuples to the format of the table

0 commit comments

Comments
 (0)