NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit31156ce

committed

Fix oversights in pg_basebackup's -z (compression) option.

The short-form -z switch didn't work, for lack of telling getopt_longabout it; and even if specified long-form, it failed to do anything,because the various tests elsewhere in the file would takeZ_DEFAULT_COMPRESSION (which is -1) as meaning "don't compress".Per bug #6060 from Shigehiro Honda, though I editorialized on his patcha bit.

1 parent264a6b1 commit31156ceCopy full SHA for 31156ce

File tree

1 file changed

-7

lines changed

src/bin/pg_basebackup
- pg_basebackup.c

1 file changed

-7

lines changed

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

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`264`	`264`	`if (strcmp(basedir,"-")==0)`
`265`	`265`	`{`
`266`	`266`	`#ifdefHAVE_LIBZ`
`267`		`-if (compresslevel>0)`
	`267`	`+if (compresslevel!=0)`
`268`	`268`	`{`
`269`	`269`	`ztarfile=gzdopen(dup(fileno(stdout)),"wb");`
`270`	`270`	`if (gzsetparams(ztarfile,compresslevel,Z_DEFAULT_STRATEGY)!=Z_OK)`
`@@ -281,7 +281,7 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`281`	`281`	`else`
`282`	`282`	`{`
`283`	`283`	`#ifdefHAVE_LIBZ`
`284`		`-if (compresslevel>0)`
	`284`	`+if (compresslevel!=0)`
`285`	`285`	`{`
`286`	`286`	`snprintf(fn,sizeof(fn),"%s/base.tar.gz",basedir);`
`287`	`287`	`ztarfile=gzopen(fn,"wb");`
`@@ -305,7 +305,7 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`305`	`305`	`* Specific tablespace`
`306`	`306`	`*/`
`307`	`307`	`#ifdefHAVE_LIBZ`
`308`		`-if (compresslevel>0)`
	`308`	`+if (compresslevel!=0)`
`309`	`309`	`{`
`310`	`310`	`snprintf(fn,sizeof(fn),"%s/%s.tar.gz",basedir,PQgetvalue(res,rownum,0));`
`311`	`311`	`ztarfile=gzopen(fn,"wb");`
`@@ -325,7 +325,7 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`#ifdefHAVE_LIBZ`
`328`		`-if (compresslevel>0)`
	`328`	`+if (compresslevel!=0)`
`329`	`329`	`{`
`330`	`330`	`if (!ztarfile)`
`331`	`331`	`{`
`@@ -976,7 +976,7 @@ main(int argc, char **argv)`
`976`	`976`	`}`
`977`	`977`	`}`
`978`	`978`
`979`		`-while ((c=getopt_long(argc,argv,"D:F:l:Z:c:h:p:U:xwWvP",`
	`979`	`+while ((c=getopt_long(argc,argv,"D:F:xl:zZ:c:h:p:U:wWvP",`
`980`	`980`	`long_options,&option_index))!=-1)`
`981`	`981`	`{`
`982`	`982`	`switch (c)`
`@@ -1089,7 +1089,7 @@ main(int argc, char **argv)`
`1089`	`1089`	`/*`
`1090`	`1090`	`* Mutually exclusive arguments`
`1091`	`1091`	`*/`
`1092`		`-if (format=='p'&&compresslevel>0)`
	`1092`	`+if (format=='p'&&compresslevel!=0)`
`1093`	`1093`	`{`
`1094`	`1094`	`fprintf(stderr,`
`1095`	`1095`	`_("%s: only tar mode backups can be compressed\n"),`
`@@ -1100,7 +1100,7 @@ main(int argc, char **argv)`
`1100`	`1100`	`}`
`1101`	`1101`
`1102`	`1102`	`#ifndefHAVE_LIBZ`
`1103`		`-if (compresslevel>0)`
	`1103`	`+if (compresslevel!=0)`
`1104`	`1104`	`{`
`1105`	`1105`	`fprintf(stderr,`
`1106`	`1106`	`_("%s: this build does not support compression\n"),`

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!

Commit31156ce

File tree

1 file changed

1 file changed

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

0 commit comments