diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index f28326bad0..175f83cf64 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -2249,6 +2249,7 @@ lazy_scan_noprune(LVRelState *vacrel, missed_dead_tuples; bool hastup; HeapTupleHeader tupleheader; + HeapTupleData tuple; TransactionId NoFreezePageRelfrozenXid = vacrel->NewRelfrozenXid; MultiXactId NoFreezePageRelminMxid = vacrel->NewRelminMxid; OffsetNumber deadoffsets[MaxHeapTuplesPerPage]; @@ -2262,13 +2263,16 @@ lazy_scan_noprune(LVRelState *vacrel, recently_dead_tuples = 0; missed_dead_tuples = 0; + /* block and tableOid is the same for all tuples, set it once outside the loop */ + ItemPointerSetBlockNumber(&tuple.t_self, blkno); + tuple.t_tableOid = RelationGetRelid(vacrel->rel); + maxoff = PageGetMaxOffsetNumber(page); for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum = OffsetNumberNext(offnum)) { ItemId itemid; - HeapTupleData tuple; vacrel->offnum = offnum; itemid = PageGetItemId(page, offnum); @@ -2326,10 +2330,9 @@ lazy_scan_noprune(LVRelState *vacrel, */ } - ItemPointerSet(&(tuple.t_self), blkno, offnum); tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid); tuple.t_len = ItemIdGetLength(itemid); - tuple.t_tableOid = RelationGetRelid(vacrel->rel); + ItemPointerSetOffsetNumber(&tuple.t_self, offnum); switch (HeapTupleSatisfiesVacuum(&tuple, vacrel->cutoffs.OldestXmin, buf)) @@ -3621,17 +3624,21 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, OffsetNumber offnum, maxoff; bool all_visible = true; + HeapTupleData tuple; *visibility_cutoff_xid = InvalidTransactionId; *all_frozen = true; + /* block and tableOid is the same for all tuples, set it once outside the loop */ + ItemPointerSetBlockNumber(&tuple.t_self, blockno); + tuple.t_tableOid = RelationGetRelid(vacrel->rel); + maxoff = PageGetMaxOffsetNumber(page); for (offnum = FirstOffsetNumber; offnum <= maxoff && all_visible; offnum = OffsetNumberNext(offnum)) { ItemId itemid; - HeapTupleData tuple; /* * Set the offset number so that we can display it along with any @@ -3644,8 +3651,6 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, if (!ItemIdIsUsed(itemid) || ItemIdIsRedirected(itemid)) continue; - ItemPointerSet(&(tuple.t_self), blockno, offnum); - /* * Dead line pointers can have index pointers pointing to them. So * they can't be treated as visible @@ -3661,7 +3666,7 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid); tuple.t_len = ItemIdGetLength(itemid); - tuple.t_tableOid = RelationGetRelid(vacrel->rel); + ItemPointerSetOffsetNumber(&tuple.t_self, offnum); switch (HeapTupleSatisfiesVacuum(&tuple, vacrel->cutoffs.OldestXmin, buf))