From d2b717d14638632c25d0e6919f5cd40333e9ebd0 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Sat, 23 Mar 2024 18:26:21 +0100 Subject: [PATCH v20240323-2 2/2] write_reconstructed_file --- src/bin/pg_combinebackup/reconstruct.c | 32 +++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c index f5c7af8a23c..4de92894bed 100644 --- a/src/bin/pg_combinebackup/reconstruct.c +++ b/src/bin/pg_combinebackup/reconstruct.c @@ -59,7 +59,8 @@ static void write_reconstructed_file(char *input_filename, off_t *offsetmap, pg_checksum_context *checksum_ctx, bool debug, - bool dry_run); + bool dry_run, + CopyMode copy_mode); static void read_bytes(rfile *rf, void *buffer, unsigned length); /* @@ -325,7 +326,8 @@ reconstruct_from_incremental_file(char *input_filename, { write_reconstructed_file(input_filename, output_filename, block_length, sourcemap, offsetmap, - &checksum_ctx, debug, dry_run); + &checksum_ctx, debug, dry_run, + copy_method); debug_reconstruction(n_prior_backups + 1, source, dry_run); } @@ -528,7 +530,8 @@ write_reconstructed_file(char *input_filename, off_t *offsetmap, pg_checksum_context *checksum_ctx, bool debug, - bool dry_run) + bool dry_run, + CopyMode copy_mode) { int wfd = -1; unsigned i; @@ -630,6 +633,29 @@ write_reconstructed_file(char *input_filename, if (dry_run) continue; + /* + * If requested, copy the block using copy_file_range. + * + * We can'd do this if the block needs to be zero-filled or when we + * need to update checksum. + */ + if ((copy_mode == COPY_MODE_COPY_FILE_RANGE) && + (s != NULL) && (checksum_ctx->type == CHECKSUM_TYPE_NONE)) + { +#if defined(HAVE_COPY_FILE_RANGE) + do + { + wb = copy_file_range(s->fd, &offsetmap[i], wfd, NULL, BLCKSZ, 0); + if (wb < 0) + pg_fatal("error while copying file range from \"%s\" to \"%s\": %m", + input_filename, output_filename); + } while (wb > 0); +#else + pg_fatal("copy_file_range not supported on this platform"); +#endif + continue; + } + /* Read or zero-fill the block as appropriate. */ if (s == NULL) { -- 2.44.0