Fix BRIN xlog replay

alvherre · alvherre · commit 402822246866 · 2015-06-26T18:13:05.000-03:00
There was a confusion about which block number to use when storing an
item's pointer in the revmap -- the revmap page's blkno was being used,
not the data page's blkno.

Spotted-by: Jeff Janes
diff --git a/src/backend/access/brin/brin_xlog.c b/src/backend/access/brin/brin_xlog.c
@@ -47,6 +47,7 @@ brin_xlog_insert_update(XLogReaderState *record,
 {
 	XLogRecPtr	lsn = record->EndRecPtr;
 	Buffer		buffer;
+	BlockNumber	regpgno;
 	Page		page;
 	XLogRedoAction action;
 
@@ -66,6 +67,9 @@ brin_xlog_insert_update(XLogReaderState *record,
 		action = XLogReadBufferForRedo(record, 0, &buffer);
 	}
 
+	/* need this page's blkno to store in revmap */
+	regpgno = BufferGetBlockNumber(buffer);
+
 	/* insert the index item into the page */
 	if (action == BLK_NEEDS_REDO)
 	{
@@ -97,9 +101,8 @@ brin_xlog_insert_update(XLogReaderState *record,
 	if (action == BLK_NEEDS_REDO)
 	{
 		ItemPointerData tid;
-		BlockNumber blkno = BufferGetBlockNumber(buffer);
 
-		ItemPointerSet(&tid, blkno, xlrec->offnum);
+		ItemPointerSet(&tid, regpgno, xlrec->offnum);
 		page = (Page) BufferGetPage(buffer);
 
 		brinSetHeapBlockItemptr(buffer, xlrec->pagesPerRange, xlrec->heapBlk,

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ brin_xlog_insert_update(XLogReaderState *record,`
`47`	`47`	`{`
`48`	`48`	`XLogRecPtr lsn = record->EndRecPtr;`
`49`	`49`	`Buffer buffer;`
	`50`	`+ BlockNumber regpgno;`
`50`	`51`	`Page page;`
`51`	`52`	`XLogRedoAction action;`
`52`	`53`
`@@ -66,6 +67,9 @@ brin_xlog_insert_update(XLogReaderState *record,`
`66`	`67`	`action = XLogReadBufferForRedo(record, 0, &buffer);`
`67`	`68`	`}`
`68`	`69`
	`70`	`+ /* need this page's blkno to store in revmap */`
	`71`	`+ regpgno = BufferGetBlockNumber(buffer);`
	`72`	`+`
`69`	`73`	`/* insert the index item into the page */`
`70`	`74`	`if (action == BLK_NEEDS_REDO)`
`71`	`75`	`{`
`@@ -97,9 +101,8 @@ brin_xlog_insert_update(XLogReaderState *record,`
`97`	`101`	`if (action == BLK_NEEDS_REDO)`
`98`	`102`	`{`
`99`	`103`	`ItemPointerData tid;`
`100`		`- BlockNumber blkno = BufferGetBlockNumber(buffer);`
`101`	`104`
`102`		`- ItemPointerSet(&tid, blkno, xlrec->offnum);`
	`105`	`+ ItemPointerSet(&tid, regpgno, xlrec->offnum);`
`103`	`106`	`page = (Page) BufferGetPage(buffer);`
`104`	`107`
`105`	`108`	`brinSetHeapBlockItemptr(buffer, xlrec->pagesPerRange, xlrec->heapBlk,`