NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit82dd1c2

committed

Fix memory leak in repeated SPGIST index scans.

spgendscan neglected to pfree all the memory allocated by spgbeginscan.It's possible to get away with that in most normal queries, since thememory is allocated in the executor's per-query context which is aboutto get deleted anyway; but it causes severe memory leakage duringcreation or filling of large exclusion-constraint indexes.Also, document that amendscan is supposed to free what ambeginscanallocates. The docs' lack of clarity on that point probably caused thisbug to begin with. (There is discussion of changing that API spec goingforward, but I don't think it'd be appropriate for the back branches.)Per report from Bruno Wolff. It's been like this since the beginning,so back-patch to all active branches.In HEAD, also fix an independent leak caused by commit2a63683(allocating memory during spgrescan instead of spgbeginscan, whichmight be all right if it got cleaned up, but it didn't). And do a bitof code beautification on that commit, too.Discussion:https://postgr.es/m/20181024012314.GA27428@wolff.to

1 parent7dd8b3c commit82dd1c2Copy full SHA for 82dd1c2

File tree

2 files changed

+10

-1

lines changed

doc/src/sgml
- indexam.sgml
src/backend/access/spgist
- spgscan.c

2 files changed

+10

-1

lines changed

`‎doc/src/sgml/indexam.sgml`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,8 @@ amendscan (IndexScanDesc scan);`
`455`	`455`	`</programlisting>`
`456`	`456`	`End a scan and release resources. The <literal>scan</> struct itself`
`457`	`457`	`should not be freed, but any locks or pins taken internally by the`
`458`		`- access method must be released.`
	`458`	`+ access method must be released, as well as any other memory allocated`
	`459`	`+ by <function>ambeginscan</function> and other scan-related functions.`
`459`	`460`	`</para>`
`460`	`461`
`461`	`462`	`<para>`

`‎src/backend/access/spgist/spgscan.c`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,14 @@ spgendscan(PG_FUNCTION_ARGS)`
`236`	`236`
`237`	`237`	`MemoryContextDelete(so->tempCxt);`
`238`	`238`
	`239`	`+if (so->keyData)`
	`240`	`+pfree(so->keyData);`
	`241`	`+`
	`242`	`+if (so->state.deadTupleStorage)`
	`243`	`+pfree(so->state.deadTupleStorage);`
	`244`	`+`
	`245`	`+pfree(so);`
	`246`	`+`
`239`	`247`	`PG_RETURN_VOID();`
`240`	`248`	`}`
`241`	`249`

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!

Commit82dd1c2

File tree

2 files changed

2 files changed

`‎doc/src/sgml/indexam.sgml`

`‎src/backend/access/spgist/spgscan.c`

0 commit comments