NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd1b9ee4

committed

Fix bug in the GiST vacuum's 2nd stage.

We mustn't assume that the IndexVacuumInfo pointer passed to bulkdelete()stage is still valid in the vacuumcleanup() stage.Per very pink buildfarm.

1 parent7df159a commitd1b9ee4Copy full SHA for d1b9ee4

File tree

1 file changed

+14

-13

lines changed

src/backend/access/gist
- gistvacuum.c

1 file changed

+14

-13

lines changed

`‎src/backend/access/gist/gistvacuum.c`

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ typedef struct`
`31`	`31`	`{`
`32`	`32`	`IndexBulkDeleteResultstats;/* must be first */`
`33`	`33`
`34`		`-IndexVacuumInfo*info;`
`35`		`-`
`36`	`34`	`/*`
`37`	`35`	`* These are used to memorize all internal and empty leaf pages in the 1st`
`38`	`36`	`* vacuum stage. They are used in the 2nd stage, to delete all the empty`
`@@ -46,6 +44,7 @@ typedef struct`
`46`	`44`	`/* Working state needed by gistbulkdelete */`
`47`	`45`	`typedefstruct`
`48`	`46`	`{`
	`47`	`+IndexVacuumInfo*info;`
`49`	`48`	`GistBulkDeleteResult*stats;`
`50`	`49`	`IndexBulkDeleteCallbackcallback;`
`51`	`50`	`void*callback_state;`
`@@ -56,8 +55,9 @@ static void gistvacuumscan(IndexVacuumInfo info, GistBulkDeleteResult stats,`
`56`	`55`	`IndexBulkDeleteCallbackcallback,void*callback_state);`
`57`	`56`	`staticvoidgistvacuumpage(GistVacState*vstate,BlockNumberblkno,`
`58`	`57`	`BlockNumberorig_blkno);`
`59`		`-staticvoidgistvacuum_delete_empty_pages(GistBulkDeleteResult*stats);`
`60`		`-staticboolgistdeletepage(GistBulkDeleteResult*stats,`
	`58`	`+staticvoidgistvacuum_delete_empty_pages(IndexVacuumInfo*info,`
	`59`	`+GistBulkDeleteResult*stats);`
	`60`	`+staticboolgistdeletepage(IndexVacuumInfoinfo,GistBulkDeleteResultstats,`
`61`	`61`	`Bufferbuffer,OffsetNumberdownlink,`
`62`	`62`	`BufferleafBuffer);`
`63`	`63`
`@@ -121,7 +121,7 @@ gistvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`121`	`121`	`* If we saw any empty pages, try to unlink them from the tree so that`
`122`	`122`	`* they can be reused.`
`123`	`123`	`*/`
`124`		`-gistvacuum_delete_empty_pages(gist_stats);`
	`124`	`+gistvacuum_delete_empty_pages(info,gist_stats);`
`125`	`125`
`126`	`126`	`/* we don't need the internal and empty page sets anymore */`
`127`	`127`	`MemoryContextDelete(gist_stats->page_set_context);`
`@@ -183,7 +183,7 @@ gistvacuumscan(IndexVacuumInfo info, GistBulkDeleteResult stats,`
`183`	`183`	`stats->empty_leaf_set=intset_create();`
`184`	`184`
`185`	`185`	`/* Set up info to pass down to gistvacuumpage */`
`186`		`-stats->info=info;`
	`186`	`+vstate.info=info;`
`187`	`187`	`vstate.stats=stats;`
`188`	`188`	`vstate.callback=callback;`
`189`	`189`	`vstate.callback_state=callback_state;`
`@@ -269,7 +269,7 @@ static void`
`269`	`269`	`gistvacuumpage(GistVacState*vstate,BlockNumberblkno,BlockNumberorig_blkno)`
`270`	`270`	`{`
`271`	`271`	`GistBulkDeleteResult*stats=vstate->stats;`
`272`		`-IndexVacuumInfo*info=stats->info;`
	`272`	`+IndexVacuumInfo*info=vstate->info;`
`273`	`273`	`IndexBulkDeleteCallbackcallback=vstate->callback;`
`274`	`274`	`void*callback_state=vstate->callback_state;`
`275`	`275`	`Relationrel=info->index;`
`@@ -456,9 +456,8 @@ gistvacuumpage(GistVacState *vstate, BlockNumber blkno, BlockNumber orig_blkno)`
`456`	`456`	`* Scan all internal pages, and try to delete their empty child pages.`
`457`	`457`	`*/`
`458`	`458`	`staticvoid`
`459`		`-gistvacuum_delete_empty_pages(GistBulkDeleteResult*stats)`
	`459`	`+gistvacuum_delete_empty_pages(IndexVacuumInfoinfo,GistBulkDeleteResultstats)`
`460`	`460`	`{`
`461`		`-IndexVacuumInfo*info=stats->info;`
`462`	`461`	`Relationrel=info->index;`
`463`	`462`	`BlockNumberempty_pages_remaining;`
`464`	`463`	`uint64blkno;`
`@@ -552,7 +551,9 @@ gistvacuum_delete_empty_pages(GistBulkDeleteResult *stats)`
`552`	`551`	`gistcheckpage(rel,leafbuf);`
`553`	`552`
`554`	`553`	`LockBuffer(buffer,GIST_EXCLUSIVE);`
`555`		`-if (gistdeletepage(stats,buffer,todelete[i]-deleted,leafbuf))`
	`554`	`+if (gistdeletepage(info,stats,`
	`555`	`+buffer,todelete[i]-deleted,`
	`556`	`+leafbuf))`
`556`	`557`	`deleted++;`
`557`	`558`	`LockBuffer(buffer,GIST_UNLOCK);`
`558`	`559`
`@@ -585,7 +586,7 @@ gistvacuum_delete_empty_pages(GistBulkDeleteResult *stats)`
`585`	`586`	`* prevented it.`
`586`	`587`	`*/`
`587`	`588`	`staticbool`
`588`		`-gistdeletepage(GistBulkDeleteResult*stats,`
	`589`	`+gistdeletepage(IndexVacuumInfoinfo,GistBulkDeleteResultstats,`
`589`	`590`	`BufferparentBuffer,OffsetNumberdownlink,`
`590`	`591`	`BufferleafBuffer)`
`591`	`592`	`{`
`@@ -661,10 +662,10 @@ gistdeletepage(GistBulkDeleteResult *stats,`
`661`	`662`	`MarkBufferDirty(parentBuffer);`
`662`	`663`	`PageIndexTupleDelete(parentPage,downlink);`
`663`	`664`
`664`		`-if (RelationNeedsWAL(stats->info->index))`
	`665`	`+if (RelationNeedsWAL(info->index))`
`665`	`666`	`recptr=gistXLogPageDelete(leafBuffer,txid,parentBuffer,downlink);`
`666`	`667`	`else`
`667`		`-recptr=gistGetFakeLSN(stats->info->index);`
	`668`	`+recptr=gistGetFakeLSN(info->index);`
`668`	`669`	`PageSetLSN(parentPage,recptr);`
`669`	`670`	`PageSetLSN(leafPage,recptr);`
`670`	`671`

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!

Commitd1b9ee4

File tree

1 file changed

1 file changed

`‎src/backend/access/gist/gistvacuum.c`

0 commit comments