rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make size-output fixed length in pg_basebackup verbose mode 

This way the line doesn't shift right as the amount of data processed
increases.
This commit is contained in:
Magnus Hagander 2013-01-17 14:43:33 +01:00
parent d7e9ca7ff7
commit 4eebf1309f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -432,9 +432,10 @@ progress_report(int tablespacenum, const char *filename)
* call)
*/
fprintf(stderr,
ngettext("%s/%s kB (100%%), %d/%d tablespace %*s",
"%s/%s kB (100%%), %d/%d tablespaces %*s",
ngettext("%*s/%s kB (100%%), %d/%d tablespace %*s",
"%*s/%s kB (100%%), %d/%d tablespaces %*s",
tablespacecount),
strlen(totalsize_str),
totaldone_str, totalsize_str,
tablespacenum, tablespacecount,
VERBOSE_FILENAME_LENGTH + 5, "");
@ -443,9 +444,10 @@ progress_report(int tablespacenum, const char *filename)
bool truncate = (strlen(filename) > VERBOSE_FILENAME_LENGTH);
fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)",
"%s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)",
ngettext("%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)",
"%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)",
tablespacecount),
strlen(totalsize_str),
totaldone_str, totalsize_str, percent,
tablespacenum, tablespacecount,
/* Prefix with "..." if we do leading truncation */
@ -458,9 +460,10 @@ progress_report(int tablespacenum, const char *filename)
}
else
fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace",
"%s/%s kB (%d%%), %d/%d tablespaces",
ngettext("%*s/%s kB (%d%%), %d/%d tablespace",
"%*s/%s kB (%d%%), %d/%d tablespaces",
tablespacecount),
strlen(totalsize_str),
totaldone_str, totalsize_str, percent,
tablespacenum, tablespacecount);