Commit0885390

committed

pg_waldump: Add test case for notice message

Add a test case for the "first record is after" message. Also, thismessage should really go to stderr, so change to use pg_log_info.Reviewed-by: Tristen Raab <tristen.raab@highgo.ca>Discussion:https://www.postgresql.org/message-id/flat/CAAcByaKM7zyJSDkPWv6_%2BapupY4fXXM3q3SRXas9MMNVPUGcsQ%40mail.gmail.com

1 parent96063e2 commit0885390Copy full SHA for 0885390

File tree

+25

-6

lines changed

+25

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1220,12 +1220,12 @@ main(int argc, char **argv)`
`1220`	`1220`	`*/`
`1221`	`1221`	`if (first_record!=private.startptr&&`
`1222`	`1222`	`XLogSegmentOffset(private.startptr,WalSegSz)!=0)`
`1223`		`-printf(ngettext("first record is after %X/%X, at %X/%X, skipping over %u byte\n",`
`1224`		`-"first record is after %X/%X, at %X/%X, skipping over %u bytes\n",`
`1225`		`-(first_record-private.startptr)),`
`1226`		`-LSN_FORMAT_ARGS(private.startptr),`
`1227`		`-LSN_FORMAT_ARGS(first_record),`
`1228`		`-(uint32) (first_record-private.startptr));`
	`1223`	`+pg_log_info(ngettext("first record is after %X/%X, at %X/%X, skipping over %u byte",`
	`1224`	`+"first record is after %X/%X, at %X/%X, skipping over %u bytes",`
	`1225`	`+(first_record-private.startptr)),`
	`1226`	`+LSN_FORMAT_ARGS(private.startptr),`
	`1227`	`+LSN_FORMAT_ARGS(first_record),`
	`1228`	`+(uint32) (first_record-private.startptr));`
`1229`	`1229`
`1230`	`1230`	`if (config.stats== true&& !config.quiet)`
`1231`	`1231`	`stats.startptr=first_record;`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,25 @@`
`153`	`153`	`command_fails_like(['pg_waldump','--quiet','-p',$node->data_dir,'--start',$start_lsn ],qr/error: error in WAL record at/,'errors are shown with --quiet');`
`154`	`154`
`155`	`155`
	`156`	+# Test for: Display a message that we're skipping data if `from`
	`157`	`+# wasn't a pointer to the start of a record.`
	`158`	`+{`
	`159`	`+# Construct a new LSN that is one byte past the original`
	`160`	`+# start_lsn.`
	`161`	`+my ($part1,$part2) =splitqr{/},$start_lsn;`
	`162`	`+my$lsn2 =hex$part2;`
	`163`	`+$lsn2++;`
	`164`	`+my$new_start =sprintf("%s/%X",$part1,$lsn2);`
	`165`	`+`
	`166`	`+my (@cmd,$stdout,$stderr,$result);`
	`167`	`+`
	`168`	`+@cmd = ('pg_waldump','--start',$new_start,$node->data_dir .'/pg_wal/' .$start_walfile );`
	`169`	`+$result = IPC::Run::run \@cmd,'>', \$stdout,'2>', \$stderr;`
	`170`	`+ok($result,"runs with start segment and start LSN specified");`
	`171`	`+like($stderr,qr/first record is after/,'info message printed');`
	`172`	`+}`
	`173`	`+`
	`174`	`+`
`156`	`175`	`# Helper function to test various options. Pass options as arguments.`
`157`	`176`	`# Output lines are returned as array.`
`158`	`177`	`subtest_pg_waldump`

Comments

(0)