Check XLogRecHasBlockRef() before XLogRecHasBlockImage().

jeff-davis · jeff-davis · commit 12aaae5131af · 2022-04-08T02:30:57.000-07:00
Trial fix of buildfarm failures on kestrel and tamandua.
diff --git a/src/backend/access/transam/xlogstats.c b/src/backend/access/transam/xlogstats.c
@@ -33,6 +33,9 @@ XLogRecGetLen(XLogReaderState *record, uint32 *rec_len,
 	*fpi_len = 0;
 	for (block_id = 0; block_id <= XLogRecMaxBlockId(record); block_id++)
 	{
+		if (!XLogRecHasBlockRef(record, block_id))
+			continue;
+
 		if (XLogRecHasBlockImage(record, block_id))
 			*fpi_len += XLogRecGetBlock(record, block_id)->bimg_len;
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ XLogRecGetLen(XLogReaderState record, uint32 rec_len,`
`33`	`33`	`*fpi_len = 0;`
`34`	`34`	`for (block_id = 0; block_id <= XLogRecMaxBlockId(record); block_id++)`
`35`	`35`	`{`
	`36`	`+ if (!XLogRecHasBlockRef(record, block_id))`
	`37`	`+ continue;`
	`38`	`+`
`36`	`39`	`if (XLogRecHasBlockImage(record, block_id))`
`37`	`40`	`*fpi_len += XLogRecGetBlock(record, block_id)->bimg_len;`
`38`	`41`	`}`