NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitcae2bb1

committed

Make pg_dump behave more sanely when built without HAVE_LIBZ.

For some reason the code to emit a warning and switch to uncompressedoutput was placed down in the guts of pg_backup_archiver.c. This isdefinitely too late in the case of parallel operation (and I ratherwonder if it wasn't too late for other purposes as well). Put it inpg_dump.c's option-processing logic, which seems a much saner place.Also, the default behavior with custom or directory output format wasto emit the warning telling you the output would be uncompressed. Thisseems unhelpful, so silence that case.Back-patch to 9.3 where parallel dump was introduced.Kyotaro Horiguchi, adjusted a bit by meReport: <20160526.185551.242041780.horiguchi.kyotaro@lab.ntt.co.jp>

1 parentdf8d2d8 commitcae2bb1Copy full SHA for cae2bb1

File tree

2 files changed

-10

lines changed

src/bin/pg_dump
- pg_backup_archiver.c
- pg_dump.c

2 files changed

-10

lines changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -3475,17 +3475,7 @@ WriteHead(ArchiveHandle *AH)`
`3475`	`3475`	`(*AH->WriteBytePtr) (AH,AH->intSize);`
`3476`	`3476`	`(*AH->WriteBytePtr) (AH,AH->offSize);`
`3477`	`3477`	`(*AH->WriteBytePtr) (AH,AH->format);`
`3478`		`-`
`3479`		`-#ifndefHAVE_LIBZ`
`3480`		`-if (AH->compression!=0)`
`3481`		`-write_msg(modulename,"WARNING: requested compression not available in this "`
`3482`		`-"installation -- archive will be uncompressed\n");`
`3483`		`-`
`3484`		`-AH->compression=0;`
`3485`		`-#endif`
`3486`		`-`
`3487`	`3478`	`WriteInt(AH,AH->compression);`
`3488`		`-`
`3489`	`3479`	`crtm=*localtime(&AH->createDate);`
`3490`	`3480`	`WriteInt(AH,crtm.tm_sec);`
`3491`	`3481`	`WriteInt(AH,crtm.tm_min);`

`‎src/bin/pg_dump/pg_dump.c`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -589,12 +589,21 @@ main(int argc, char **argv)`
`589`	`589`	`/* Custom and directory formats are compressed by default, others not */`
`590`	`590`	`if (compressLevel == -1)`
`591`	`591`	`{`
	`592`	`+#ifdef HAVE_LIBZ`
`592`	`593`	`if (archiveFormat == archCustom \|\| archiveFormat == archDirectory)`
`593`	`594`	`compressLevel = Z_DEFAULT_COMPRESSION;`
`594`	`595`	`else`
	`596`	`+#endif`
`595`	`597`	`compressLevel = 0;`
`596`	`598`	`}`
`597`	`599`
	`600`	`+#ifndef HAVE_LIBZ`
	`601`	`+if (compressLevel != 0)`
	`602`	`+write_msg(NULL, "WARNING: requested compression not available in this "`
	`603`	`+ "installation -- archive will be uncompressed\n");`
	`604`	`+compressLevel = 0;`
	`605`	`+#endif`
	`606`	`+`
`598`	`607`	`/*`
`599`	`608`	`* On Windows we can only have at most MAXIMUM_WAIT_OBJECTS (= 64 usually)`
`600`	`609`	`* parallel jobs because that's the maximum limit for the`

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!

Commitcae2bb1

File tree

2 files changed

2 files changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

`‎src/bin/pg_dump/pg_dump.c`

0 commit comments