NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc556b29

Neil Conway

committed

Fix a gradual memory leak in ExecReScanAgg(). Because the aggregation

hash table is allocated in a child context of the agg node's memorycontext, MemoryContextReset() will reset but *not* delete the childcontext. Since ExecReScanAgg() proceeds to build a new hash tablefrom scratch (in a new sub-context), this results in leaking theheader for the previous memory context. Therefore, useMemoryContextResetAndDeleteChildren() instead.Credit: My colleague Sailesh Krishnamurthy at Truviso for isolatingthe cause of the leak.

1 parentaf1022d commitc556b29Copy full SHA for c556b29

File tree

1 file changed

-3

lines changed

src/backend/executor
- nodeAgg.c

1 file changed

-3

lines changed

`‎src/backend/executor/nodeAgg.c`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`* Portions Copyright (c) 1994, Regents of the University of California`
`62`	`62`	`*`
`63`	`63`	`* IDENTIFICATION`
`64`		`- * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.152 2007/04/02 03:49:38 tgl Exp $`
	`64`	`+ * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.153 2007/08/08 18:07:05 neilc Exp $`
`65`	`65`	`*`
`66`	`66`	`*-------------------------------------------------------------------------`
`67`	`67`	`*/`
`@@ -1646,8 +1646,14 @@ ExecReScanAgg(AggState node, ExprContext exprCtxt)`
`1646`	`1646`	`MemSet(econtext->ecxt_aggvalues,0,sizeof(Datum)*node->numaggs);`
`1647`	`1647`	`MemSet(econtext->ecxt_aggnulls,0,sizeof(bool)*node->numaggs);`
`1648`	`1648`
`1649`		`-/* Release all temp storage */`
`1650`		`-MemoryContextReset(node->aggcontext);`
	`1649`	`+/*`
	`1650`	`+ * Release all temp storage. Note that with AGG_HASHED, the hash table`
	`1651`	`+ * is allocated in a sub-context of the aggcontext. We're going to`
	`1652`	`+ * rebuild the hash table from scratch, so we need to use`
	`1653`	`+ * MemoryContextResetAndDeleteChildren() to avoid leaking the old hash`
	`1654`	`+ * table's memory context header.`
	`1655`	`+ */`
	`1656`	`+MemoryContextResetAndDeleteChildren(node->aggcontext);`
`1651`	`1657`
`1652`	`1658`	`if (((Agg*)node->ss.ps.plan)->aggstrategy==AGG_HASHED)`
`1653`	`1659`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc556b29

File tree

1 file changed

1 file changed

`‎src/backend/executor/nodeAgg.c`

0 commit comments