NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4eebf13

committed

Make size-output fixed length in pg_basebackup verbose mode

This way the line doesn't shift right as the amount of data processedincreases.

1 parentd7e9ca7 commit4eebf13Copy full SHA for 4eebf13

File tree

1 file changed

-6

lines changed

src/bin/pg_basebackup
- pg_basebackup.c

1 file changed

-6

lines changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -432,9 +432,10 @@ progress_report(int tablespacenum, const char *filename)`
`432`	`432`	`* call)`
`433`	`433`	`*/`
`434`	`434`	`fprintf(stderr,`
`435`		`-ngettext("%s/%s kB (100%%), %d/%d tablespace %*s",`
`436`		`-"%s/%s kB (100%%), %d/%d tablespaces %*s",`
	`435`	`+ngettext("%s/%s kB (100%%), %d/%d tablespace %s",`
	`436`	`+"%s/%s kB (100%%), %d/%d tablespaces %s",`
`437`	`437`	`tablespacecount),`
	`438`	`+strlen(totalsize_str),`
`438`	`439`	`totaldone_str,totalsize_str,`
`439`	`440`	`tablespacenum,tablespacecount,`
`440`	`441`	`VERBOSE_FILENAME_LENGTH+5,"");`
`@@ -443,9 +444,10 @@ progress_report(int tablespacenum, const char *filename)`
`443`	`444`	`booltruncate= (strlen(filename)>VERBOSE_FILENAME_LENGTH);`
`444`	`445`
`445`	`446`	`fprintf(stderr,`
`446`		`-ngettext("%s/%s kB (%d%%), %d/%d tablespace (%s%-.s)",`
`447`		`-"%s/%s kB (%d%%), %d/%d tablespaces (%s%-.s)",`
	`447`	`+ngettext("%s/%s kB (%d%%), %d/%d tablespace (%s%-.*s)",`
	`448`	`+"%s/%s kB (%d%%), %d/%d tablespaces (%s%-.*s)",`
`448`	`449`	`tablespacecount),`
	`450`	`+strlen(totalsize_str),`
`449`	`451`	`totaldone_str,totalsize_str,percent,`
`450`	`452`	`tablespacenum,tablespacecount,`
`451`	`453`	`/* Prefix with "..." if we do leading truncation */`
`@@ -458,9 +460,10 @@ progress_report(int tablespacenum, const char *filename)`
`458`	`460`	`}`
`459`	`461`	`else`
`460`	`462`	`fprintf(stderr,`
`461`		`-ngettext("%s/%s kB (%d%%), %d/%d tablespace",`
`462`		`-"%s/%s kB (%d%%), %d/%d tablespaces",`
	`463`	`+ngettext("%*s/%s kB (%d%%), %d/%d tablespace",`
	`464`	`+"%*s/%s kB (%d%%), %d/%d tablespaces",`
`463`	`465`	`tablespacecount),`
	`466`	`+strlen(totalsize_str),`
`464`	`467`	`totaldone_str,totalsize_str,percent,`
`465`	`468`	`tablespacenum,tablespacecount);`
`466`	`469`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4eebf13

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

0 commit comments