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

tglsfdc · tglsfdc · commit 31156ce8b95c · 2011-06-15T13:15:05.000-04:00
The short-form -z switch didn't work, for lack of telling getopt_long
about it; and even if specified long-form, it failed to do anything,
because the various tests elsewhere in the file would take
Z_DEFAULT_COMPRESSION (which is -1) as meaning "don't compress".

Per bug #6060 from Shigehiro Honda, though I editorialized on his patch
a bit.
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -264,7 +264,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		if (strcmp(basedir, "-") == 0)
 		{
 #ifdef HAVE_LIBZ
-			if (compresslevel > 0)
+			if (compresslevel != 0)
 			{
 				ztarfile = gzdopen(dup(fileno(stdout)), "wb");
 				if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
@@ -281,7 +281,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		else
 		{
 #ifdef HAVE_LIBZ
-			if (compresslevel > 0)
+			if (compresslevel != 0)
 			{
 				snprintf(fn, sizeof(fn), "%s/base.tar.gz", basedir);
 				ztarfile = gzopen(fn, "wb");
@@ -305,7 +305,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		 * Specific tablespace
 		 */
 #ifdef HAVE_LIBZ
-		if (compresslevel > 0)
+		if (compresslevel != 0)
 		{
 			snprintf(fn, sizeof(fn), "%s/%s.tar.gz", basedir, PQgetvalue(res, rownum, 0));
 			ztarfile = gzopen(fn, "wb");
@@ -325,7 +325,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 	}
 
 #ifdef HAVE_LIBZ
-	if (compresslevel > 0)
+	if (compresslevel != 0)
 	{
 		if (!ztarfile)
 		{
@@ -976,7 +976,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "D:F:l:Z:c:h:p:U:xwWvP",
+	while ((c = getopt_long(argc, argv, "D:F:xl:zZ:c:h:p:U:wWvP",
 							long_options, &option_index)) != -1)
 	{
 		switch (c)
@@ -1089,7 +1089,7 @@ main(int argc, char **argv)
 	/*
 	 * Mutually exclusive arguments
 	 */
-	if (format == 'p' && compresslevel > 0)
+	if (format == 'p' && compresslevel != 0)
 	{
 		fprintf(stderr,
 				_("%s: only tar mode backups can be compressed\n"),
@@ -1100,7 +1100,7 @@ main(int argc, char **argv)
 	}
 
 #ifndef HAVE_LIBZ
-	if (compresslevel > 0)
+	if (compresslevel != 0)
 	{
 		fprintf(stderr,
 				_("%s: this build does not support compression\n"),

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`	`#ifdef HAVE_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`	`#ifdef HAVE_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`	`#ifdef HAVE_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`	`#ifdef HAVE_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`	`#ifndef HAVE_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"),`