postgrespro.git / summary / log / commit / refs

commit    e4d92126fda1defd9be201b97b162d1568122064
Author:   Andres Freund <andres@anarazel.de>
Date:     Wed Oct 30 05:46:40 2019 +0000

    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.


 src/bin/pg_waldump/pg_waldump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 102c7d45a6..8e4bff6aa3 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -584,7 +584,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,
@@ -595,7 +595,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,


[parent: e0f76f204ccb]