NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit079d94a

committed

Check HAVE_COPY_FILE_RANGE before calling copy_file_range

Fix a mistake inac81101 - write_reconstructed_file() calledcopy_file_range() without properly checking HAVE_COPY_FILE_RANGE.Reported by several macOS machines. Also reported by cfbot, but I missedthat issue before commit.

1 parentac81101 commit079d94aCopy full SHA for 079d94a

File tree

1 file changed

-0

lines changed

src/bin/pg_combinebackup
- reconstruct.c

1 file changed

-0

lines changed

`‎src/bin/pg_combinebackup/reconstruct.c`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,7 @@ write_reconstructed_file(char *input_filename,`
`672`	`672`	`}`
`673`	`673`	`else/* use copy_file_range */`
`674`	`674`	`{`
	`675`	`+#if defined(HAVE_COPY_FILE_RANGE)`
`675`	`676`	`/* copy_file_range modifies the offset, so use a local copy */`
`676`	`677`	`off_toff=offsetmap[i];`
`677`	`678`	`size_tnwritten=0;`
`@@ -706,6 +707,9 @@ write_reconstructed_file(char *input_filename,`
`706`	`707`	`if (pg_checksum_update(checksum_ctx,buffer,BLCKSZ)<0)`
`707`	`708`	`pg_fatal("could not update checksum of file \"%s\"",`
`708`	`709`	`output_filename);`
	`710`	`+#else`
	`711`	`+pg_fatal("copy_file_range not supported on this platform");`
	`712`	`+#endif`
`709`	`713`	`}`
`710`	`714`	`}`
`711`	`715`

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!

Commit079d94a

File tree

1 file changed

1 file changed

`‎src/bin/pg_combinebackup/reconstruct.c`

0 commit comments