db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-04-19 11:52:32 +02:00
Code Issues Releases Activity

Allow const checksum buffers to be returned from backupFile().

Browse Source 
This allows less duplication of buffers.

For delta check return file->pgFileSize/file->pgFileChecksum instead of pgTestSize/pgTestChecksum since this saves one buffer duplication and we know these values are equal since we just checked them.

Also add an assert to ensure copyChecksum is valid relative to size.
This commit is contained in:
David Steele 2023-12-22 12:48:01 -03:00
parent 4f760df417
commit c8795094d4
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/xml/release/2024/2.50.xml
View File

@ -38,7 +38,10 @@
</release-item>
<release-item>
<github-pull-request id="2227"/>
<commit subject="Skip files truncated during backup when bundling.">
<github-pull-request id="2227"/>
</commit>
<commit subject="Allow const checksum buffers to be returned from backupFile()."/>
<release-item-contributor-list>
<release-item-contributor id="georgy.shelkovy"/>

6
src/command/backup/file.c
View File

@ -115,8 +115,8 @@ backupFile(
MEM_CONTEXT_BEGIN(lstMemContext(result))
{
fileResult->backupCopyResult = backupCopyResultNoOp;
fileResult->copySize = pgTestSize;
fileResult->copyChecksum = bufDup(pgTestChecksum);
fileResult->copySize = file->pgFileSize;
fileResult->copyChecksum = file->pgFileChecksum;
}
MEM_CONTEXT_END();
}
@ -164,7 +164,7 @@ backupFile(
{
fileResult->backupCopyResult = backupCopyResultChecksum;
fileResult->copySize = file->pgFileSize;
fileResult->copyChecksum = bufDup(file->pgFileChecksum);
fileResult->copyChecksum = file->pgFileChecksum;
}
MEM_CONTEXT_END();
}

4
src/command/backup/file.h
View File

@ -54,8 +54,8 @@ typedef struct BackupFileResult
BackupCopyResult backupCopyResult;
bool repoInvalid; // File was recopied because repo file was invalid
uint64_t copySize;
Buffer *copyChecksum;
Buffer *repoChecksum; // Checksum repo file (including compression, etc.)
const Buffer *copyChecksum; // Checksum of pg file
const Buffer *repoChecksum; // Checksum of repo file (including compression, etc.)
uint64_t bundleOffset; // Offset in bundle if any
uint64_t repoSize;
uint64_t blockIncrMapSize; // Size of block incremental map (0 if no map)

5
src/command/backup/protocol.c
View File

@ -5,6 +5,7 @@ Backup Protocol Handler
#include "command/backup/file.h"
#include "command/backup/protocol.h"
#include "common/crypto/hash.h"
#include "common/debug.h"
#include "common/io/io.h"
#include "common/log.h"
@ -88,6 +89,10 @@ backupFileProtocol(PackRead *const param, ProtocolServer *const server)
{
const BackupFileResult *const fileResult = lstGet(result, resultIdx);
ASSERT(
fileResult->backupCopyResult == backupCopyResultSkip || fileResult->copySize != 0 ||
bufEq(fileResult->copyChecksum, HASH_TYPE_SHA1_ZERO_BUF));
pckWriteStrP(resultPack, fileResult->manifestFile);
pckWriteU32P(resultPack, fileResult->backupCopyResult);
pckWriteBoolP(resultPack, fileResult->repoInvalid);