nbtree page deletion: Add leaftopparent assertion.

petergeoghegan · petergeoghegan · commit 5b2f2af3d9d5 · 2021-03-02T14:06:07.000-08:00
Add documenting assertion.  This makes it easier to follow how we
maintain the top parent link in target subtree's half-dead/leaf level
page.
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
@@ -2458,6 +2458,9 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, BlockNumber scanblkno,
 			leaftopparent = InvalidBlockNumber;
 	}
 
+	/* No leaftopparent for level 0 (leaf page) or level 1 target */
+	Assert(!BlockNumberIsValid(leaftopparent) || targetlevel > 1);
+
 	/*
 	 * And next write-lock the (current) right sibling.
 	 */
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
@@ -818,7 +818,7 @@ btree_xlog_unlink_page(uint8 info, XLogReaderState *record)
 	safexid = xlrec->safexid;
 
 	/* No leaftopparent for level 0 (leaf page) or level 1 target */
-	Assert(xlrec->leaftopparent == InvalidBlockNumber || level > 1);
+	Assert(!BlockNumberIsValid(xlrec->leaftopparent) || level > 1);
 
 	/*
 	 * In normal operation, we would lock all the pages this WAL record

Original file line number	Diff line number	Diff line change
`@@ -2458,6 +2458,9 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, BlockNumber scanblkno,`
`2458`	`2458`	`leaftopparent = InvalidBlockNumber;`
`2459`	`2459`	`}`
`2460`	`2460`
	`2461`	`+ /* No leaftopparent for level 0 (leaf page) or level 1 target */`
	`2462`	`+ Assert(!BlockNumberIsValid(leaftopparent) \|\| targetlevel > 1);`
	`2463`	`+`
`2461`	`2464`	`/*`
`2462`	`2465`	`* And next write-lock the (current) right sibling.`
`2463`	`2466`	`*/`