upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-13 01:40:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make ExecForPortionOfLeftovers() obey SRF protocol.

Browse source 
Before each call to the SRF, initialize isnull and isDone, as per the
comments for struct ReturnSetInfo.  This fixes a Coverity warning
about rsi.isDone not being initialized.  The built-in
{multi,}range_minus_multi functions don't return without setting it,
but a user-supplied function might not be as accommodating.

We also add statistics tracking around the function call, which
will be expected once user-defined withoutPortionProcs functions
are supported, and a cross-check on rsi.returnMode just for
paranoia's sake.

Author: Tom Lane <tgl@sss.pgh.pa.us>
Co-authored-by: Paul A Jungwirth <pj@illuminatedcomputing.com>
Discussion: https://postgr.es/m/4126231.1776622202@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2026-04-20 10:21:52 -04:00
parent 5dbb63fc82
commit 207cb2abcb
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/backend/executor/nodeModifyTable.c
View file

@ -65,6 +65,7 @@
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "pgstat.h"
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "storage/lmgr.h"
@ -1419,6 +1420,7 @@ ExecForPortionOfLeftovers(ModifyTableContext *context,
CmdType oldOperation;
TransitionCaptureState *oldTcs;
FmgrInfo flinfo;
PgStat_FunctionCallUsage fcusage;
ReturnSetInfo rsi;
bool didInit = false;
bool shouldFree = false;
@ -1514,6 +1516,7 @@ ExecForPortionOfLeftovers(ModifyTableContext *context,
rsi.expectedDesc = NULL;
rsi.allowedModes = (int) (SFRM_ValuePerCall);
rsi.returnMode = SFRM_ValuePerCall;
/* isDone is filled below */
rsi.setResult = NULL;
rsi.setDesc = NULL;
@ -1537,14 +1540,27 @@ ExecForPortionOfLeftovers(ModifyTableContext *context,
*/
while (true)
{
Datum leftover = FunctionCallInvoke(fcinfo);
Datum leftover;
/* Call the function one time */
pgstat_init_function_usage(fcinfo, &fcusage);
fcinfo->isnull = false;
rsi.isDone = ExprSingleResult;
leftover = FunctionCallInvoke(fcinfo);
pgstat_end_function_usage(&fcusage,
rsi.isDone != ExprMultipleResult);
if (rsi.returnMode != SFRM_ValuePerCall)
elog(ERROR, "without_portion function violated function call protocol");
/* Are we done? */
if (rsi.isDone == ExprEndResult)
break;
if (fcinfo->isnull)
elog(ERROR, "Got a null from without_portion function");
elog(ERROR, "got a null from without_portion function");
/*
* Does the new Datum violate domain checks? Row-level CHECK