NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit26d2c5d

committed

Fix memory leaks in GIN index vacuum.

Per bug #12850 by Walter Nordmann. Backpatch to 9.4 where the leak wasintroduced.

1 parentf4abd02 commit26d2c5dCopy full SHA for 26d2c5d

File tree

1 file changed

+20

-14

lines changed

src/backend/access/gin
- ginvacuum.c

1 file changed

+20

-14

lines changed

`‎src/backend/access/gin/ginvacuum.c‎`

Lines changed: 20 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -432,27 +432,32 @@ ginVacuumEntryPage(GinVacuumState gvs, Buffer buffer, BlockNumber roots, uint3`
`432`	`432`	`elseif (GinGetNPosting(itup)>0)`
`433`	`433`	`{`
`434`	`434`	`intnitems;`
`435`		`-ItemPointeruncompressed;`
	`435`	`+ItemPointeritems_orig;`
	`436`	`+boolfree_items_orig;`
	`437`	`+ItemPointeritems;`
`436`	`438`
`437`		`-/*`
`438`		`- * Vacuum posting list with proper function for compressed and`
`439`		`- * uncompressed format.`
`440`		`- */`
	`439`	`+/* Get list of item pointers from the tuple. */`
`441`	`440`	`if (GinItupIsCompressed(itup))`
`442`		`-uncompressed=ginPostingListDecode((GinPostingList*)GinGetPosting(itup),&nitems);`
	`441`	`+{`
	`442`	`+items_orig=ginPostingListDecode((GinPostingList*)GinGetPosting(itup),&nitems);`
	`443`	`+free_items_orig= true;`
	`444`	`+}`
`443`	`445`	`else`
`444`	`446`	`{`
`445`		`-uncompressed= (ItemPointer)GinGetPosting(itup);`
	`447`	`+items_orig= (ItemPointer)GinGetPosting(itup);`
`446`	`448`	`nitems=GinGetNPosting(itup);`
	`449`	`+free_items_orig= false;`
`447`	`450`	`}`
`448`	`451`
`449`		`-uncompressed=ginVacuumItemPointers(gvs,uncompressed,nitems,`
`450`		`-&nitems);`
`451`		`-if (uncompressed)`
	`452`	`+/* Remove any items from the list that need to be vacuumed. */`
	`453`	`+items=ginVacuumItemPointers(gvs,items_orig,nitems,&nitems);`
	`454`	`+`
	`455`	`+if (free_items_orig)`
	`456`	`+pfree(items_orig);`
	`457`	`+`
	`458`	`+/* If any item pointers were removed, recreate the tuple. */`
	`459`	`+if (items)`
`452`	`460`	`{`
`453`		`-/*`
`454`		`- * Some ItemPointers were deleted, recreate tuple.`
`455`		`- */`
`456`	`461`	`OffsetNumberattnum;`
`457`	`462`	`Datumkey;`
`458`	`463`	`GinNullCategorycategory;`
`@@ -461,7 +466,7 @@ ginVacuumEntryPage(GinVacuumState gvs, Buffer buffer, BlockNumber roots, uint3`
`461`	`466`
`462`	`467`	`if (nitems>0)`
`463`	`468`	`{`
`464`		`-plist=ginCompressPostingList(uncompressed,nitems,GinMaxItemSize,NULL);`
	`469`	`+plist=ginCompressPostingList(items,nitems,GinMaxItemSize,NULL);`
`465`	`470`	`plistsize=SizeOfGinPostingList(plist);`
`466`	`471`	`}`
`467`	`472`	`else`
`@@ -500,6 +505,7 @@ ginVacuumEntryPage(GinVacuumState gvs, Buffer buffer, BlockNumber roots, uint3`
`500`	`505`	`RelationGetRelationName(gvs->index));`
`501`	`506`
`502`	`507`	`pfree(itup);`
	`508`	`+pfree(items);`
`503`	`509`	`}`
`504`	`510`	`}`
`505`	`511`	`}`

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!

Commit26d2c5d

File tree

1 file changed

1 file changed

`‎src/backend/access/gin/ginvacuum.c‎`

0 commit comments