From ceb471eea3e688be51e7f167ff7b223072790050 Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Thu, 26 May 2016 18:28:14 +0900 Subject: [PATCH] Fix compressLevel correction for parallel mode Being compiled with --without-zlib, pg_dump unexpectedly fails to create an archive in parallel mode. This is because compressLevel is checked too late to be propagated to child workers. This patch moves it to earlier enough. --- src/bin/pg_dump/pg_backup_archiver.c | 8 -------- src/bin/pg_dump/pg_dump.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 9390a6b..5026027 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -3476,14 +3476,6 @@ WriteHead(ArchiveHandle *AH) (*AH->WriteBytePtr) (AH, AH->offSize); (*AH->WriteBytePtr) (AH, AH->format); -#ifndef HAVE_LIBZ - if (AH->compression != 0) - write_msg(modulename, "WARNING: requested compression not available in this " - "installation -- archive will be uncompressed\n"); - - AH->compression = 0; -#endif - WriteInt(AH, AH->compression); crtm = *localtime(&AH->createDate); diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 1267afb..45a62bd 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -594,6 +594,14 @@ main(int argc, char **argv) else compressLevel = 0; } +#ifndef HAVE_LIBZ + if (compressLevel != 0) + write_msg(NULL, "WARNING: requested compression (%d) not " + "available in this installation -- " + "archive will be uncompressed\n", + compressLevel); + compressLevel = 0; +#endif /* * On Windows we can only have at most MAXIMUM_WAIT_OBJECTS (= 64 usually) -- 1.8.3.1