nbtree: assert no scheduled primscan between pages.

petergeoghegan · petergeoghegan · commit 492e6b54c604 · 2024-10-30T15:53:26.000-04:00
Follow-up to bugfix commit 763d65a. Technically this new assertion is redundant with the assertion recently added to _bt_readpage by that same commit, but it seems like a good idea to have both. The new assertion makes it clear that we expect to call _bt_readnextpage when there's another primitive index scan scheduled, though only when needed as the final step of ending the current primitive scan.
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
@@ -2272,6 +2272,8 @@ _bt_readnextpage(IndexScanDesc scan, BlockNumber blkno,
 			return false;
 		}
 
+		Assert(!so->needPrimScan);
+
 		if (ScanDirectionIsForward(dir))
 		{
 			/* read blkno, but check for interrupts first */

Original file line number	Diff line number	Diff line change
`@@ -2272,6 +2272,8 @@ _bt_readnextpage(IndexScanDesc scan, BlockNumber blkno,`
`2272`	`2272`	`return false;`
`2273`	`2273`	`}`
`2274`	`2274`
	`2275`	`+ Assert(!so->needPrimScan);`
	`2276`	`+`
`2275`	`2277`	`if (ScanDirectionIsForward(dir))`
`2276`	`2278`	`{`
`2277`	`2279`	`/* read blkno, but check for interrupts first */`