Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3158117

Browse files
committed
Add asserts for origin
1 parent 3efb347 commit 3158117

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

contrib/mmts/pglogical_proto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
199199
elog(WARNING, "Failed to map origin %d", txn->origin_id);
200200
i = MtmNodeId-1;
201201
} else {
202-
//Assert(i == MtmNodeId-1 || txn->origin_lsn != InvalidXLogRecPtr);
202+
Assert(i == MtmNodeId-1 || txn->origin_lsn != InvalidXLogRecPtr);
203203
}
204204
pq_sendbyte(out, i+1);
205205
} else {

src/backend/access/transam/twophase.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ EndPrepare(GlobalTransaction gxact)
10661066
if (replorigin_session_origin != InvalidRepOriginId)
10671067
{
10681068
xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
1069-
1069+
Assert(replorigin_session_origin_lsn != 0);
10701070
xl_origin.origin_lsn = replorigin_session_origin_lsn;
10711071
xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
10721072
}
@@ -1316,6 +1316,7 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
13161316
/* we're only guaranteed 4 byte alignment, so copy onto stack */
13171317
memcpy(&xl_origin, bufptr, sizeof(xl_origin));
13181318
parsed->origin_lsn = xl_origin.origin_lsn;
1319+
Assert(parsed->origin_lsn != 0);
13191320
parsed->origin_timestamp = xl_origin.origin_timestamp;
13201321
bufptr += sizeof(xl_xact_origin);
13211322
}

src/backend/access/transam/xact.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5196,7 +5196,6 @@ XactLogCommitRecord(TimestampTz commit_time,
51965196
if (replorigin_session_origin != InvalidRepOriginId)
51975197
{
51985198
xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
5199-
52005199
xl_origin.origin_lsn = replorigin_session_origin_lsn;
52015200
xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
52025201
}

src/backend/replication/logical/decode.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
558558
if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
559559
{
560560
origin_lsn = parsed->origin_lsn;
561+
elog(LOG, "DecodeCommit: xid=%d, origin_lsn=%ld", xid, origin_lsn);
561562
commit_time = parsed->origin_timestamp;
562563
}
563564

@@ -658,6 +659,7 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
658659
if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
659660
{
660661
origin_lsn = parsed->origin_lsn;
662+
elog(LOG, "DecodePrepate: xid=%d (%s), origin_lsn=%ld", xid, parsed->twophase_gid, origin_lsn);
661663
commit_time = parsed->origin_timestamp;
662664
}
663665

0 commit comments

Comments
 (0)