NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitef148d6

committed

Fix bug with page deletion. If inner page is removed and it tries to

remove page on next level linked from next inner page, ginScanToDelete()wrongly sets parent page. Bug reveals when many item pointers from indexwas deleted ( several hundred thousands).Bug is discovered by hubert depesz lubaczewski <depesz@gmail.com>Suppose, we need rc2 before release...

1 parentcf06c2e commitef148d6Copy full SHA for ef148d6

File tree

1 file changed

+15

-7

lines changed

src/backend/access/gin
- ginvacuum.c

1 file changed

+15

-7

lines changed

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

Lines changed: 15 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- *$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.8 2006/11/12 06:55:53 neilc Exp $`
	`11`	`+ *$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.9 2006/11/30 16:22:32 teodor Exp $`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`@@ -265,6 +265,12 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`parentPage=BufferGetPage(pBuffer);`
	`268`	`+#ifdefUSE_ASSERT_CHECKING`
	`269`	`+do {`
	`270`	`+PostingItemtod=(PostingItem)GinDataPageGetItem(parentPage,myoff);`
	`271`	`+Assert(PostingItemGetBlockNumber(tod)==deleteBlkno );`
	`272`	`+}while(0);`
	`273`	`+#endif`
`268`	`274`	`PageDeletePostingItem(parentPage,myoff);`
`269`	`275`
`270`	`276`	`page=BufferGetPage(dBuffer);`
`@@ -351,7 +357,8 @@ typedef struct DataPageDeleteStack`
`351`	`357`	`structDataPageDeleteStack*child;`
`352`	`358`	`structDataPageDeleteStack*parent;`
`353`	`359`
`354`		`-BlockNumberblkno;`
	`360`	`+BlockNumberblkno;/* current block number */`
	`361`	`+BlockNumberleftBlkno;/* rightest non-deleted page on left */`
`355`	`362`	`boolisRoot;`
`356`	`363`	`}DataPageDeleteStack;`
`357`	`364`
`@@ -377,7 +384,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, DataPageDel`
`377`	`384`	`me= (DataPageDeleteStack*)palloc0(sizeof(DataPageDeleteStack));`
`378`	`385`	`me->parent=parent;`
`379`	`386`	`parent->child=me;`
`380`		`-me->blkno=InvalidBlockNumber;`
	`387`	`+me->leftBlkno=InvalidBlockNumber;`
`381`	`388`	`}`
`382`	`389`	`else`
`383`	`390`	`me=parent->child;`
`@@ -392,6 +399,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, DataPageDel`
`392`	`399`	`{`
`393`	`400`	`OffsetNumberi;`
`394`	`401`
	`402`	`+me->blkno=blkno;`
`395`	`403`	`for (i=FirstOffsetNumber;i <=GinPageGetOpaque(page)->maxoff;i++)`
`396`	`404`	`{`
`397`	`405`	`PostingItempitem= (PostingItem)GinDataPageGetItem(page,i);`
`@@ -403,13 +411,13 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, DataPageDel`
`403`	`411`
`404`	`412`	`if (GinPageGetOpaque(page)->maxoff<FirstOffsetNumber)`
`405`	`413`	`{`
`406`		`-if (!(me->blkno==InvalidBlockNumber&&GinPageRightMost(page)))`
	`414`	`+if (!(me->leftBlkno==InvalidBlockNumber&&GinPageRightMost(page)))`
`407`	`415`	`{`
`408`	`416`	`/* we never delete right most branch */`
`409`	`417`	`Assert(!isRoot);`
`410`	`418`	`if (GinPageGetOpaque(page)->maxoff<FirstOffsetNumber)`
`411`	`419`	`{`
`412`		`-ginDeletePage(gvs,blkno,me->blkno,me->parent->blkno,myoff,me->parent->isRoot);`
	`420`	`+ginDeletePage(gvs,blkno,me->leftBlkno,me->parent->blkno,myoff,me->parent->isRoot);`
`413`	`421`	`meDelete= TRUE;`
`414`	`422`	`}`
`415`	`423`	`}`
`@@ -418,7 +426,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, DataPageDel`
`418`	`426`	`ReleaseBuffer(buffer);`
`419`	`427`
`420`	`428`	`if (!meDelete)`
`421`		`-me->blkno=blkno;`
	`429`	`+me->leftBlkno=blkno;`
`422`	`430`
`423`	`431`	`returnmeDelete;`
`424`	`432`	`}`
`@@ -438,7 +446,7 @@ ginVacuumPostingTree(GinVacuumState *gvs, BlockNumber rootBlkno)`
`438`	`446`	`}`
`439`	`447`
`440`	`448`	`memset(&root,0,sizeof(DataPageDeleteStack));`
`441`		`-root.blkno=rootBlkno;`
	`449`	`+root.leftBlkno=InvalidBlockNumber;`
`442`	`450`	`root.isRoot= TRUE;`
`443`	`451`
`444`	`452`	`vacuum_delay_point();`

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!

Commitef148d6

File tree

1 file changed

1 file changed

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

0 commit comments