git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Amit Kapila <akapila@postgresql.org>

2021年11月24日 02:36:55 +0000 (08:06 +0530)

committer Amit Kapila <akapila@postgresql.org>

2021年11月24日 02:39:00 +0000 (08:09 +0530)

Same macro names for SnapBuildOnDiskNotChecksummedSize and
SnapBuildOnDiskChecksummedSize are being used in slot.c and snapbuild.c.
This patch renames them, in slot.c, to
ReplicationSlotOnDiskNotChecksummedSize and
ReplicationSlotOnDiskChecksummedSize similar to the other macros. This
makes all macro names look consistent in slot.c.

Author: Bharath Rupireddy
Discussion: https://postgr.es/m/CALj2ACVZo-piDGzBOJRY4ob=_goFR6t9DhZMDMjJWN7LQs34Aw@mail.gmail.com

src/backend/replication/slot.c patch | blob | blame | history

diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c

index e4f5c6fb362c69081eaa88ddda0afb48dec90a15..90ba9b417df77d7b03d6fb3bdda4577a83ff9586 100644 (file)

--- a/src/backend/replication/slot.c

+++ b/src/backend/replication/slot.c

@@ -77,11 +77,11 @@ typedef struct ReplicationSlotOnDisk

#define ReplicationSlotOnDiskConstantSize \

offsetof(ReplicationSlotOnDisk, slotdata)

/* size of the part of the slot not covered by the checksum */

-#define SnapBuildOnDiskNotChecksummedSize \

+#define ReplicationSlotOnDiskNotChecksummedSize \

offsetof(ReplicationSlotOnDisk, version)

/* size of the part covered by the checksum */

-#define SnapBuildOnDiskChecksummedSize \

- sizeof(ReplicationSlotOnDisk) - SnapBuildOnDiskNotChecksummedSize

+#define ReplicationSlotOnDiskChecksummedSize \

+ sizeof(ReplicationSlotOnDisk) - ReplicationSlotOnDiskNotChecksummedSize

/* size of the slot data that is version dependent */

#define ReplicationSlotOnDiskV2Size \

sizeof(ReplicationSlotOnDisk) - ReplicationSlotOnDiskConstantSize

@@ -1571,8 +1571,8 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)

SpinLockRelease(&slot->mutex);

COMP_CRC32C(cp.checksum,

- (char *) (&cp) + SnapBuildOnDiskNotChecksummedSize,

- SnapBuildOnDiskChecksummedSize);

+ (char *) (&cp) + ReplicationSlotOnDiskNotChecksummedSize,

+ ReplicationSlotOnDiskChecksummedSize);

FIN_CRC32C(cp.checksum);

errno = 0;

@@ -1787,8 +1787,8 @@ RestoreSlotFromDisk(const char *name)

/* now verify the CRC */

INIT_CRC32C(checksum);

COMP_CRC32C(checksum,

- (char *) &cp + SnapBuildOnDiskNotChecksummedSize,

- SnapBuildOnDiskChecksummedSize);

+ (char *) &cp + ReplicationSlotOnDiskNotChecksummedSize,

+ ReplicationSlotOnDiskChecksummedSize);

FIN_CRC32C(checksum);

if (!EQ_CRC32C(checksum, cp.checksum))

This is the main PostgreSQL git repository.

RSS Atom