Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit035ce1f

Browse files
Harmonize reorderbuffer parameter names.
Make reorderbuffer.h function declarations consistently use namedparameters. Also make sure that the declarations use names that matchcorresponding names from function definitions in reorderbuffer.c. Thismakes the definitions easier to follow, especially in the case offunctions 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 parent4274dc2 commit035ce1f

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
staticSizeReorderBufferRestoreChanges(ReorderBuffer*rb,ReorderBufferTXN*txn,
251251
TXNEntryFile*file,XLogSegNo*segno);
252252
staticvoidReorderBufferRestoreChange(ReorderBuffer*rb,ReorderBufferTXN*txn,
253-
char*change);
253+
char*data);
254254
staticvoidReorderBufferRestoreCleanup(ReorderBuffer*rb,ReorderBufferTXN*txn);
255255
staticvoidReorderBufferTruncateTXN(ReorderBuffer*rb,ReorderBufferTXN*txn,
256256
booltxn_prepared);
@@ -820,7 +820,7 @@ ReorderBufferQueueChange(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn,
820820
*/
821821
void
822822
ReorderBufferQueueMessage(ReorderBuffer*rb,TransactionIdxid,
823-
Snapshotsnapshot,XLogRecPtrlsn,
823+
Snapshotsnap,XLogRecPtrlsn,
824824
booltransactional,constchar*prefix,
825825
Sizemessage_size,constchar*message)
826826
{
@@ -847,7 +847,7 @@ ReorderBufferQueueMessage(ReorderBuffer *rb, TransactionId xid,
847847
else
848848
{
849849
ReorderBufferTXN*txn=NULL;
850-
volatileSnapshotsnapshot_now=snapshot;
850+
volatileSnapshotsnapshot_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
externReorderBuffer*ReorderBufferAllocate(void);
633-
externvoidReorderBufferFree(ReorderBuffer*);
633+
externvoidReorderBufferFree(ReorderBuffer*rb);
634634

635-
externReorderBufferTupleBuf*ReorderBufferGetTupleBuf(ReorderBuffer*,Sizetuple_len);
636-
externvoidReorderBufferReturnTupleBuf(ReorderBuffer*,ReorderBufferTupleBuf*tuple);
637-
externReorderBufferChange*ReorderBufferGetChange(ReorderBuffer*);
638-
externvoidReorderBufferReturnChange(ReorderBuffer*,ReorderBufferChange*,bool);
635+
externReorderBufferTupleBuf*ReorderBufferGetTupleBuf(ReorderBuffer*rb,
636+
Sizetuple_len);
637+
externvoidReorderBufferReturnTupleBuf(ReorderBuffer*rb,
638+
ReorderBufferTupleBuf*tuple);
639+
externReorderBufferChange*ReorderBufferGetChange(ReorderBuffer*rb);
640+
externvoidReorderBufferReturnChange(ReorderBuffer*rb,
641+
ReorderBufferChange*change,boolupd_mem);
639642

640-
externOid*ReorderBufferGetRelids(ReorderBuffer*,intnrelids);
641-
externvoidReorderBufferReturnRelids(ReorderBuffer*,Oid*relids);
643+
externOid*ReorderBufferGetRelids(ReorderBuffer*rb,intnrelids);
644+
externvoidReorderBufferReturnRelids(ReorderBuffer*rb,Oid*relids);
642645

643-
externvoidReorderBufferQueueChange(ReorderBuffer*,TransactionId,
644-
XLogRecPtrlsn,ReorderBufferChange*,
646+
externvoidReorderBufferQueueChange(ReorderBuffer*rb,TransactionIdxid,
647+
XLogRecPtrlsn,ReorderBufferChange*change,
645648
booltoast_insert);
646-
externvoidReorderBufferQueueMessage(ReorderBuffer*,TransactionId,Snapshotsnapshot,XLogRecPtrlsn,
649+
externvoidReorderBufferQueueMessage(ReorderBuffer*rb,TransactionIdxid,
650+
Snapshotsnap,XLogRecPtrlsn,
647651
booltransactional,constchar*prefix,
648652
Sizemessage_size,constchar*message);
649-
externvoidReorderBufferCommit(ReorderBuffer*,TransactionId,
653+
externvoidReorderBufferCommit(ReorderBuffer*rb,TransactionIdxid,
650654
XLogRecPtrcommit_lsn,XLogRecPtrend_lsn,
651655
TimestampTzcommit_time,RepOriginIdorigin_id,XLogRecPtrorigin_lsn);
652656
externvoidReorderBufferFinishPrepared(ReorderBuffer*rb,TransactionIdxid,
@@ -655,42 +659,46 @@ extern void ReorderBufferFinishPrepared(ReorderBuffer *rb, TransactionId xid,
655659
TimestampTzcommit_time,
656660
RepOriginIdorigin_id,XLogRecPtrorigin_lsn,
657661
char*gid,boolis_commit);
658-
externvoidReorderBufferAssignChild(ReorderBuffer*,TransactionId,TransactionId,XLogRecPtrcommit_lsn);
659-
externvoidReorderBufferCommitChild(ReorderBuffer*,TransactionId,TransactionId,
662+
externvoidReorderBufferAssignChild(ReorderBuffer*rb,TransactionIdxid,
663+
TransactionIdsubxid,XLogRecPtrlsn);
664+
externvoidReorderBufferCommitChild(ReorderBuffer*rb,TransactionId,TransactionId,
660665
XLogRecPtrcommit_lsn,XLogRecPtrend_lsn);
661-
externvoidReorderBufferAbort(ReorderBuffer*,TransactionId,XLogRecPtrlsn);
662-
externvoidReorderBufferAbortOld(ReorderBuffer*,TransactionIdxid);
663-
externvoidReorderBufferForget(ReorderBuffer*,TransactionId,XLogRecPtrlsn);
664-
externvoidReorderBufferInvalidate(ReorderBuffer*,TransactionId,XLogRecPtrlsn);
665-
666-
externvoidReorderBufferSetBaseSnapshot(ReorderBuffer*,TransactionId,XLogRecPtrlsn,structSnapshotData*snap);
667-
externvoidReorderBufferAddSnapshot(ReorderBuffer*,TransactionId,XLogRecPtrlsn,structSnapshotData*snap);
668-
externvoidReorderBufferAddNewCommandId(ReorderBuffer*,TransactionId,XLogRecPtrlsn,
669-
CommandIdcid);
670-
externvoidReorderBufferAddNewTupleCids(ReorderBuffer*,TransactionId,XLogRecPtrlsn,
671-
RelFileLocatorlocator,ItemPointerDatapt,
666+
externvoidReorderBufferAbort(ReorderBuffer*rb,TransactionIdxid,XLogRecPtrlsn);
667+
externvoidReorderBufferAbortOld(ReorderBuffer*rb,TransactionIdoldestRunningXid);
668+
externvoidReorderBufferForget(ReorderBuffer*rb,TransactionIdxid,XLogRecPtrlsn);
669+
externvoidReorderBufferInvalidate(ReorderBuffer*rb,TransactionIdxid,XLogRecPtrlsn);
670+
671+
externvoidReorderBufferSetBaseSnapshot(ReorderBuffer*rb,TransactionIdxid,
672+
XLogRecPtrlsn,Snapshotsnap);
673+
externvoidReorderBufferAddSnapshot(ReorderBuffer*rb,TransactionIdxid,
674+
XLogRecPtrlsn,Snapshotsnap);
675+
externvoidReorderBufferAddNewCommandId(ReorderBuffer*rb,TransactionIdxid,
676+
XLogRecPtrlsn,CommandIdcid);
677+
externvoidReorderBufferAddNewTupleCids(ReorderBuffer*rb,TransactionIdxid,
678+
XLogRecPtrlsn,RelFileLocatorlocator,
679+
ItemPointerDatatid,
672680
CommandIdcmin,CommandIdcmax,CommandIdcombocid);
673-
externvoidReorderBufferAddInvalidations(ReorderBuffer*,TransactionId,XLogRecPtrlsn,
681+
externvoidReorderBufferAddInvalidations(ReorderBuffer*rb,TransactionIdxid,XLogRecPtrlsn,
674682
Sizenmsgs,SharedInvalidationMessage*msgs);
675-
externvoidReorderBufferImmediateInvalidation(ReorderBuffer*,uint32ninvalidations,
683+
externvoidReorderBufferImmediateInvalidation(ReorderBuffer*rb,uint32ninvalidations,
676684
SharedInvalidationMessage*invalidations);
677-
externvoidReorderBufferProcessXid(ReorderBuffer*,TransactionIdxid,XLogRecPtrlsn);
685+
externvoidReorderBufferProcessXid(ReorderBuffer*rb,TransactionIdxid,XLogRecPtrlsn);
678686

679-
externvoidReorderBufferXidSetCatalogChanges(ReorderBuffer*,TransactionIdxid,XLogRecPtrlsn);
680-
externboolReorderBufferXidHasCatalogChanges(ReorderBuffer*,TransactionIdxid);
681-
externboolReorderBufferXidHasBaseSnapshot(ReorderBuffer*,TransactionIdxid);
687+
externvoidReorderBufferXidSetCatalogChanges(ReorderBuffer*rb,TransactionIdxid,XLogRecPtrlsn);
688+
externboolReorderBufferXidHasCatalogChanges(ReorderBuffer*rb,TransactionIdxid);
689+
externboolReorderBufferXidHasBaseSnapshot(ReorderBuffer*rb,TransactionIdxid);
682690

683691
externboolReorderBufferRememberPrepareInfo(ReorderBuffer*rb,TransactionIdxid,
684692
XLogRecPtrprepare_lsn,XLogRecPtrend_lsn,
685693
TimestampTzprepare_time,
686694
RepOriginIdorigin_id,XLogRecPtrorigin_lsn);
687695
externvoidReorderBufferSkipPrepare(ReorderBuffer*rb,TransactionIdxid);
688696
externvoidReorderBufferPrepare(ReorderBuffer*rb,TransactionIdxid,char*gid);
689-
externReorderBufferTXN*ReorderBufferGetOldestTXN(ReorderBuffer*);
697+
externReorderBufferTXN*ReorderBufferGetOldestTXN(ReorderBuffer*rb);
690698
externTransactionIdReorderBufferGetOldestXmin(ReorderBuffer*rb);
691699
externTransactionId*ReorderBufferGetCatalogChangesXacts(ReorderBuffer*rb);
692700

693-
externvoidReorderBufferSetRestartPoint(ReorderBuffer*,XLogRecPtrptr);
701+
externvoidReorderBufferSetRestartPoint(ReorderBuffer*rb,XLogRecPtrptr);
694702

695703
externvoidStartupReorderBuffer(void);
696704

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp