aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2019-10-29 22:46:40 -0700
committerAndres Freund <andres@anarazel.de>2019-10-29 22:53:30 -0700
commitd4b5206b22374ddf99dbe31370d6d713881fb87c (patch)
tree7c43f4bd20e33fe3a0cb0d40e0d5f5d321db79f5
parent4ab353c477e6f585973b171a2652551574cbbc45 (diff)
downloadpostgresql-d4b5206b22374ddf99dbe31370d6d713881fb87c.tar.gz
postgresql-d4b5206b22374ddf99dbe31370d6d713881fb87c.zip
pg_waldump: Fix --bkp-details to not issue spurious newlines for FPWs.
The additional newline seems to have accidentally been introduced in 2c03216d831, 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 2c03216d831.
-rw-r--r--src/bin/pg_waldump/pg_waldump.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 28839d76e15..41dc6fc864a 100644
--- 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,