diff options
| -rw-r--r-- | src/backend/access/heap/heapam.c | 6 | ||||
| -rw-r--r-- | src/backend/access/rmgrdesc/heapdesc.c | 4 | ||||
| -rw-r--r-- | src/include/access/heapam_xlog.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index f389ceee1ea..b300a4675e8 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -3567,7 +3567,7 @@ l2: XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); xlrec.offnum = ItemPointerGetOffsetNumber(&oldtup.t_self); - xlrec.locking_xid = xmax_lock_old_tuple; + xlrec.xmax = xmax_lock_old_tuple; xlrec.infobits_set = compute_infobits(oldtup.t_data->t_infomask, oldtup.t_data->t_infomask2); xlrec.flags = @@ -4777,7 +4777,7 @@ failed: XLogRegisterBuffer(0, *buffer, REGBUF_STANDARD); xlrec.offnum = ItemPointerGetOffsetNumber(&tuple->t_self); - xlrec.locking_xid = xid; + xlrec.xmax = xid; xlrec.infobits_set = compute_infobits(new_infomask, tuple->t_data->t_infomask2); xlrec.flags = cleared_all_frozen ? XLH_LOCK_ALL_FROZEN_CLEARED : 0; @@ -9848,7 +9848,7 @@ heap_xlog_lock(XLogReaderState *record) BufferGetBlockNumber(buffer), offnum); } - HeapTupleHeaderSetXmax(htup, xlrec->locking_xid); + HeapTupleHeaderSetXmax(htup, xlrec->xmax); HeapTupleHeaderSetCmax(htup, FirstCommandId, false); PageSetLSN(page, lsn); MarkBufferDirty(buffer); diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c index 3bd08387520..ce6d2ade55b 100644 --- a/src/backend/access/rmgrdesc/heapdesc.c +++ b/src/backend/access/rmgrdesc/heapdesc.c @@ -139,8 +139,8 @@ heap_desc(StringInfo buf, XLogReaderState *record) { xl_heap_lock *xlrec = (xl_heap_lock *) rec; - appendStringInfo(buf, "off: %u, xid: %u, flags: 0x%02X", - xlrec->offnum, xlrec->locking_xid, xlrec->flags); + appendStringInfo(buf, "off: %u, xmax: %u, flags: 0x%02X", + xlrec->offnum, xlrec->xmax, xlrec->flags); out_infobits(buf, xlrec->infobits_set); } else if (info == XLOG_HEAP_INPLACE) diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h index e71d8489522..a038450787e 100644 --- a/src/include/access/heapam_xlog.h +++ b/src/include/access/heapam_xlog.h @@ -279,13 +279,13 @@ typedef struct xl_heap_vacuum /* This is what we need to know about lock */ typedef struct xl_heap_lock { - TransactionId locking_xid; /* might be a MultiXactId not xid */ + TransactionId xmax; /* might be a MultiXactId */ OffsetNumber offnum; /* locked tuple's offset on page */ - int8 infobits_set; /* infomask and infomask2 bits to set */ + uint8 infobits_set; /* infomask and infomask2 bits to set */ uint8 flags; /* XLH_LOCK_* flag bits */ } xl_heap_lock; -#define SizeOfHeapLock (offsetof(xl_heap_lock, flags) + sizeof(int8)) +#define SizeOfHeapLock (offsetof(xl_heap_lock, flags) + sizeof(uint8)) /* This is what we need to know about locking an updated version of a row */ typedef struct xl_heap_lock_updated |