Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1b61ee3

Browse files
committed
_SPI_execute_plan failed to return result tuple table to caller in
the ProcessUtility case, resulting in an intratransaction memory leakif a utility command actually did return any tuples, as reported byDmitry Karasik. Fix this and also make the behavior more consistentfor cases involving nested SPI operations and multiple query trees,by ensuring that we store the state locally until it is ready to bereturned to the caller.
1 parentca8cfc9 commit1b61ee3

File tree

2 files changed

+43
-33
lines changed

2 files changed

+43
-33
lines changed

‎src/backend/executor/spi.c‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.141 2005/06/09 21:25:22 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.142 2005/10/01 18:43:19 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -104,6 +104,7 @@ SPI_connect(void)
104104

105105
_SPI_current=&(_SPI_stack[_SPI_connected]);
106106
_SPI_current->processed=0;
107+
_SPI_current->lastoid=InvalidOid;
107108
_SPI_current->tuptable=NULL;
108109
_SPI_current->procCxt=NULL;/* in case we fail to create 'em */
109110
_SPI_current->execCxt=NULL;
@@ -859,7 +860,7 @@ SPI_cursor_open(const char *name, void *plan,
859860
break;
860861
}
861862

862-
/* Reset SPI result */
863+
/* Reset SPI result(note we deliberately don't touch lastoid)*/
863864
SPI_processed=0;
864865
SPI_tuptable=NULL;
865866
_SPI_current->processed=0;
@@ -1313,6 +1314,9 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
13131314
boolread_only,longtcount)
13141315
{
13151316
volatileintres=0;
1317+
volatileuint32my_processed=0;
1318+
volatileOidmy_lastoid=InvalidOid;
1319+
SPITupleTable*volatilemy_tuptable=NULL;
13161320
SnapshotsaveActiveSnapshot;
13171321

13181322
/* Be sure to restore ActiveSnapshot on error exit */
@@ -1347,12 +1351,6 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
13471351
else
13481352
paramLI=NULL;
13491353

1350-
/* Reset state (only needed in case string is empty) */
1351-
SPI_processed=0;
1352-
SPI_lastoid=InvalidOid;
1353-
SPI_tuptable=NULL;
1354-
_SPI_current->tuptable=NULL;
1355-
13561354
/*
13571355
* Setup error traceback support for ereport()
13581356
*/
@@ -1366,13 +1364,6 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
13661364
List*query_list=lfirst(query_list_list_item);
13671365
ListCell*query_list_item;
13681366

1369-
/* Reset state for each original parsetree */
1370-
/* (at most one of its querytrees will be marked canSetTag) */
1371-
SPI_processed=0;
1372-
SPI_lastoid=InvalidOid;
1373-
SPI_tuptable=NULL;
1374-
_SPI_current->tuptable=NULL;
1375-
13761367
foreach(query_list_item,query_list)
13771368
{
13781369
Query*queryTree= (Query*)lfirst(query_list_item);
@@ -1383,6 +1374,10 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
13831374
planTree=lfirst(plan_list_item);
13841375
plan_list_item=lnext(plan_list_item);
13851376

1377+
_SPI_current->processed=0;
1378+
_SPI_current->lastoid=InvalidOid;
1379+
_SPI_current->tuptable=NULL;
1380+
13861381
if (queryTree->commandType==CMD_UTILITY)
13871382
{
13881383
if (IsA(queryTree->utilityStmt,CopyStmt))
@@ -1467,6 +1462,23 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
14671462
}
14681463
FreeSnapshot(ActiveSnapshot);
14691464
ActiveSnapshot=NULL;
1465+
/*
1466+
* The last canSetTag query sets the auxiliary values returned
1467+
* to the caller. Be careful to free any tuptables not
1468+
* returned, to avoid intratransaction memory leak.
1469+
*/
1470+
if (queryTree->canSetTag)
1471+
{
1472+
my_processed=_SPI_current->processed;
1473+
my_lastoid=_SPI_current->lastoid;
1474+
SPI_freetuptable(my_tuptable);
1475+
my_tuptable=_SPI_current->tuptable;
1476+
}
1477+
else
1478+
{
1479+
SPI_freetuptable(_SPI_current->tuptable);
1480+
_SPI_current->tuptable=NULL;
1481+
}
14701482
/* we know that the receiver doesn't need a destroy call */
14711483
if (res<0)
14721484
gotofail;
@@ -1490,16 +1502,19 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
14901502

14911503
ActiveSnapshot=saveActiveSnapshot;
14921504

1505+
/* Save results for caller */
1506+
SPI_processed=my_processed;
1507+
SPI_lastoid=my_lastoid;
1508+
SPI_tuptable=my_tuptable;
1509+
14931510
returnres;
14941511
}
14951512

14961513
staticint
14971514
_SPI_pquery(QueryDesc*queryDesc,longtcount)
14981515
{
14991516
intoperation=queryDesc->operation;
1500-
CommandDestorigDest=queryDesc->dest->mydest;
15011517
intres;
1502-
Oidsave_lastoid;
15031518

15041519
switch (operation)
15051520
{
@@ -1510,6 +1525,11 @@ _SPI_pquery(QueryDesc *queryDesc, long tcount)
15101525
res=SPI_OK_SELINTO;
15111526
queryDesc->dest=None_Receiver;/* don't output results */
15121527
}
1528+
elseif (queryDesc->dest->mydest!=SPI)
1529+
{
1530+
/* Don't return SPI_OK_SELECT if we're discarding result */
1531+
res=SPI_OK_UTILITY;
1532+
}
15131533
break;
15141534
caseCMD_INSERT:
15151535
res=SPI_OK_INSERT;
@@ -1536,7 +1556,7 @@ _SPI_pquery(QueryDesc *queryDesc, long tcount)
15361556
ExecutorRun(queryDesc,ForwardScanDirection,tcount);
15371557

15381558
_SPI_current->processed=queryDesc->estate->es_processed;
1539-
save_lastoid=queryDesc->estate->es_lastoid;
1559+
_SPI_current->lastoid=queryDesc->estate->es_lastoid;
15401560

15411561
if (operation==CMD_SELECT&&queryDesc->dest->mydest==SPI)
15421562
{
@@ -1549,19 +1569,6 @@ _SPI_pquery(QueryDesc *queryDesc, long tcount)
15491569

15501570
ExecutorEnd(queryDesc);
15511571

1552-
/* Test origDest here so that SPI_processed gets set in SELINTO case */
1553-
if (origDest==SPI)
1554-
{
1555-
SPI_processed=_SPI_current->processed;
1556-
SPI_lastoid=save_lastoid;
1557-
SPI_tuptable=_SPI_current->tuptable;
1558-
}
1559-
elseif (res==SPI_OK_SELECT)
1560-
{
1561-
/* Don't return SPI_OK_SELECT if we discarded the result */
1562-
res=SPI_OK_UTILITY;
1563-
}
1564-
15651572
#ifdefSPI_EXECUTOR_STATS
15661573
if (ShowExecutorStats)
15671574
ShowUsage("SPI EXECUTOR STATS");
@@ -1615,7 +1622,7 @@ _SPI_cursor_operation(Portal portal, bool forward, long count,
16151622
if (_SPI_begin_call(true)<0)
16161623
elog(ERROR,"SPI cursor operation called while not connected");
16171624

1618-
/* Reset the SPI result */
1625+
/* Reset the SPI result(note we deliberately don't touch lastoid)*/
16191626
SPI_processed=0;
16201627
SPI_tuptable=NULL;
16211628
_SPI_current->processed=0;

‎src/include/executor/spi_priv.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.22 2004/12/31 22:03:29 pgsql Exp $
9+
* $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.23 2005/10/01 18:43:19 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -18,8 +18,11 @@
1818

1919
typedefstruct
2020
{
21+
/* current results */
2122
uint32processed;/* by Executor */
23+
Oidlastoid;
2224
SPITupleTable*tuptable;
25+
2326
MemoryContextprocCxt;/* procedure context */
2427
MemoryContextexecCxt;/* executor context */
2528
MemoryContextsavedcxt;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp