From fb958b5da86da69651f6fb9f540c2cfb1346cdc5 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 2 Dec 2022 10:35:55 +0100 Subject: Generalize ri_RootToPartitionMap to use for non-partition children ri_RootToPartitionMap is currently only initialized for tuple routing target partitions, though a future commit will need the ability to use it even for the non-partition child tables, so make adjustments to the decouple it from the partitioning code. Also, make it lazily initialized via ExecGetRootToChildMap(), making that function its preferred access path. Existing third-party code accessing it directly should no longer do so; consequently, it's been renamed to ri_RootToChildMap, which also makes it consistent with ri_ChildToRootMap. ExecGetRootToChildMap() houses the logic of setting the map appropriately depending on whether a given child relation is partition or not. To support this, also add a separate entry point for TupleConversionMap creation that receives an AttrMap. No new code here, just split an existing function in two. Author: Amit Langote Discussion: https://postgr.es/m/CA+HiwqEYUhDXSK5BTvG_xk=eaAEJCD4GS3C6uH7ybBvv+Z_Tmg@mail.gmail.com --- src/backend/replication/logical/worker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/replication') diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index e48a3f589ae..f9efe6c4c67 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -2193,7 +2193,7 @@ apply_handle_tuple_routing(ApplyExecutionData *edata, remoteslot_part = partrelinfo->ri_PartitionTupleSlot; if (remoteslot_part == NULL) remoteslot_part = table_slot_create(partrel, &estate->es_tupleTable); - map = partrelinfo->ri_RootToPartitionMap; + map = ExecGetRootToChildMap(partrelinfo, estate); if (map != NULL) { attrmap = map->attrMap; @@ -2353,7 +2353,7 @@ apply_handle_tuple_routing(ApplyExecutionData *edata, if (remoteslot_part == NULL) remoteslot_part = table_slot_create(partrel_new, &estate->es_tupleTable); - map = partrelinfo_new->ri_RootToPartitionMap; + map = ExecGetRootToChildMap(partrelinfo_new, estate); if (map != NULL) { remoteslot_part = execute_attr_map_slot(map->attrMap, -- cgit v1.2.3