Skip to content

Jira babel 4880 zebra 4x #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
herambh-shah wants to merge 2 commits into
base: BABEL_4_X_DEV__PG_16_X
Choose a base branch
from
Open

Jira babel 4880 zebra 4x #667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198ade8
Testing return processing after EPQ
Sep 15, 2025
8817c5e
removed output/return processing before EPQ
Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 3 additions & 56 deletions src/backend/executor/nodeModifyTable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,10 +846,6 @@ ExecInsert(ModifyTableContext *context,
return NULL; /* "do nothing" */
}

/* Process RETURNING if present */
if (resultRelInfo->ri_projectReturning && sql_dialect == SQL_DIALECT_TSQL)
result = ExecProcessReturning(resultRelInfo, slot, planSlot);

/* INSTEAD OF ROW INSERT Triggers */
if (resultRelInfo->ri_TrigDesc &&
resultRelInfo->ri_TrigDesc->trig_insert_instead_row)
Expand Down Expand Up @@ -1241,7 +1237,7 @@ ExecInsert(ModifyTableContext *context,
ExecWithCheckOptions(WCO_VIEW_CHECK, resultRelInfo, slot, estate);

/* Process RETURNING if present */
if (resultRelInfo->ri_projectReturning && sql_dialect != SQL_DIALECT_TSQL)
if (resultRelInfo->ri_projectReturning)
result = ExecProcessReturning(resultRelInfo, slot, planSlot);

if (inserted_tuple)
Expand Down Expand Up @@ -1480,7 +1476,6 @@ ExecDelete(ModifyTableContext *context,
Relation resultRelationDesc = resultRelInfo->ri_RelationDesc;
TupleTableSlot *slot = NULL;
TM_Result result;
TupleTableSlot *rslot_output = NULL;

if (tupleDeleted)
*tupleDeleted = false;
Expand All @@ -1493,43 +1488,6 @@ ExecDelete(ModifyTableContext *context,
epqreturnslot, tmresult))
return NULL;

/* Process RETURNING if present and if requested */
if (processReturning && resultRelInfo->ri_projectReturning && sql_dialect == SQL_DIALECT_TSQL)
{
/*
* We have to put the target tuple into a slot, which means first we
* gotta fetch it. We can use the trigger tuple slot.
*/
if (resultRelInfo->ri_FdwRoutine)
{
/* FDW must have provided a slot containing the deleted row */
Assert(!TupIsNull(slot));
}
else
{
slot = ExecGetReturningSlot(estate, resultRelInfo);
if (oldtuple != NULL)
{
ExecForceStoreHeapTuple(oldtuple, slot, false);
}
else
{
if (!table_tuple_fetch_row_version(resultRelationDesc, tupleid,
SnapshotAny, slot))
elog(ERROR, "failed to fetch deleted tuple for DELETE RETURNING");
}
}
rslot_output = ExecProcessReturning(resultRelInfo, slot, context->planSlot);

/*
* Before releasing the target tuple again, make sure rslot has a
* local copy of any pass-by-reference values.
*/
ExecMaterializeSlot(rslot_output);

ExecClearTuple(slot);
}

if (resultRelInfo->ri_TrigDesc &&
resultRelInfo->ri_TrigDesc->trig_delete_instead_statement &&
sql_dialect == SQL_DIALECT_TSQL &&
Expand Down Expand Up @@ -1765,7 +1723,7 @@ ExecDelete(ModifyTableContext *context,
ExecDeleteEpilogue(context, resultRelInfo, tupleid, oldtuple, changingPart);

/* Process RETURNING if present and if requested */
if (processReturning && resultRelInfo->ri_projectReturning && sql_dialect != SQL_DIALECT_TSQL)
if (processReturning && resultRelInfo->ri_projectReturning)
{
/*
* We have to put the target tuple into a slot, which means first we
Expand Down Expand Up @@ -1806,9 +1764,6 @@ ExecDelete(ModifyTableContext *context,
return rslot;
}

if (processReturning && resultRelInfo->ri_projectReturning && rslot_output)
return rslot_output;

return NULL;
}

Expand Down Expand Up @@ -2371,7 +2326,6 @@ ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
Relation resultRelationDesc = resultRelInfo->ri_RelationDesc;
UpdateContext updateCxt = {0};
TM_Result result;
TupleTableSlot *rslot = NULL;

/*
* abort the operation if not running transactions
Expand All @@ -2386,10 +2340,6 @@ ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
if (!ExecUpdatePrologue(context, resultRelInfo, tupleid, oldtuple, slot, NULL))
return NULL;

/* Process RETURNING if present */
if (resultRelInfo->ri_projectReturning && sql_dialect == SQL_DIALECT_TSQL)
rslot = ExecProcessReturning(resultRelInfo, slot, context->planSlot);

if (resultRelInfo->ri_TrigDesc &&
resultRelInfo->ri_TrigDesc->trig_update_instead_statement &&
sql_dialect == SQL_DIALECT_TSQL && bbfViewHasInsteadofTrigger_hook && (bbfViewHasInsteadofTrigger_hook)(resultRelationDesc, CMD_UPDATE) &&
Expand Down Expand Up @@ -2613,11 +2563,8 @@ ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
slot);

/* Process RETURNING if present */
if (resultRelInfo->ri_projectReturning && sql_dialect != SQL_DIALECT_TSQL)
return ExecProcessReturning(resultRelInfo, slot, context->planSlot);

if (resultRelInfo->ri_projectReturning)
return rslot;
return ExecProcessReturning(resultRelInfo, slot, context->planSlot);

return NULL;
}
Expand Down