database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00
Code Activity

ExecModifyTable: use context.planSlot instead of planSlot

Browse Source 
There's no reason to keep a separate local variable when we have a place
for it elsewhere.  This allows to simplify some code.

Reviewed-by: Michaël Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/202204191345.qerjy3kxi3eb@alvherre.pgsql
This commit is contained in:
Alvaro Herrera
2022-04-20 10:34:58 +02:00
parent 74547b9c23
commit 3dcc6bf406
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3452,7 +3452,6 @@ ExecModifyTable(PlanState *pstate)
ResultRelInfo *resultRelInfo; ResultRelInfo *resultRelInfo;
PlanState *subplanstate; PlanState *subplanstate;
TupleTableSlot *slot; TupleTableSlot *slot;
TupleTableSlot *planSlot;
TupleTableSlot *oldSlot; TupleTableSlot *oldSlot;
ItemPointerData tuple_ctid; ItemPointerData tuple_ctid;
HeapTupleData oldtupdata; HeapTupleData oldtupdata;
@ -3525,10 +3524,10 @@ ExecModifyTable(PlanState *pstate)
if (pstate->ps_ExprContext) if (pstate->ps_ExprContext)
ResetExprContext(pstate->ps_ExprContext); ResetExprContext(pstate->ps_ExprContext);
planSlot = ExecProcNode(subplanstate); context.planSlot = ExecProcNode(subplanstate);
/* No more tuples to process? */ /* No more tuples to process? */
if (TupIsNull(planSlot)) if (TupIsNull(context.planSlot))
break; break;
/* /*
@ -3542,7 +3541,7 @@ ExecModifyTable(PlanState *pstate)
bool isNull; bool isNull;
Oid resultoid; Oid resultoid;
datum = ExecGetJunkAttribute(planSlot, node->mt_resultOidAttno, datum = ExecGetJunkAttribute(context.planSlot, node->mt_resultOidAttno,
&isNull); &isNull);
if (isNull) if (isNull)
{ {
@ -3556,9 +3555,8 @@ ExecModifyTable(PlanState *pstate)
*/ */
if (operation == CMD_MERGE) if (operation == CMD_MERGE)
{ {
EvalPlanQualSetSlot(&node->mt_epqstate, planSlot); EvalPlanQualSetSlot(&node->mt_epqstate, context.planSlot);
context.planSlot = planSlot;
context.lockmode = 0; context.lockmode = 0;
ExecMerge(&context, node->resultRelInfo, NULL, node->canSetTag); ExecMerge(&context, node->resultRelInfo, NULL, node->canSetTag);
@ -3589,13 +3587,13 @@ ExecModifyTable(PlanState *pstate)
* ExecProcessReturning by IterateDirectModify, so no need to * ExecProcessReturning by IterateDirectModify, so no need to
* provide it here. * provide it here.
*/ */
slot = ExecProcessReturning(resultRelInfo, NULL, planSlot); slot = ExecProcessReturning(resultRelInfo, NULL, context.planSlot);
return slot; return slot;
} }
EvalPlanQualSetSlot(&node->mt_epqstate, planSlot); EvalPlanQualSetSlot(&node->mt_epqstate, context.planSlot);
slot = planSlot; slot = context.planSlot;
tupleid = NULL; tupleid = NULL;
oldtuple = NULL; oldtuple = NULL;
@ -3637,9 +3635,8 @@ ExecModifyTable(PlanState *pstate)
{ {
if (operation == CMD_MERGE) if (operation == CMD_MERGE)
{ {
EvalPlanQualSetSlot(&node->mt_epqstate, planSlot); EvalPlanQualSetSlot(&node->mt_epqstate, context.planSlot);
context.planSlot = planSlot;
context.lockmode = 0; context.lockmode = 0;
ExecMerge(&context, node->resultRelInfo, NULL, node->canSetTag); ExecMerge(&context, node->resultRelInfo, NULL, node->canSetTag);
@ -3698,7 +3695,6 @@ ExecModifyTable(PlanState *pstate)
} }
/* complete context setup */ /* complete context setup */
context.planSlot = planSlot;
context.lockmode = 0; context.lockmode = 0;
switch (operation) switch (operation)
@ -3707,7 +3703,7 @@ ExecModifyTable(PlanState *pstate)
/* Initialize projection info if first time for this table */ /* Initialize projection info if first time for this table */
if (unlikely(!resultRelInfo->ri_projectNewInfoValid)) if (unlikely(!resultRelInfo->ri_projectNewInfoValid))
ExecInitInsertProjection(node, resultRelInfo); ExecInitInsertProjection(node, resultRelInfo);
slot = ExecGetInsertNewTuple(resultRelInfo, planSlot); slot = ExecGetInsertNewTuple(resultRelInfo, context.planSlot);
slot = ExecInsert(&context, resultRelInfo, slot, slot = ExecInsert(&context, resultRelInfo, slot,
node->canSetTag, NULL, NULL); node->canSetTag, NULL, NULL);
break; break;
@ -3737,7 +3733,7 @@ ExecModifyTable(PlanState *pstate)
oldSlot)) oldSlot))
elog(ERROR, "failed to fetch tuple being updated"); elog(ERROR, "failed to fetch tuple being updated");
} }
slot = internalGetUpdateNewTuple(resultRelInfo, planSlot, slot = internalGetUpdateNewTuple(resultRelInfo, context.planSlot,
oldSlot, NULL); oldSlot, NULL);
context.GetUpdateNewTuple = internalGetUpdateNewTuple; context.GetUpdateNewTuple = internalGetUpdateNewTuple;
context.relaction = NULL; context.relaction = NULL;