From 21ff17540d217b601426bf6f71aba5ea74d0d1f0 Mon Sep 17 00:00:00 2001 From: Maxim Orlov Date: Fri, 14 Jun 2024 15:09:44 +0300 Subject: [PATCH v1 1/3] Get rid of misleading xid arg name in multixact. Using 'xid' argument name in macro functions was misleading. Switch to the proper 'multi' and 'offset' names. Author: Maxim Orlov Reviewed-by: ... Discussions: https://www.postgresql.org/message-id/ff143b24-a093-40da-9833-d36b83726bdf%40iki.fi --- src/backend/access/transam/multixact.c | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 54c916e034..3c76cc797c 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -108,11 +108,11 @@ /* We need four bytes per offset */ #define MULTIXACT_OFFSETS_PER_PAGE (BLCKSZ / sizeof(MultiXactOffset)) -#define MultiXactIdToOffsetPage(xid) \ - ((xid) / (MultiXactOffset) MULTIXACT_OFFSETS_PER_PAGE) -#define MultiXactIdToOffsetEntry(xid) \ - ((xid) % (MultiXactOffset) MULTIXACT_OFFSETS_PER_PAGE) -#define MultiXactIdToOffsetSegment(xid) (MultiXactIdToOffsetPage(xid) / SLRU_PAGES_PER_SEGMENT) +#define MultiXactIdToOffsetPage(multi) \ + ((multi) / (MultiXactOffset) MULTIXACT_OFFSETS_PER_PAGE) +#define MultiXactIdToOffsetEntry(multi) \ + ((multi) % (MultiXactOffset) MULTIXACT_OFFSETS_PER_PAGE) +#define MultiXactIdToOffsetSegment(multi) (MultiXactIdToOffsetPage(multi) / SLRU_PAGES_PER_SEGMENT) /* * The situation for members is a bit more complex: we store one byte of @@ -156,30 +156,30 @@ ((uint32) ((0xFFFFFFFF % MULTIXACT_MEMBERS_PER_PAGE) + 1)) /* page in which a member is to be found */ -#define MXOffsetToMemberPage(xid) ((xid) / (TransactionId) MULTIXACT_MEMBERS_PER_PAGE) -#define MXOffsetToMemberSegment(xid) (MXOffsetToMemberPage(xid) / SLRU_PAGES_PER_SEGMENT) +#define MXOffsetToMemberPage(offset) ((offset) / (TransactionId) MULTIXACT_MEMBERS_PER_PAGE) +#define MXOffsetToMemberSegment(offset) (MXOffsetToMemberPage(offset) / SLRU_PAGES_PER_SEGMENT) /* Location (byte offset within page) of flag word for a given member */ -#define MXOffsetToFlagsOffset(xid) \ - ((((xid) / (TransactionId) MULTIXACT_MEMBERS_PER_MEMBERGROUP) % \ +#define MXOffsetToFlagsOffset(offset) \ + ((((offset) / (TransactionId) MULTIXACT_MEMBERS_PER_MEMBERGROUP) % \ (TransactionId) MULTIXACT_MEMBERGROUPS_PER_PAGE) * \ (TransactionId) MULTIXACT_MEMBERGROUP_SIZE) -#define MXOffsetToFlagsBitShift(xid) \ - (((xid) % (TransactionId) MULTIXACT_MEMBERS_PER_MEMBERGROUP) * \ +#define MXOffsetToFlagsBitShift(offset) \ + (((offset) % (TransactionId) MULTIXACT_MEMBERS_PER_MEMBERGROUP) * \ MXACT_MEMBER_BITS_PER_XACT) /* Location (byte offset within page) of TransactionId of given member */ -#define MXOffsetToMemberOffset(xid) \ - (MXOffsetToFlagsOffset(xid) + MULTIXACT_FLAGBYTES_PER_GROUP + \ - ((xid) % MULTIXACT_MEMBERS_PER_MEMBERGROUP) * sizeof(TransactionId)) +#define MXOffsetToMemberOffset(offset) \ + (MXOffsetToFlagsOffset(offset) + MULTIXACT_FLAGBYTES_PER_GROUP + \ + ((offset) % MULTIXACT_MEMBERS_PER_MEMBERGROUP) * sizeof(TransactionId)) /* Multixact members wraparound thresholds. */ #define MULTIXACT_MEMBER_SAFE_THRESHOLD (MaxMultiXactOffset / 2) #define MULTIXACT_MEMBER_DANGER_THRESHOLD \ (MaxMultiXactOffset - MaxMultiXactOffset / 4) -#define PreviousMultiXactId(xid) \ - ((xid) == FirstMultiXactId ? MaxMultiXactId : (xid) - 1) +#define PreviousMultiXactId(multi) \ + ((multi) == FirstMultiXactId ? MaxMultiXactId : (multi) - 1) /* * Links to shared-memory data structures for MultiXact control -- 2.44.0