mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic cleanup of ginInsertValue().

Browse Source 
Make it clearer that the passed stack mustn't be empty, and that we
are 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
This commit is contained in:
Tom Lane 2012-07-13 11:37:39 -04:00
parent a84bf4922e
commit 1a9405d265
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/access/gin/ginbtree.c
View File

@ -275,20 +275,22 @@ ginFindParents(GinBtree btree, GinBtreeStack *stack,
void
ginInsertValue(GinBtree btree, GinBtreeStack *stack, GinStatsData *buildStats)
{
GinBtreeStack *parent = stack;
BlockNumber rootBlkno = InvalidBuffer;
GinBtreeStack *parent;
BlockNumber rootBlkno;
Page page,
rpage,
lpage;
/* remember root BlockNumber */
while (parent)
{
rootBlkno = parent->blkno;
/* extract root BlockNumber from stack */
Assert(stack != NULL);
parent = stack;
while (parent->parent)
parent = parent->parent;
}
rootBlkno = parent->blkno;
Assert(BlockNumberIsValid(rootBlkno));
while (stack)
/* this loop crawls up the stack until the insertion is complete */
for (;;)
{
XLogRecData *rdata;
BlockNumber savedRightLink;
@ -457,7 +459,7 @@ ginInsertValue(GinBtree btree, GinBtreeStack *stack, GinStatsData *buildStats)
*/
ginFindParents(btree, stack, rootBlkno);
parent = stack->parent;
page = BufferGetPage(parent->buffer);
Assert(parent != NULL);
break;
}