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

Skip to content

Commit 17f5831

Browse files
alvherrealvherre
committed
Fix "sesssion" typo
It was introduced alongside replication origins, by commit 5aa2350, so backpatch to 9.5. Pointed out by Fujii Masao
1 parent 60f1e6b commit 17f5831

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,12 +1210,12 @@ RecordTransactionCommit(void)
12101210
* Record plain commit ts if not replaying remote actions, or if no
12111211
* timestamp is configured.
12121212
*/
1213-
if (replorigin_sesssion_origin == InvalidRepOriginId ||
1214-
replorigin_sesssion_origin == DoNotReplicateId ||
1215-
replorigin_sesssion_origin_timestamp == 0)
1216-
replorigin_sesssion_origin_timestamp = xactStopTimestamp;
1213+
if (replorigin_session_origin == InvalidRepOriginId ||
1214+
replorigin_session_origin == DoNotReplicateId ||
1215+
replorigin_session_origin_timestamp == 0)
1216+
replorigin_session_origin_timestamp = xactStopTimestamp;
12171217
else
1218-
replorigin_session_advance(replorigin_sesssion_origin_lsn,
1218+
replorigin_session_advance(replorigin_session_origin_lsn,
12191219
XactLastRecEnd);
12201220

12211221
/*
@@ -1224,8 +1224,8 @@ RecordTransactionCommit(void)
12241224
* action during replay.
12251225
*/
12261226
TransactionTreeSetCommitTsData(xid, nchildren, children,
1227-
replorigin_sesssion_origin_timestamp,
1228-
replorigin_sesssion_origin, false);
1227+
replorigin_session_origin_timestamp,
1228+
replorigin_session_origin, false);
12291229
}
12301230

12311231
/*
@@ -5134,12 +5134,12 @@ XactLogCommitRecord(TimestampTz commit_time,
51345134
}
51355135

51365136
/* dump transaction origin information */
5137-
if (replorigin_sesssion_origin != InvalidRepOriginId)
5137+
if (replorigin_session_origin != InvalidRepOriginId)
51385138
{
51395139
xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
51405140

5141-
xl_origin.origin_lsn = replorigin_sesssion_origin_lsn;
5142-
xl_origin.origin_timestamp = replorigin_sesssion_origin_timestamp;
5141+
xl_origin.origin_lsn = replorigin_session_origin_lsn;
5142+
xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
51435143
}
51445144

51455145
if (xl_xinfo.xinfo != 0)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,11 +701,11 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
701701
}
702702

703703
/* followed by the record's origin, if any */
704-
if (include_origin && replorigin_sesssion_origin != InvalidRepOriginId)
704+
if (include_origin && replorigin_session_origin != InvalidRepOriginId)
705705
{
706706
*(scratch++) = XLR_BLOCK_ID_ORIGIN;
707-
memcpy(scratch, &replorigin_sesssion_origin, sizeof(replorigin_sesssion_origin));
708-
scratch += sizeof(replorigin_sesssion_origin);
707+
memcpy(scratch, &replorigin_session_origin, sizeof(replorigin_session_origin));
708+
scratch += sizeof(replorigin_session_origin);
709709
}
710710

711711
/* followed by main data, if any */

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ typedef struct ReplicationStateCtl
148148
} ReplicationStateCtl;
149149

150150
/* external variables */
151-
RepOriginId replorigin_sesssion_origin = InvalidRepOriginId; /* assumed identity */
152-
XLogRecPtr replorigin_sesssion_origin_lsn = InvalidXLogRecPtr;
153-
TimestampTz replorigin_sesssion_origin_timestamp = 0;
151+
RepOriginId replorigin_session_origin = InvalidRepOriginId; /* assumed identity */
152+
XLogRecPtr replorigin_session_origin_lsn = InvalidXLogRecPtr;
153+
TimestampTz replorigin_session_origin_timestamp = 0;
154154

