diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-15 16:17:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-15 16:17:59 +0000 |
| commit | 5bab36e9f6c3f3a9e14a89e1124179a339d2c3a1 (patch) | |
| tree | a05154b129808efc7882599d96a1132051c2403b /src/backend/executor/nodeAgg.c | |
| parent | 90b3a0b6fd3bc74804c01156491635e5d95091d9 (diff) | |
| download | postgresql-5bab36e9f6c3f3a9e14a89e1124179a339d2c3a1.tar.gz postgresql-5bab36e9f6c3f3a9e14a89e1124179a339d2c3a1.zip | |
Revise executor APIs so that all per-query state structure is built in
a per-query memory context created by CreateExecutorState --- and destroyed
by FreeExecutorState. This provides a final solution to the longstanding
problem of memory leaked by various ExecEndNode calls.
Diffstat (limited to 'src/backend/executor/nodeAgg.c')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index e6ba3887630..769e88a8397 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -45,7 +45,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.100 2002/12/13 19:45:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.101 2002/12/15 16:17:46 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1392,8 +1392,6 @@ ExecEndAgg(AggState *node) tuplesort_end(peraggstate->sortstate); } - ExecFreeProjectionInfo(&node->ss.ps); - /* * Free both the expr contexts. */ @@ -1401,18 +1399,13 @@ ExecEndAgg(AggState *node) node->ss.ps.ps_ExprContext = node->tmpcontext; ExecFreeExprContext(&node->ss.ps); + /* clean up tuple table */ + ExecClearTuple(node->ss.ss_ScanTupleSlot); + MemoryContextDelete(node->aggcontext); outerPlan = outerPlanState(node); ExecEndNode(outerPlan); - - /* clean up tuple table */ - ExecClearTuple(node->ss.ss_ScanTupleSlot); - if (node->grp_firstTuple != NULL) - { - heap_freetuple(node->grp_firstTuple); - node->grp_firstTuple = NULL; - } } void |