Skip to content

Commit 035ce1f

Browse files
petergeogheganpetergeoghegan
committed
Harmonize reorderbuffer parameter names.
Make reorderbuffer.h function declarations consistently use named parameters. Also make sure that the declarations use names that match corresponding names from function definitions in reorderbuffer.c. This makes the definitions easier to follow, especially in the case of functions that happen to have adjoining arguments of the same type. This patch was written with help from clang-tidy. Specifically, its "readability-inconsistent-declaration-parameter-name" check and its "readability-named-parameter" check were used. Author: Peter Geoghegan <pg@bowt.ie> Discussion: https://postgr.es/m/3955318.1663377656@sss.pgh.pa.us
1 parent 4274dc2 commit 035ce1f

File tree

2 files changed

+43
-35
lines changed

2 files changed

+43
-35
lines changed

‎src/backend/replication/logical/reorderbuffer.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static void ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *tx
250250
static Size ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn,
251251
TXNEntryFile *file, XLogSegNo *segno);
252252
static void ReorderBufferRestoreChange(ReorderBuffer *rb, ReorderBufferTXN *txn,
253-
char *change);
253+
char *data);
254254
static void ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn);
255255
static void ReorderBufferTruncateTXN(ReorderBuffer *rb, ReorderBufferTXN *txn,
256256
bool txn_prepared);
@@ -820,7 +820,7 @@ ReorderBufferQueueChange(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn,
820820
*/
821821
void
822822
ReorderBufferQueueMessage(ReorderBuffer *rb, TransactionId xid,
823-
Snapshot snapshot, XLogRecPtr lsn,
823+
Snapshot snap, XLogRecPtr lsn,
824824
bool transactional, const char *prefix,
825825
Size message_size, const char *message)
826826
{
@@ -847,7 +847,7 @@ ReorderBufferQueueMessage(ReorderBuffer *rb, TransactionId xid,
847847
else
848848
{
849849
ReorderBufferTXN *txn = NULL;
850-
volatile Snapshot snapshot_now = snapshot;
850+
volatile Snapshot snapshot_now = snap;
851851

852852
if (xid != InvalidTransactionId)
853853
txn = ReorderBufferTXNByXid(rb, xid, true, NULL, lsn, true);

‎src/include/replication/reorderbuffer.h‎

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -630,23 +630,27 @@ struct ReorderBuffer
630630

631631

632632
extern ReorderBuffer *ReorderBufferAllocate(void);
633-
extern void ReorderBufferFree(ReorderBuffer *);
633+
extern void ReorderBufferFree(ReorderBuffer *rb);
634634

635-
extern ReorderBufferTupleBuf *ReorderBufferGetTupleBuf(ReorderBuffer *, Size tuple_len);
636-
extern void ReorderBufferReturnTupleBuf(ReorderBuffer *, ReorderBufferTupleBuf *tuple);
637-
extern ReorderBufferChange *ReorderBufferGetChange(ReorderBuffer *);
638-
extern void ReorderBufferReturnChange(ReorderBuffer *, ReorderBufferChange *, bool);
635+
extern ReorderBufferTupleBuf *ReorderBufferGetTupleBuf(ReorderBuffer *rb,
636+
Size tuple_len);
637+
extern void ReorderBufferReturnTupleBuf(ReorderBuffer *rb,
638+
ReorderBufferTupleBuf *tuple);
639+
extern ReorderBufferChange *ReorderBufferGetChange(ReorderBuffer *rb);
640+
extern void ReorderBufferReturnChange(ReorderBuffer *rb,
641+
ReorderBufferChange *change, bool upd_mem);
639642

640-
extern Oid *ReorderBufferGetRelids(ReorderBuffer *, int nrelids);
641-
extern void ReorderBufferReturnRelids(ReorderBuffer *, Oid *relids);
643+
extern Oid *ReorderBufferGetRelids(ReorderBuffer *rb, int nrelids);
644+
extern void ReorderBufferReturnRelids(ReorderBuffer *rb, Oid *relids);
642645

643-
extern void ReorderBufferQueueChange(ReorderBuffer *, TransactionId,
644-
XLogRecPtr lsn, ReorderBufferChange *,
646+
extern void ReorderBufferQueueChange(ReorderBuffer *rb, TransactionId xid,
647+
XLogRecPtr lsn, ReorderBufferChange *change,
645648
bool toast_insert);
646-
extern void ReorderBufferQueueMessage(ReorderBuffer *, TransactionId, Snapshot snapshot, XLogRecPtr lsn,
649+
extern void ReorderBufferQueueMessage(ReorderBuffer *rb, TransactionId xid,
650+
Snapshot snap, XLogRecPtr lsn,
647651
bool transactional, const char *prefix,
648652
Size message_size, const char *message);
649-
extern void ReorderBufferCommit(ReorderBuffer *, TransactionId,
653+
extern void ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
650654
XLogRecPtr commit_lsn, XLogRecPtr end_lsn,
651655
TimestampTz commit_time, RepOriginId origin_id, XLogRecPtr origin_lsn);
652656
extern void ReorderBufferFinishPrepared(ReorderBuffer *rb, TransactionId xid,
@@ -655,42 +659,46 @@ extern void ReorderBufferFinishPrepared(ReorderBuffer *rb, TransactionId xid,
655659
TimestampTz commit_time,
656660
RepOriginId origin_id, XLogRecPtr origin_lsn,
657661
char *gid, bool is_commit);
658-
extern void ReorderBufferAssignChild(ReorderBuffer *, TransactionId, TransactionId, XLogRecPtr commit_lsn);
659-
extern void ReorderBufferCommitChild(ReorderBuffer *, TransactionId, TransactionId,
662+
extern void ReorderBufferAssignChild(ReorderBuffer *rb, TransactionId xid,
663+
TransactionId subxid, XLogRecPtr lsn);
664+
extern void ReorderBufferCommitChild(ReorderBuffer *rb, TransactionId, TransactionId,
660665
XLogRecPtr commit_lsn, XLogRecPtr end_lsn);
661-
extern void ReorderBufferAbort(ReorderBuffer *, TransactionId, XLogRecPtr lsn);
662-
extern void ReorderBufferAbortOld(ReorderBuffer *, TransactionId xid);
663-
extern void ReorderBufferForget(ReorderBuffer *, TransactionId, XLogRecPtr lsn);
664-
extern void ReorderBufferInvalidate(ReorderBuffer *, TransactionId, XLogRecPtr lsn);
665-
666-
extern void ReorderBufferSetBaseSnapshot(ReorderBuffer *, TransactionId, XLogRecPtr lsn, struct SnapshotData *snap);
667-
extern void ReorderBufferAddSnapshot(ReorderBuffer *, TransactionId, XLogRecPtr lsn, struct SnapshotData *snap);
668-
extern void ReorderBufferAddNewCommandId(ReorderBuffer *, TransactionId, XLogRecPtr lsn,
669-
CommandId cid);
670-
extern void ReorderBufferAddNewTupleCids(ReorderBuffer *, TransactionId, XLogRecPtr lsn,
671-
RelFileLocator locator, ItemPointerData pt,
666+
extern void ReorderBufferAbort(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn);
667+
extern void ReorderBufferAbortOld(ReorderBuffer *rb, TransactionId oldestRunningXid);
668+
extern void ReorderBufferForget(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn);
669+
extern void ReorderBufferInvalidate(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn);
670+
671+
extern void ReorderBufferSetBaseSnapshot(ReorderBuffer *rb, TransactionId xid,
672+
XLogRecPtr lsn, Snapshot snap);
673+
extern void ReorderBufferAddSnapshot(ReorderBuffer *rb, TransactionId xid,
674+
XLogRecPtr lsn, Snapshot snap);
675+
extern void ReorderBufferAddNewCommandId(ReorderBuffer *rb, TransactionId xid,
676+
XLogRecPtr lsn, CommandId cid);
677+
extern void ReorderBufferAddNewTupleCids(ReorderBuffer *rb, TransactionId xid,
678+
XLogRecPtr lsn, RelFileLocator locator,
679+
ItemPointerData tid,
672680
CommandId cmin, CommandId cmax, CommandId combocid);
673-
extern void ReorderBufferAddInvalidations(ReorderBuffer *, TransactionId, XLogRecPtr lsn,
681+
extern void ReorderBufferAddInvalidations(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn,
674682
Size nmsgs, SharedInvalidationMessage *msgs);
675-
extern void ReorderBufferImmediateInvalidation(ReorderBuffer *, uint32 ninvalidations,
683+
extern void ReorderBufferImmediateInvalidation(ReorderBuffer *rb, uint32 ninvalidations,
676684
SharedInvalidationMessage *invalidations);
677-
extern void ReorderBufferProcessXid(ReorderBuffer *, TransactionId xid, XLogRecPtr lsn);
685+
extern void ReorderBufferProcessXid(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn);
678686

679-
extern void ReorderBufferXidSetCatalogChanges(ReorderBuffer *, TransactionId xid, XLogRecPtr lsn);
680-
extern bool ReorderBufferXidHasCatalogChanges(ReorderBuffer *, TransactionId xid);
681-
extern bool ReorderBufferXidHasBaseSnapshot(ReorderBuffer *, TransactionId xid);
687+
extern void ReorderBufferXidSetCatalogChanges(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn);
688+
extern bool ReorderBufferXidHasCatalogChanges(ReorderBuffer *rb, TransactionId xid);
689+
extern bool ReorderBufferXidHasBaseSnapshot(ReorderBuffer *rb, TransactionId xid);
682690

683691
extern bool ReorderBufferRememberPrepareInfo(ReorderBuffer *rb, TransactionId xid,
684692
XLogRecPtr prepare_lsn, XLogRecPtr end_lsn,
685693
TimestampTz prepare_time,
686694
RepOriginId origin_id, XLogRecPtr origin_lsn);
687695
extern void ReorderBufferSkipPrepare(ReorderBuffer *rb, TransactionId xid);
688696
extern void ReorderBufferPrepare(ReorderBuffer *rb, TransactionId xid, char *gid);
689-
extern ReorderBufferTXN *ReorderBufferGetOldestTXN(ReorderBuffer *);
697+
extern ReorderBufferTXN *ReorderBufferGetOldestTXN(ReorderBuffer *rb);
690698
extern TransactionId ReorderBufferGetOldestXmin(ReorderBuffer *rb);
691699
extern TransactionId *ReorderBufferGetCatalogChangesXacts(ReorderBuffer *rb);
692700

693-
extern void ReorderBufferSetRestartPoint(ReorderBuffer *, XLogRecPtr ptr);
701+
extern void ReorderBufferSetRestartPoint(ReorderBuffer *rb, XLogRecPtr ptr);
694702

695703
extern void StartupReorderBuffer(void);
696704

0 commit comments

Comments
 (0)