diff options
Diffstat (limited to 'src/backend/access/spgist')
| -rw-r--r-- | src/backend/access/spgist/spgvacuum.c | 8 | ||||
| -rw-r--r-- | src/backend/access/spgist/spgxlog.c | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c index 00496305320..ad90b213b9c 100644 --- a/src/backend/access/spgist/spgvacuum.c +++ b/src/backend/access/spgist/spgvacuum.c @@ -504,7 +504,7 @@ vacuumRedirectAndPlaceholder(Relation index, Buffer buffer) GlobalVisState *vistest; xlrec.nToPlaceholder = 0; - xlrec.newestRedirectXid = InvalidTransactionId; + xlrec.snapshotConflictHorizon = InvalidTransactionId; /* XXX: providing heap relation would allow more pruning */ vistest = GlobalVisTestFor(NULL); @@ -533,9 +533,9 @@ vacuumRedirectAndPlaceholder(Relation index, Buffer buffer) opaque->nPlaceholder++; /* remember newest XID among the removed redirects */ - if (!TransactionIdIsValid(xlrec.newestRedirectXid) || - TransactionIdPrecedes(xlrec.newestRedirectXid, dt->xid)) - xlrec.newestRedirectXid = dt->xid; + if (!TransactionIdIsValid(xlrec.snapshotConflictHorizon) || + TransactionIdPrecedes(xlrec.snapshotConflictHorizon, dt->xid)) + xlrec.snapshotConflictHorizon = dt->xid; ItemPointerSetInvalid(&dt->pointer); diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c index 4c9f4020ff8..44adc2098f9 100644 --- a/src/backend/access/spgist/spgxlog.c +++ b/src/backend/access/spgist/spgxlog.c @@ -875,14 +875,11 @@ spgRedoVacuumRedirect(XLogReaderState *record) */ if (InHotStandby) { - if (TransactionIdIsValid(xldata->newestRedirectXid)) - { - RelFileLocator locator; + RelFileLocator locator; - XLogRecGetBlockTag(record, 0, &locator, NULL, NULL); - ResolveRecoveryConflictWithSnapshot(xldata->newestRedirectXid, - locator); - } + XLogRecGetBlockTag(record, 0, &locator, NULL, NULL); + ResolveRecoveryConflictWithSnapshot(xldata->snapshotConflictHorizon, + locator); } if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO) |