Commit8759b79

committed

Add a couple of missing FreeQueryDesc calls. Noticed while testing a

framework to keep track of snapshots in use.

1 parent4e22844 commit8759b79Copy full SHA for 8759b79

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.69 2008/01/01 19:45:49 momjian Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.70 2008/03/20 20:05:56 alvherre Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -262,6 +262,7 @@ PortalCleanup(Portal portal)`
`262`	`262`	`CurrentResourceOwner=portal->resowner;`
`263`	`263`	`/* we do not need AfterTriggerEndQuery() here */`
`264`	`264`	`ExecutorEnd(queryDesc);`
	`265`	`+FreeQueryDesc(queryDesc);`
`265`	`266`	`}`
`266`	`267`	`PG_CATCH();`
`267`	`268`	`{`
`@@ -362,6 +363,7 @@ PersistHoldablePortal(Portal portal)`
`362`	`363`	`portal->queryDesc=NULL;/* prevent double shutdown */`
`363`	`364`	`/* we do not need AfterTriggerEndQuery() here */`
`364`	`365`	`ExecutorEnd(queryDesc);`
	`366`	`+FreeQueryDesc(queryDesc);`
`365`	`367`
`366`	`368`	`/*`
`367`	`369`	`* Set the position in the result set: ideally, this could be`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.188 2008/02/12 04:09:44 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.189 2008/03/20 20:05:56 alvherre Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1541,7 +1541,6 @@ _SPI_execute_plan(SPIPlanPtr plan, Datum Values, const char Nulls,`
`1541`	`1541`	`{`
`1542`	`1542`	`Nodestmt= (Node)lfirst(lc2);`
`1543`	`1543`	`boolcanSetTag;`
`1544`		`-QueryDesc*qdesc;`
`1545`	`1544`	`DestReceiver*dest;`
`1546`	`1545`
`1547`	`1546`	`_SPI_current->processed=0;`
`@@ -1617,6 +1616,8 @@ _SPI_execute_plan(SPIPlanPtr plan, Datum Values, const char Nulls,`
`1617`	`1616`	`if (IsA(stmt,PlannedStmt)&&`
`1618`	`1617`	`((PlannedStmt*)stmt)->utilityStmt==NULL)`
`1619`	`1618`	`{`
	`1619`	`+QueryDesc*qdesc;`
	`1620`	`+`
`1620`	`1621`	`qdesc=CreateQueryDesc((PlannedStmt*)stmt,`
`1621`	`1622`	`ActiveSnapshot,`
`1622`	`1623`	`crosscheck_snapshot,`
`@@ -1790,6 +1791,7 @@ _SPI_pquery(QueryDesc *queryDesc, bool fire_triggers, long tcount)`
`1790`	`1791`	`AfterTriggerEndQuery(queryDesc->estate);`
`1791`	`1792`
`1792`	`1793`	`ExecutorEnd(queryDesc);`
	`1794`	`+/* FreeQueryDesc is done by the caller */`
`1793`	`1795`
`1794`	`1796`	`#ifdefSPI_EXECUTOR_STATS`
`1795`	`1797`	`if (ShowExecutorStats)`

Comments

(0)