Fix new BRIN desummarize WAL record

alvherre · alvherre · commit 817cb100136a · 2017-04-07T17:11:56.000-03:00
The WAL-writing piece was forgetting to set the pages-per-range value. Also, fix the declared type of struct member heapBlk, which I mistakenly set as OffsetNumber rather than BlockNumber. Problem was introduced by commit c655899 (April 1st). Any system that tries to replay the new WAL record written before this fix is likely to die on replay and require pg_resetwal. Reported by Tom Lane. Discussion: https://postgr.es/m/20191.1491524824@sss.pgh.pa.us
diff --git a/src/backend/access/brin/brin_revmap.c b/src/backend/access/brin/brin_revmap.c
@@ -417,6 +417,7 @@ brinRevmapDesummarizeRange(Relation idxrel, BlockNumber heapBlk)
 		xl_brin_desummarize xlrec;
 		XLogRecPtr		recptr;
 
+		xlrec.pagesPerRange = revmap->rm_pagesPerRange;
 		xlrec.heapBlk = heapBlk;
 		xlrec.regOffset = regOffset;
 
diff --git a/src/include/access/brin_xlog.h b/src/include/access/brin_xlog.h
@@ -134,7 +134,7 @@ typedef struct xl_brin_desummarize
 {
 	BlockNumber	pagesPerRange;
 	/* page number location to set to invalid */
-	OffsetNumber heapBlk;
+	BlockNumber heapBlk;
 	/* offset of item to delete in regular index page */
 	OffsetNumber regOffset;
 } xl_brin_desummarize;
