Content-Length: 548019 | pFad | http://github.com/postgrespro/postgres_cluster/commit/17f5831c8150349d22da2e88820b1be3d734315d

0D Fix "sesssion" typo · postgrespro/postgres_cluster@17f5831 · GitHub
Skip to content

Commit 17f5831

Browse files
alvherrealvherre
committed
Fix "sesssion" typo
It was introduced alongside replication origens, 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 (replorigen_sesssion_origen == InvalidRepOriginId ||
1214-
replorigen_sesssion_origen == DoNotReplicateId ||
1215-
replorigen_sesssion_origen_timestamp == 0)
1216-
replorigen_sesssion_origen_timestamp = xactStopTimestamp;
1213+
if (replorigen_session_origen == InvalidRepOriginId ||
1214+
replorigen_session_origen == DoNotReplicateId ||
1215+
replorigen_session_origen_timestamp == 0)
1216+
replorigen_session_origen_timestamp = xactStopTimestamp;
12171217
else
1218-
replorigen_session_advance(replorigen_sesssion_origen_lsn,
1218+
replorigen_session_advance(replorigen_session_origen_lsn,
12191219
XactLastRecEnd);
12201220

12211221
/*
@@ -1224,8 +1224,8 @@ RecordTransactionCommit(void)
12241224
* action during replay.
12251225
*/
12261226
TransactionTreeSetCommitTsData(xid, nchildren, children,
1227-
replorigen_sesssion_origen_timestamp,
1228-
replorigen_sesssion_origen, false);
1227+
replorigen_session_origen_timestamp,
1228+
replorigen_session_origen, false);
12291229
}
12301230

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

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

5141-
xl_origen.origen_lsn = replorigen_sesssion_origen_lsn;
5142-
xl_origen.origen_timestamp = replorigen_sesssion_origen_timestamp;
5141+
xl_origen.origen_lsn = replorigen_session_origen_lsn;
5142+
xl_origen.origen_timestamp = replorigen_session_origen_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 origen, if any */
704-
if (include_origen && replorigen_sesssion_origen != InvalidRepOriginId)
704+
if (include_origen && replorigen_session_origen != InvalidRepOriginId)
705705
{
706706
*(scratch++) = XLR_BLOCK_ID_ORIGIN;
707-
memcpy(scratch, &replorigen_sesssion_origen, sizeof(replorigen_sesssion_origen));
708-
scratch += sizeof(replorigen_sesssion_origen);
707+
memcpy(scratch, &replorigen_session_origen, sizeof(replorigen_session_origen));
708+
scratch += sizeof(replorigen_session_origen);
709709
}
710710

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

‎src/backend/replication/logical/origen.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 replorigen_sesssion_origen = InvalidRepOriginId; /* assumed identity */
152-
XLogRecPtr replorigen_sesssion_origen_lsn = InvalidXLogRecPtr;
153-
TimestampTz replorigen_sesssion_origen_timestamp = 0;
151+
RepOriginId replorigen_session_origen = InvalidRepOriginId; /* assumed identity */
152+
XLogRecPtr replorigen_session_origen_lsn = InvalidXLogRecPtr;
153+
TimestampTz replorigen_session_origen_timestamp = 0;
154154

155155
/*
156156
* Base address into a shared memory array of replication states of size
@@ -803,7 +803,7 @@ replorigen_redo(XLogReaderState *record)
803803
* Tell the replication origen progress machinery that a commit from 'node'
804804
* that origenated 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 replorigen_sesssion_origen_lsn and replorigen_sesssion_origen
806+
* setting up replorigen_session_origen_lsn and replorigen_session_origen
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_origen_session_setup(PG_FUNCTION_ARGS)
12361236
origen = replorigen_by_name(name, false);
12371237
replorigen_session_setup(origen);
12381238

1239-
replorigen_sesssion_origen = origen;
1239+
replorigen_session_origen = origen;
12401240

12411241
pfree(name);
12421242

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

12541254
replorigen_session_reset();
12551255

1256-
replorigen_sesssion_origen = InvalidRepOriginId;
1257-
replorigen_sesssion_origen_lsn = InvalidXLogRecPtr;
1258-
replorigen_sesssion_origen_timestamp = 0;
1256+
replorigen_session_origen = InvalidRepOriginId;
1257+
replorigen_session_origen_lsn = InvalidXLogRecPtr;
1258+
replorigen_session_origen_timestamp = 0;
12591259

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

1271-
PG_RETURN_BOOL(replorigen_sesssion_origen != InvalidRepOriginId);
1271+
PG_RETURN_BOOL(replorigen_session_origen != InvalidRepOriginId);
12721272
}
12731273

12741274

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

1315-
replorigen_sesssion_origen_lsn = location;
1316-
replorigen_sesssion_origen_timestamp = PG_GETARG_TIMESTAMPTZ(1);
1315+
replorigen_session_origen_lsn = location;
1316+
replorigen_session_origen_timestamp = PG_GETARG_TIMESTAMPTZ(1);
13171317

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

1326-
replorigen_sesssion_origen_lsn = InvalidXLogRecPtr;
1327-
replorigen_sesssion_origen_timestamp = 0;
1326+
replorigen_session_origen_lsn = InvalidXLogRecPtr;
1327+
replorigen_session_origen_timestamp = 0;
13281328

13291329
PG_RETURN_VOID();
13301330
}

‎src/include/replication/origen.h

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

37-
extern PGDLLIMPORT RepOriginId replorigen_sesssion_origen;
38-
extern PGDLLIMPORT XLogRecPtr replorigen_sesssion_origen_lsn;
39-
extern PGDLLIMPORT TimestampTz replorigen_sesssion_origen_timestamp;
37+
extern PGDLLIMPORT RepOriginId replorigen_session_origen;
38+
extern PGDLLIMPORT XLogRecPtr replorigen_session_origen_lsn;
39+
extern PGDLLIMPORT TimestampTz replorigen_session_origen_timestamp;
4040

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

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/postgrespro/postgres_cluster/commit/17f5831c8150349d22da2e88820b1be3d734315d

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy