Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1fdbca1

Browse files
MasahikoSawadaMasahikoSawada
committed
Standardize replication origin naming to use "ReplOrigin".
The replication origin code was using inconsistent naming conventions. Functions were typically prefixed with 'replorigin', while typedefs and constants used "RepOrigin". This commit unifies the naming convention by renaming RepOriginId to ReplOriginId. Reviewed-by: Chao Li <[email protected]> Discussion: https://postgr.es/m/CAD21AoBDgm3hDqUZ+nqu=ViHmkCnJBuJyaxG_yvv27BAi2zBmQ@mail.gmail.com
1 parent 4020b37 commit 1fdbca1

File tree

33 files changed

+146
-146
lines changed

33 files changed

+146
-146
lines changed

‎contrib/test_decoding/test_decoding.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static void pg_decode_truncate(LogicalDecodingContext *ctx,
7070
int nrelations, Relation relations[],
7171
ReorderBufferChange *change);
7272
static bool pg_decode_filter(LogicalDecodingContext *ctx,
73-
RepOriginId origin_id);
73+
ReplOriginId origin_id);
7474
static void pg_decode_message(LogicalDecodingContext *ctx,
7575
ReorderBufferTXN *txn, XLogRecPtr lsn,
7676
bool transactional, const char *prefix,
@@ -461,11 +461,11 @@ pg_decode_filter_prepare(LogicalDecodingContext *ctx, TransactionId xid,
461461

462462
static bool
463463
pg_decode_filter(LogicalDecodingContext *ctx,
464-
RepOriginId origin_id)
464+
ReplOriginId origin_id)
465465
{
466466
TestDecodingData *data = ctx->output_plugin_private;
467467

468-
if (data->only_local && origin_id != InvalidRepOriginId)
468+
if (data->only_local && origin_id != InvalidReplOriginId)
469469
return true;
470470
return false;
471471
}

‎doc/src/sgml/logicaldecoding.sgml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ typedef void (*LogicalDecodeTruncateCB) (struct LogicalDecodingContext *ctx,
11001100
output plugin.
11011101
<programlisting>
11021102
typedef bool (*LogicalDecodeFilterByOriginCB) (struct LogicalDecodingContext *ctx,
1103-
RepOriginId origin_id);
1103+
ReplOriginId origin_id);
11041104
</programlisting>
11051105
The <parameter>ctx</parameter> parameter has the same contents
11061106
as for the other callbacks. No information but the origin is

‎src/backend/access/rmgrdesc/xactdesc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ xact_desc_stats(StringInfo buf, const char *label,
331331
}
332332

333333
static void
334-
xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId origin_id)
334+
xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, ReplOriginId origin_id)
335335
{
336336
xl_xact_parsed_commit parsed;
337337

@@ -367,7 +367,7 @@ xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId
367367
}
368368

369369
static void
370-
xact_desc_abort(StringInfo buf, uint8 info, xl_xact_abort *xlrec, RepOriginId origin_id)
370+
xact_desc_abort(StringInfo buf, uint8 info, xl_xact_abort *xlrec, ReplOriginId origin_id)
371371
{
372372
xl_xact_parsed_abort parsed;
373373

@@ -394,7 +394,7 @@ xact_desc_abort(StringInfo buf, uint8 info, xl_xact_abort *xlrec, RepOriginId or
394394
}
395395

396396
static void
397-
xact_desc_prepare(StringInfo buf, uint8 info, xl_xact_prepare *xlrec, RepOriginId origin_id)
397+
xact_desc_prepare(StringInfo buf, uint8 info, xl_xact_prepare *xlrec, ReplOriginId origin_id)
398398
{
399399
xl_xact_parsed_prepare parsed;
400400

@@ -417,7 +417,7 @@ xact_desc_prepare(StringInfo buf, uint8 info, xl_xact_prepare *xlrec, RepOriginI
417417
* Check if the replication origin has been set in this record in the same
418418
* way as PrepareRedoAdd().
419419
*/
420-
if (origin_id != InvalidRepOriginId)
420+
if (origin_id != InvalidReplOriginId)
421421
appendStringInfo(buf, "; origin: node %u, lsn %X/%08X, at %s",
422422
origin_id,
423423
LSN_FORMAT_ARGS(parsed.origin_lsn),

‎src/backend/access/transam/commit_ts.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
typedef struct CommitTimestampEntry
5555
{
5656
TimestampTz time;
57-
RepOriginId nodeid;
57+
ReplOriginId nodeid;
5858
} CommitTimestampEntry;
5959

6060
#define SizeOfCommitTimestampEntry (offsetof(CommitTimestampEntry, nodeid) + \
61-
sizeof(RepOriginId))
61+
sizeof(ReplOriginId))
6262

6363
#define COMMIT_TS_XACTS_PER_PAGE \
6464
(BLCKSZ / SizeOfCommitTimestampEntry)
@@ -110,9 +110,9 @@ bool track_commit_timestamp;
110110

111111
static void SetXidCommitTsInPage(TransactionId xid, int nsubxids,
112112
TransactionId *subxids, TimestampTz ts,
113-
RepOriginId nodeid, int64 pageno);
113+
ReplOriginId nodeid, int64 pageno);
114114
static void TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
115-
RepOriginId nodeid, int slotno);
115+
ReplOriginId nodeid, int slotno);
116116
static void error_commit_ts_disabled(void);
117117
static bool CommitTsPagePrecedes(int64 page1, int64 page2);
118118
static void ActivateCommitTs(void);
@@ -138,7 +138,7 @@ static void WriteTruncateXlogRec(int64 pageno, TransactionId oldestXid);
138138
void
139139
TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
140140
TransactionId *subxids, TimestampTz timestamp,
141-
RepOriginId nodeid)
141+
ReplOriginId nodeid)
142142
{
143143
int i;
144144
TransactionId headxid;
@@ -219,7 +219,7 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
219219
static void
220220
SetXidCommitTsInPage(TransactionId xid, int nsubxids,
221221
TransactionId *subxids, TimestampTz ts,
222-
RepOriginId nodeid, int64 pageno)
222+
ReplOriginId nodeid, int64 pageno)
223223
{
224224
LWLock *lock = SimpleLruGetBankLock(CommitTsCtl, pageno);
225225
int slotno;
@@ -245,7 +245,7 @@ SetXidCommitTsInPage(TransactionId xid, int nsubxids,
245245
*/
246246
static void
247247
TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
248-
RepOriginId nodeid, int slotno)
248+
ReplOriginId nodeid, int slotno)
249249
{
250250
int entryno = TransactionIdToCTsEntry(xid);
251251
CommitTimestampEntry entry;
@@ -270,7 +270,7 @@ TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
270270
*/
271271
bool
272272
TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
273-
RepOriginId *nodeid)
273+
ReplOriginId *nodeid)
274274
{
275275
int64 pageno = TransactionIdToCTsPage(xid);
276276
int entryno = TransactionIdToCTsEntry(xid);
@@ -327,7 +327,7 @@ TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
327327
{
328328
*ts = 0;
329329
if (nodeid)
330-
*nodeid = InvalidRepOriginId;
330+
*nodeid = InvalidReplOriginId;
331331
return false;
332332
}
333333

@@ -355,7 +355,7 @@ TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
355355
* as NULL if not wanted.
356356
*/
357357
TransactionId
358-
GetLatestCommitTsData(TimestampTz *ts, RepOriginId *nodeid)
358+
GetLatestCommitTsData(TimestampTz *ts, ReplOriginId *nodeid)
359359
{
360360
TransactionId xid;
361361

@@ -418,7 +418,7 @@ Datum
418418
pg_last_committed_xact(PG_FUNCTION_ARGS)
419419
{
420420
TransactionId xid;
421-
RepOriginId nodeid;
421+
ReplOriginId nodeid;
422422
TimestampTz ts;
423423
Datum values[3];
424424
bool nulls[3];
@@ -462,7 +462,7 @@ Datum
462462
pg_xact_commit_timestamp_origin(PG_FUNCTION_ARGS)
463463
{
464464
TransactionId xid = PG_GETARG_TRANSACTIONID(0);
465-
RepOriginId nodeid;
465+
ReplOriginId nodeid;
466466
TimestampTz ts;
467467
Datum values[2];
468468
bool nulls[2];
@@ -568,7 +568,7 @@ CommitTsShmemInit(void)
568568

569569
commitTsShared->xidLastCommit = InvalidTransactionId;
570570
TIMESTAMP_NOBEGIN(commitTsShared->dataLastCommit.time);
571-
commitTsShared->dataLastCommit.nodeid = InvalidRepOriginId;
571+
commitTsShared->dataLastCommit.nodeid = InvalidReplOriginId;
572572
commitTsShared->commitTsActive = false;
573573
}
574574
else
@@ -763,7 +763,7 @@ DeactivateCommitTs(void)
763763
commitTsShared->commitTsActive = false;
764764
commitTsShared->xidLastCommit = InvalidTransactionId;
765765
TIMESTAMP_NOBEGIN(commitTsShared->dataLastCommit.time);
766-
commitTsShared->dataLastCommit.nodeid = InvalidRepOriginId;
766+
commitTsShared->dataLastCommit.nodeid = InvalidReplOriginId;
767767

768768
TransamVariables->oldestCommitTsXid = InvalidTransactionId;
769769
TransamVariables->newestCommitTsXid = InvalidTransactionId;

‎src/backend/access/transam/twophase.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ EndPrepare(GlobalTransaction gxact)
11571157
Assert(hdr->magic == TWOPHASE_MAGIC);
11581158
hdr->total_len = records.total_len + sizeof(pg_crc32c);
11591159

1160-
replorigin = (replorigin_session_origin != InvalidRepOriginId &&
1160+
replorigin = (replorigin_session_origin != InvalidReplOriginId &&
11611161
replorigin_session_origin != DoNotReplicateId);
11621162

11631163
if (replorigin)
@@ -1924,7 +1924,7 @@ restoreTwoPhaseData(void)
19241924
continue;
19251925

19261926
PrepareRedoAdd(fxid, buf, InvalidXLogRecPtr,
1927-
InvalidXLogRecPtr, InvalidRepOriginId);
1927+
InvalidXLogRecPtr, InvalidReplOriginId);
19281928
}
19291929
}
19301930
LWLockRelease(TwoPhaseStateLock);
@@ -2330,7 +2330,7 @@ RecordTransactionCommitPrepared(TransactionId xid,
23302330
* Are we using the replication origins feature? Or, in other words, are
23312331
* we replaying remote actions?
23322332
*/
2333-
replorigin = (replorigin_session_origin != InvalidRepOriginId &&
2333+
replorigin = (replorigin_session_origin != InvalidReplOriginId &&
23342334
replorigin_session_origin != DoNotReplicateId);
23352335

23362336
/* Load the injection point before entering the critical section */
@@ -2445,7 +2445,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
24452445
* Are we using the replication origins feature? Or, in other words, are
24462446
* we replaying remote actions?
24472447
*/
2448-
replorigin = (replorigin_session_origin != InvalidRepOriginId &&
2448+
replorigin = (replorigin_session_origin != InvalidReplOriginId &&
24492449
replorigin_session_origin != DoNotReplicateId);
24502450

24512451
/*
@@ -2506,7 +2506,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
25062506
void
25072507
PrepareRedoAdd(FullTransactionId fxid, char *buf,
25082508
XLogRecPtr start_lsn, XLogRecPtr end_lsn,
2509-
RepOriginId origin_id)
2509+
ReplOriginId origin_id)
25102510
{
25112511
TwoPhaseFileHeader *hdr = (TwoPhaseFileHeader *) buf;
25122512
char *bufptr;
@@ -2595,7 +2595,7 @@ PrepareRedoAdd(FullTransactionId fxid, char *buf,
25952595
Assert(TwoPhaseState->numPrepXacts < max_prepared_xacts);
25962596
TwoPhaseState->prepXacts[TwoPhaseState->numPrepXacts++] = gxact;
25972597

2598-
if (origin_id != InvalidRepOriginId)
2598+
if (origin_id != InvalidReplOriginId)
25992599
{
26002600
/* recover apply progress */
26012601
replorigin_advance(origin_id, hdr->origin_lsn, end_lsn,

‎src/backend/access/transam/xact.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ RecordTransactionCommit(void)
14131413
* Are we using the replication origins feature? Or, in other words,
14141414
* are we replaying remote actions?
14151415
*/
1416-
replorigin = (replorigin_session_origin != InvalidRepOriginId &&
1416+
replorigin = (replorigin_session_origin != InvalidReplOriginId &&
14171417
replorigin_session_origin != DoNotReplicateId);
14181418

14191419
/*
@@ -1810,7 +1810,7 @@ RecordTransactionAbort(bool isSubXact)
18101810
* Are we using the replication origins feature? Or, in other words, are
18111811
* we replaying remote actions?
18121812
*/
1813-
replorigin = (replorigin_session_origin != InvalidRepOriginId &&
1813+
replorigin = (replorigin_session_origin != InvalidReplOriginId &&
18141814
replorigin_session_origin != DoNotReplicateId);
18151815

18161816
/* Fetch the data we need for the abort record */
@@ -5928,7 +5928,7 @@ XactLogCommitRecord(TimestampTz commit_time,
59285928
}
59295929

59305930
/* dump transaction origin information */
5931-
if (replorigin_session_origin != InvalidRepOriginId)
5931+
if (replorigin_session_origin != InvalidReplOriginId)
59325932
{
59335933
xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
59345934

@@ -6081,7 +6081,7 @@ XactLogAbortRecord(TimestampTz abort_time,
60816081
* Dump transaction origin information. We need this during recovery to
60826082
* update the replication origin progress.
60836083
*/
6084-
if (replorigin_session_origin != InvalidRepOriginId)
6084+
if (replorigin_session_origin != InvalidReplOriginId)
60856085
{
60866086
xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
60876087

@@ -6152,7 +6152,7 @@ static void
61526152
xact_redo_commit(xl_xact_parsed_commit *parsed,
61536153
TransactionId xid,
61546154
XLogRecPtr lsn,
6155-
RepOriginId origin_id)
6155+
ReplOriginId origin_id)
61566156
{
61576157
TransactionId max_xid;
61586158
TimestampTz commit_time;
@@ -6165,7 +6165,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
61656165
AdvanceNextFullTransactionIdPastXid(max_xid);
61666166

61676167
Assert(((parsed->xinfo & XACT_XINFO_HAS_ORIGIN) == 0) ==
6168-
(origin_id == InvalidRepOriginId));
6168+
(origin_id == InvalidReplOriginId));
61696169

61706170
if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
61716171
commit_time = parsed->origin_timestamp;
@@ -6304,7 +6304,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
63046304
*/
63056305
static void
63066306
xact_redo_abort(xl_xact_parsed_abort *parsed, TransactionId xid,
6307-
XLogRecPtr lsn, RepOriginId origin_id)
6307+
XLogRecPtr lsn, ReplOriginId origin_id)
63086308
{
63096309
TransactionId max_xid;
63106310

‎src/backend/access/transam/xloginsert.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static uint8 curinsert_flags = 0;
115115
static XLogRecData hdr_rdt;
116116
static char *hdr_scratch = NULL;
117117

118-
#define SizeOfXlogOrigin (sizeof(RepOriginId) + sizeof(char))
118+
#define SizeOfXlogOrigin (sizeof(ReplOriginId) + sizeof(char))
119119
#define SizeOfXLogTransactionId (sizeof(TransactionId) + sizeof(char))
120120

121121
#define HEADER_SCRATCH_SIZE \
@@ -861,7 +861,7 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
861861

862862
/* followed by the record's origin, if any */
863863
if ((curinsert_flags & XLOG_INCLUDE_ORIGIN) &&
864-
replorigin_session_origin != InvalidRepOriginId)
864+
replorigin_session_origin != InvalidReplOriginId)
865865
{
866866
*(scratch++) = (char) XLR_BLOCK_ID_ORIGIN;
867867
memcpy(scratch, &replorigin_session_origin, sizeof(replorigin_session_origin));

‎src/backend/access/transam/xlogreader.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,7 @@ DecodeXLogRecord(XLogReaderState *state,
17071707
decoded->header = *record;
17081708
decoded->lsn = lsn;
17091709
decoded->next = NULL;
1710-
decoded->record_origin = InvalidRepOriginId;
1710+
decoded->record_origin = InvalidReplOriginId;
17111711
decoded->toplevel_xid = InvalidTransactionId;
17121712
decoded->main_data = NULL;
17131713
decoded->main_data_len = 0;
@@ -1747,7 +1747,7 @@ DecodeXLogRecord(XLogReaderState *state,
17471747
}
17481748
else if (block_id == XLR_BLOCK_ID_ORIGIN)
17491749
{
1750-
COPY_HEADER_FIELD(&decoded->record_origin, sizeof(RepOriginId));
1750+
COPY_HEADER_FIELD(&decoded->record_origin, sizeof(ReplOriginId));
17511751
}
17521752
else if (block_id == XLR_BLOCK_ID_TOPLEVEL_XID)
17531753
{

‎src/backend/commands/subscriptioncmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,7 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt,
18971897
*/
18981898
if (XLogRecPtrIsValid(opts.lsn))
18991899
{
1900-
RepOriginId originid;
1900+
ReplOriginId originid;
19011901
char originname[NAMEDATALEN];
19021902
XLogRecPtr remote_lsn;
19031903

‎src/backend/executor/execReplication.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -480,15 +480,15 @@ update_most_recent_deletion_info(TupleTableSlot *scanslot,
480480
TransactionId oldestxmin,
481481
TransactionId *delete_xid,
482482
TimestampTz *delete_time,
483-
RepOriginId *delete_origin)
483+
ReplOriginId *delete_origin)
484484
{
485485
BufferHeapTupleTableSlot *hslot;
486486
HeapTuple tuple;
487487
Buffer buf;
488488
bool recently_dead = false;
489489
TransactionId xmax;
490490
TimestampTz localts;
491-
RepOriginId localorigin;
491+
ReplOriginId localorigin;
492492

493493
hslot = (BufferHeapTupleTableSlot *) scanslot;
494494

@@ -562,7 +562,7 @@ bool
562562
RelationFindDeletedTupleInfoSeq(Relation rel, TupleTableSlot *searchslot,
563563
TransactionId oldestxmin,
564564
TransactionId *delete_xid,
565-
RepOriginId *delete_origin,
565+
ReplOriginId *delete_origin,
566566
TimestampTz *delete_time)
567567
{
568568
TupleTableSlot *scanslot;
@@ -574,7 +574,7 @@ RelationFindDeletedTupleInfoSeq(Relation rel, TupleTableSlot *searchslot,
574574
Assert(equalTupleDescs(desc, searchslot->tts_tupleDescriptor));
575575

576576
*delete_xid = InvalidTransactionId;
577-
*delete_origin = InvalidRepOriginId;
577+
*delete_origin = InvalidReplOriginId;
578578
*delete_time = 0;
579579

580580
/*
@@ -632,7 +632,7 @@ RelationFindDeletedTupleInfoByIndex(Relation rel, Oid idxoid,
632632
TupleTableSlot *searchslot,
633633
TransactionId oldestxmin,
634634
TransactionId *delete_xid,
635-
RepOriginId *delete_origin,
635+
ReplOriginId *delete_origin,
636636
TimestampTz *delete_time)
637637
{
638638
Relation idxrel;
@@ -649,7 +649,7 @@ RelationFindDeletedTupleInfoByIndex(Relation rel, Oid idxoid,
649649

650650
*delete_xid = InvalidTransactionId;
651651
*delete_time = 0;
652-
*delete_origin = InvalidRepOriginId;
652+
*delete_origin = InvalidReplOriginId;
653653

654654
isIdxSafeToSkipDuplicates = (GetRelationIdentityOrPK(rel) == idxoid);
655655

0 commit comments

Comments
 (0)