pg_waldump: Fix --bkp-details to not issue spurious newlines for FPWs.

anarazel · anarazel · commit d4b5206b2237 · 2019-10-29T22:53:30.000-07:00
The additional newline seems to have accidentally been introduced in 2c03216, in 9.5. The newline is only issued when an FPW is present for the block reference. While there could be an argument that removing the newlines in the back branches could cause a problem for somebody parsing the pg_waldump output, the likelihood of that seems small enough. It seems at least equally likely that the randomness of when newlines are issued causes problems. Author: Andres Freund Discussion: https://postgr.es/m/20191029233341.4gnyau7e5v2lh5sc@alap3.anarazel.de Backpatch: 9.5, like 2c03216.
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
@@ -600,7 +600,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
 					BKPIMAGE_IS_COMPRESSED)
 				{
 					printf(" (FPW%s); hole: offset: %u, length: %u, "
-						   "compression saved: %u\n",
+						   "compression saved: %u",
 						   XLogRecBlockImageApply(record, block_id) ?
 						   "" : " for WAL verification",
 						   record->blocks[block_id].hole_offset,
@@ -611,7 +611,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
 				}
 				else
 				{
-					printf(" (FPW%s); hole: offset: %u, length: %u\n",
+					printf(" (FPW%s); hole: offset: %u, length: %u",
 						   XLogRecBlockImageApply(record, block_id) ?
 						   "" : " for WAL verification",
 						   record->blocks[block_id].hole_offset,

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ XLogDumpDisplayRecord(XLogDumpConfig config, XLogReaderState record)`
`600`	`600`	`BKPIMAGE_IS_COMPRESSED)`
`601`	`601`	`{`
`602`	`602`	`printf(" (FPW%s); hole: offset: %u, length: %u, "`
`603`		`- "compression saved: %u\n",`
	`603`	`+ "compression saved: %u",`
`604`	`604`	`XLogRecBlockImageApply(record, block_id) ?`
`605`	`605`	`"" : " for WAL verification",`
`606`	`606`	`record->blocks[block_id].hole_offset,`
`@@ -611,7 +611,7 @@ XLogDumpDisplayRecord(XLogDumpConfig config, XLogReaderState record)`
`611`	`611`	`}`
`612`	`612`	`else`
`613`	`613`	`{`
`614`		`- printf(" (FPW%s); hole: offset: %u, length: %u\n",`
	`614`	`+ printf(" (FPW%s); hole: offset: %u, length: %u",`
`615`	`615`	`XLogRecBlockImageApply(record, block_id) ?`
`616`	`616`	`"" : " for WAL verification",`
`617`	`617`	`record->blocks[block_id].hole_offset,`