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

framework to keep track of snapshots in use.

diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index f7ac06566aa0f0b1088424a922c4801c5484bf99..73c042ea6823e08360a7370d2152d8cb5b2847e9 100644 (file)
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -262,6 +262,7 @@ PortalCleanup(Portal portal)
                                CurrentResourceOwner = portal->resowner;
                                /* we do not need AfterTriggerEndQuery() here */
                                ExecutorEnd(queryDesc);
+                               FreeQueryDesc(queryDesc);
                        }
                        PG_CATCH();
                        {
@@ -362,6 +363,7 @@ PersistHoldablePortal(Portal portal)
                portal->queryDesc = NULL;               /* prevent double shutdown */
                /* we do not need AfterTriggerEndQuery() here */
                ExecutorEnd(queryDesc);
+               FreeQueryDesc(queryDesc);
 
                /*
                 * Set the position in the result set: ideally, this could be

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 76769dbcbe1de5337fab0c833cdf1bd5f453d624..e5370d0ceec0a62082a42f9b6b8642f2db1de50b 100644 (file)
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1541,7 +1541,6 @@ _SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls,
                        {
                                Node       *stmt = (Node *) lfirst(lc2);
                                bool            canSetTag;
-                               QueryDesc  *qdesc;
                                DestReceiver *dest;
 
                                _SPI_current->processed = 0;
@@ -1617,6 +1616,8 @@ _SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls,
                                if (IsA(stmt, PlannedStmt) &&
                                        ((PlannedStmt *) stmt)->utilityStmt == NULL)
                                {
+                                       QueryDesc  *qdesc;
+
                                        qdesc = CreateQueryDesc((PlannedStmt *) stmt,
                                                                                        ActiveSnapshot,
                                                                                        crosscheck_snapshot,
@@ -1790,6 +1791,7 @@ _SPI_pquery(QueryDesc *queryDesc, bool fire_triggers, long tcount)
                AfterTriggerEndQuery(queryDesc->estate);
 
        ExecutorEnd(queryDesc);
+       /* FreeQueryDesc is done by the caller */
 
 #ifdef SPI_EXECUTOR_STATS
        if (ShowExecutorStats)