NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit1a9405d

committed

Cosmetic cleanup of ginInsertValue().

Make it clearer that the passed stack mustn't be empty, and that weare not supposed to fall off the end of the stack in the main loop.Tighten the loop that extracts the root block number, too.Markus Wanner and Tom Lane

1 parenta84bf49 commit1a9405dCopy full SHA for 1a9405d

File tree

1 file changed

+11

-9

lines changed

src/backend/access/gin
- ginbtree.c

1 file changed

+11

-9

lines changed

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

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -275,20 +275,22 @@ ginFindParents(GinBtree btree, GinBtreeStack *stack,`
`275`	`275`	`void`
`276`	`276`	`ginInsertValue(GinBtreebtree,GinBtreeStackstack,GinStatsDatabuildStats)`
`277`	`277`	`{`
`278`		`-GinBtreeStack*parent=stack;`
`279`		`-BlockNumberrootBlkno=InvalidBuffer;`
	`278`	`+GinBtreeStack*parent;`
	`279`	`+BlockNumberrootBlkno;`
`280`	`280`	`Pagepage,`
`281`	`281`	`rpage,`
`282`	`282`	`lpage;`
`283`	`283`
`284`		`-/remember root BlockNumber /`
`285`		`-while (parent)`
`286`		`-{`
`287`		`-rootBlkno=parent->blkno;`
	`284`	`+/extract root BlockNumber from stack /`
	`285`	`+Assert(stack!=NULL);`
	`286`	`+parent=stack;`
	`287`	`+while (parent->parent)`
`288`	`288`	`parent=parent->parent;`
`289`		`-}`
	`289`	`+rootBlkno=parent->blkno;`
	`290`	`+Assert(BlockNumberIsValid(rootBlkno));`
`290`	`291`
`291`		`-while (stack)`
	`292`	`+/* this loop crawls up the stack until the insertion is complete */`
	`293`	`+for (;;)`
`292`	`294`	`{`
`293`	`295`	`XLogRecData*rdata;`
`294`	`296`	`BlockNumbersavedRightLink;`
`@@ -457,7 +459,7 @@ ginInsertValue(GinBtree btree, GinBtreeStack stack, GinStatsData buildStats)`
`457`	`459`	`*/`
`458`	`460`	`ginFindParents(btree,stack,rootBlkno);`
`459`	`461`	`parent=stack->parent;`
`460`		`-page=BufferGetPage(parent->buffer);`
	`462`	`+Assert(parent!=NULL);`
`461`	`463`	`break;`
`462`	`464`	`}`
`463`	`465`

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!

Commit1a9405d

File tree

1 file changed

1 file changed

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

0 commit comments