diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/heap/heapam.c | 44 | ||||
| -rw-r--r-- | src/backend/access/heap/pruneheap.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/execMain.c | 6 | ||||
| -rw-r--r-- | src/include/access/heapam.h | 3 |
4 files changed, 46 insertions, 11 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index e00dc6c1ca9..a7dffd151ab 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -1718,8 +1718,7 @@ heap_hot_search_buffer(ItemPointer tid, Relation relation, Buffer buffer, * broken. */ if (TransactionIdIsValid(prev_xmax) && - !TransactionIdEquals(prev_xmax, - HeapTupleHeaderGetXmin(heapTuple->t_data))) + !HeapTupleUpdateXmaxMatchesXmin(prev_xmax, heapTuple->t_data)) break; /* @@ -1888,7 +1887,7 @@ heap_get_latest_tid(Relation relation, * tuple. Check for XMIN match. */ if (TransactionIdIsValid(priorXmax) && - !TransactionIdEquals(priorXmax, HeapTupleHeaderGetXmin(tp.t_data))) + !HeapTupleUpdateXmaxMatchesXmin(priorXmax, tp.t_data)) { UnlockReleaseBuffer(buffer); break; @@ -1920,6 +1919,39 @@ heap_get_latest_tid(Relation relation, } /* end of loop */ } +/* + * HeapTupleUpdateXmaxMatchesXmin - verify update chain xmax/xmin lineage + * + * Given the new version of a tuple after some update, verify whether the + * given Xmax (corresponding to the previous version) matches the tuple's + * Xmin, taking into account that the Xmin might have been frozen after the + * update. + */ +bool +HeapTupleUpdateXmaxMatchesXmin(TransactionId xmax, HeapTupleHeader htup) +{ + TransactionId xmin = HeapTupleHeaderGetXmin(htup); + + /* + * If the xmax of the old tuple is identical to the xmin of the new one, + * it's a match. + */ + if (TransactionIdEquals(xmax, xmin)) + return true; + + /* + * When a tuple is frozen, the original Xmin is lost, but we know it's a + * committed transaction. So unless the Xmax is InvalidXid, we don't know + * for certain that there is a match, but there may be one; and we must + * return true so that a HOT chain that is half-frozen can be walked + * correctly. + */ + if (TransactionIdEquals(xmin, FrozenTransactionId) && + TransactionIdIsValid(xmax)) + return true; + + return false; +} /* * UpdateXmaxHintBits - update tuple hint bits after xmax transaction ends @@ -5045,8 +5077,7 @@ l4: * the end of the chain, we're done, so return success. */ if (TransactionIdIsValid(priorXmax) && - !TransactionIdEquals(HeapTupleHeaderGetXmin(mytup.t_data), - priorXmax)) + !HeapTupleUpdateXmaxMatchesXmin(priorXmax, mytup.t_data)) { UnlockReleaseBuffer(buf); return HeapTupleMayBeUpdated; @@ -5500,7 +5531,10 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask, if (TransactionIdPrecedes(xid, cutoff_xid)) { if (TransactionIdDidCommit(xid)) + { + xid = FrozenTransactionId; *flags = FRM_MARK_COMMITTED | FRM_RETURN_IS_XID; + } else { *flags |= FRM_INVALIDATE_XMAX; diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 9a8db74cb95..a342f57f42f 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -435,7 +435,7 @@ heap_prune_chain(Relation relation, Buffer buffer, OffsetNumber rootoffnum, * Check the tuple XMIN against prior XMAX, if any */ if (TransactionIdIsValid(priorXmax) && - !TransactionIdEquals(HeapTupleHeaderGetXmin(htup), priorXmax)) + !HeapTupleUpdateXmaxMatchesXmin(priorXmax, htup)) break; /* @@ -774,7 +774,7 @@ heap_get_root_tuples(Page page, OffsetNumber *root_offsets) htup = (HeapTupleHeader) PageGetItem(page, lp); if (TransactionIdIsValid(priorXmax) && - !TransactionIdEquals(priorXmax, HeapTupleHeaderGetXmin(htup))) + !HeapTupleUpdateXmaxMatchesXmin(priorXmax, htup)) break; /* Remember the root line pointer for this item */ diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 315a555dcff..79e4701bb8a 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -2019,8 +2019,7 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode, * buffer's content lock, since xmin never changes in an existing * tuple.) */ - if (!TransactionIdEquals(HeapTupleHeaderGetXmin(tuple.t_data), - priorXmax)) + if (!HeapTupleUpdateXmaxMatchesXmin(priorXmax, tuple.t_data)) { ReleaseBuffer(buffer); return NULL; @@ -2138,8 +2137,7 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode, /* * As above, if xmin isn't what we're expecting, do nothing. */ - if (!TransactionIdEquals(HeapTupleHeaderGetXmin(tuple.t_data), - priorXmax)) + if (!HeapTupleUpdateXmaxMatchesXmin(priorXmax, tuple.t_data)) { ReleaseBuffer(buffer); return NULL; diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 4a187f899cf..93a481f4831 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -127,6 +127,9 @@ extern void heap_get_latest_tid(Relation relation, Snapshot snapshot, ItemPointer tid); extern void setLastTid(const ItemPointer tid); +extern bool HeapTupleUpdateXmaxMatchesXmin(TransactionId xmax, + HeapTupleHeader htup); + extern BulkInsertState GetBulkInsertState(void); extern void FreeBulkInsertState(BulkInsertState); |