database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-05 07:21:24 +03:00
Code Activity

Clean up side-effects of commits ab5fcf2b0 et al.

Browse Source 
Before those commits, partitioning-related code in the executor could
assume that ModifyTableState.resultRelInfo[] contains only leaf partitions.
However, now a fully-pruned update results in a dummy ModifyTable that
references the root partitioned table, and that breaks some stuff.

In v11, this led to an assertion or core dump in the tuple routing code.
Fix by disabling tuple routing, since we don't need that anyway.
(I chose to do that in HEAD as well for safety, even though the problem
doesn't manifest in HEAD as it stands.)

In v10, this confused ExecInitModifyTable's decision about whether it
needed to close the root table.  But we can get rid of that altogether
by being smarter about where to find the root table.

Note that since the referenced commits haven't shipped yet, this
isn't fixing any bug the field has seen.

Amit Langote, per a report from me

Discussion: https://postgr.es/m/20710.1554582479@sss.pgh.pa.us
This commit is contained in:
Tom Lane
2019-04-07 12:54:26 -04:00
parent 7d18a55c90
commit 67999b3547
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/executor/nodeModifyTable.c
View File

@ -1933,16 +1933,9 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
estate->es_result_relation_info = saved_resultRelInfo;
/* The root table RT index is at the head of the partitioned_rels list */
if (node->partitioned_rels)
{
Index root_rti;
Oid root_oid;
root_rti = linitial_int(node->partitioned_rels);
root_oid = getrelid(root_rti, estate->es_range_table);
rel = heap_open(root_oid, NoLock); /* locked by InitPlan */
}
/* Examine the root partition if we have one, else target table */
if (mtstate->rootResultRelInfo)
rel = mtstate->rootResultRelInfo->ri_RelationDesc;
else
rel = mtstate->resultRelInfo->ri_RelationDesc;
@ -2134,10 +2127,6 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
mtstate->ps.ps_ExprContext = NULL;
}
/* Close the root partitioned rel if we opened it above. */
if (rel != mtstate->resultRelInfo->ri_RelationDesc)
heap_close(rel, NoLock);
/*
* If needed, Initialize target list, projection and qual for ON CONFLICT
* DO UPDATE.