155155
/*
156156
* Base address into a shared memory array of replication states of size
@@ -803,7 +803,7 @@ replorigin_redo(XLogReaderState *record)
803803
* Tell the replication origin progress machinery that a commit from 'node'
804804
* that originated at the LSN remote_commit on the remote node was replayed
805805
* successfully and that we don't need to do so again. In combination with
806-
* setting up replorigin_sesssion_origin_lsn and replorigin_sesssion_origin
806+
* setting up replorigin_session_origin_lsn and replorigin_session_origin
807807
* that ensures we won't loose knowledge about that after a crash if the
808808
* transaction had a persistent effect (think of asynchronous commits).
809809
*
@@ -1236,7 +1236,7 @@ pg_replication_origin_session_setup(PG_FUNCTION_ARGS)
12361236
origin = replorigin_by_name(name, false);
12371237
replorigin_session_setup(origin);
12381238

1239-
replorigin_sesssion_origin = origin;
1239+
replorigin_session_origin = origin;
12401240

12411241
pfree(name);
12421242

@@ -1253,9 +1253,9 @@ pg_replication_origin_session_reset(PG_FUNCTION_ARGS)
12531253

12541254
replorigin_session_reset();
12551255

1256-
replorigin_sesssion_origin = InvalidRepOriginId;
1257-
replorigin_sesssion_origin_lsn = InvalidXLogRecPtr;
1258-
replorigin_sesssion_origin_timestamp = 0;
1256+
replorigin_session_origin = InvalidRepOriginId;
1257+
replorigin_session_origin_lsn = InvalidXLogRecPtr;
1258+
replorigin_session_origin_timestamp = 0;
12591259

12601260
PG_RETURN_VOID();
12611261
}
@@ -1268,7 +1268,7 @@ pg_replication_origin_session_is_setup(PG_FUNCTION_ARGS)
12681268
{
12691269
replorigin_check_prerequisites(false, false);
12701270

1271-
PG_RETURN_BOOL(replorigin_sesssion_origin != InvalidRepOriginId);
1271+
PG_RETURN_BOOL(replorigin_session_origin != InvalidRepOriginId);
12721272
}
12731273

12741274

@@ -1312,8 +1312,8 @@ pg_replication_origin_xact_setup(PG_FUNCTION_ARGS)
13121312
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
13131313
errmsg("no replication origin is configured")));
13141314

1315-
replorigin_sesssion_origin_lsn = location;
1316-
replorigin_sesssion_origin_timestamp = PG_GETARG_TIMESTAMPTZ(1);
1315+
replorigin_session_origin_lsn = location;
1316+
replorigin_session_origin_timestamp = PG_GETARG_TIMESTAMPTZ(1);
13171317

13181318
PG_RETURN_VOID();
13191319
}
@@ -1323,8 +1323,8 @@ pg_replication_origin_xact_reset(PG_FUNCTION_ARGS)
13231323
{
13241324
replorigin_check_prerequisites(true, false);
13251325

1326-
replorigin_sesssion_origin_lsn = InvalidXLogRecPtr;
1327-
replorigin_sesssion_origin_timestamp = 0;
1326+
replorigin_session_origin_lsn = InvalidXLogRecPtr;
1327+
replorigin_session_origin_timestamp = 0;
13281328

13291329
PG_RETURN_VOID();
13301330
}

‎src/include/replication/origin.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ typedef struct xl_replorigin_drop
3434
#define InvalidRepOriginId 0
3535
#define DoNotReplicateId PG_UINT16_MAX
3636

37-
extern PGDLLIMPORT RepOriginId replorigin_sesssion_origin;
38-
extern PGDLLIMPORT XLogRecPtr replorigin_sesssion_origin_lsn;
39-
extern PGDLLIMPORT TimestampTz replorigin_sesssion_origin_timestamp;
37+
extern PGDLLIMPORT RepOriginId replorigin_session_origin;
38+
extern PGDLLIMPORT XLogRecPtr replorigin_session_origin_lsn;
39+
extern PGDLLIMPORT TimestampTz replorigin_session_origin_timestamp;
4040

4141
/* API for querying & manipulating replication origins */
4242
extern RepOriginId replorigin_by_name(char *name, bool missing_ok);

0 commit comments

Comments
 (0)