diff options
Diffstat (limited to 'src/backend/executor/nodeModifyTable.c')
| -rw-r--r-- | src/backend/executor/nodeModifyTable.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index e2836b75ff3..6ef694d5a4a 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -163,12 +163,6 @@ ExecProcessReturning(ResultRelInfo *resultRelInfo, ProjectionInfo *projectReturning = resultRelInfo->ri_projectReturning; ExprContext *econtext = projectReturning->pi_exprContext; - /* - * Reset per-tuple memory context to free any expression evaluation - * storage allocated in the previous cycle. - */ - ResetExprContext(econtext); - /* Make tuple and any needed join variables available to ExecProject */ if (tupleSlot) econtext->ecxt_scantuple = tupleSlot; @@ -1453,13 +1447,7 @@ ExecOnConflictUpdate(ModifyTableState *mtstate, elog(ERROR, "unrecognized heap_lock_tuple status: %u", test); } - /* - * Success, the tuple is locked. - * - * Reset per-tuple memory context to free any expression evaluation - * storage allocated in the previous cycle. - */ - ResetExprContext(econtext); + /* Success, the tuple is locked. */ /* * Verify that the tuple is visible to our MVCC snapshot if the current @@ -2028,6 +2016,14 @@ ExecModifyTable(PlanState *pstate) */ ResetPerTupleExprContext(estate); + /* + * Reset per-tuple memory context used for processing on conflict and + * returning clauses, to free any expression evaluation storage + * allocated in the previous cycle. + */ + if (pstate->ps_ExprContext) + ResetExprContext(pstate->ps_ExprContext); + planSlot = ExecProcNode(subplanstate); if (TupIsNull(planSlot)) |