From a297985e7b7815f7bda545a50b05b19877b01cea Mon Sep 17 00:00:00 2001 From: Amul Sul Date: Wed, 14 Aug 2024 15:14:15 +0530 Subject: [PATCH v11 07/12] Refactor: split verify_file_checksum() function. Move the core functionality of verify_file_checksum to a new function to reuse it instead of duplicating the code. The verify_file_checksum() function is designed to take a file path, open and read the file contents, and then calculate the checksum. However, for TAR backups, instead of a file path, we receive the file content in chunks, and the checksum needs to be calculated incrementally. While the initial operations for plain and TAR backup checksum calculations differ, the final checks and error handling are the same. By moving the shared logic to a separate function, we can reuse the code for both types of backups. --- src/bin/pg_verifybackup/pg_verifybackup.c | 20 +++++++++++++++++--- src/bin/pg_verifybackup/pg_verifybackup.h | 3 +++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index 5bfc98e7874..e44d0377cd5 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -792,8 +792,6 @@ verify_file_checksum(verifier_context *context, manifest_file *m, int fd; int rc; size_t bytes_read = 0; - uint8 checksumbuf[PG_CHECKSUM_MAX_LENGTH]; - int checksumlen; /* Open the target file. */ if ((fd = open(fullpath, O_RDONLY | PG_BINARY, 0)) < 0) @@ -844,6 +842,22 @@ verify_file_checksum(verifier_context *context, manifest_file *m, if (rc < 0) return; + /* Do the final computation and verification. */ + verify_checksum(context, m, &checksum_ctx, bytes_read); +} + +/* + * A helper function to finalize checksum computation and verify it against the + * backup manifest information. + */ +void +verify_checksum(verifier_context *context, manifest_file *m, + pg_checksum_context *checksum_ctx, int64 bytes_read) +{ + const char *relpath = m->pathname; + int checksumlen; + uint8 checksumbuf[PG_CHECKSUM_MAX_LENGTH]; + /* * Double-check that we read the expected number of bytes from the file. * Normally, a file size mismatch would be caught in verify_manifest_entry @@ -860,7 +874,7 @@ verify_file_checksum(verifier_context *context, manifest_file *m, } /* Get the final checksum. */ - checksumlen = pg_checksum_final(&checksum_ctx, checksumbuf); + checksumlen = pg_checksum_final(checksum_ctx, checksumbuf); if (checksumlen < 0) { report_backup_error(context, diff --git a/src/bin/pg_verifybackup/pg_verifybackup.h b/src/bin/pg_verifybackup/pg_verifybackup.h index ff9476e356e..fe0ce8a89aa 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.h +++ b/src/bin/pg_verifybackup/pg_verifybackup.h @@ -96,6 +96,9 @@ typedef struct verifier_context extern manifest_file *verify_manifest_entry(verifier_context *context, char *relpath, int64 filesize); +extern void verify_checksum(verifier_context *context, manifest_file *m, + pg_checksum_context *checksum_ctx, + int64 bytes_read); extern void report_backup_error(verifier_context *context, const char *pg_restrict fmt,...) -- 2.18.0