postgrespro.git / summary / log / commit / refs

commit    f01157e2ac8ac4dff8ba159c36edf2fdb7d6704e
Author:   Peter Geoghegan <pg@bowt.ie>
Date:     Tue Mar 31 00:34:12 2020 +0000

    Further simplify nbtree high key truncation.
    
    Commit 7c2dbc69 reorganized _bt_truncate() in a way that enables a
    further simplification that I (pgeoghegan) missed:  Since we mark the
    tuple that is returned to the caller as a pivot tuple before the point
    where its heap TID is set as of 7c2dbc69, it is possible to use the high
    level BTreeTupleGetHeapTID() inline function to get an item pointer.  Do
    it that way now.  This approach is clearer and more maintainable.


 src/backend/access/nbtree/nbtutils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 610c7de1e5..aaa0c89c7d 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -2251,6 +2251,7 @@ _bt_truncate(Relation rel, IndexTuple lastleft, IndexTuple firstright,
 	tidpivot->t_info |= newsize;
 	BTreeTupleSetNAtts(tidpivot, nkeyatts);
 	BTreeTupleSetAltHeapTID(tidpivot);
+	pivotheaptid = BTreeTupleGetHeapTID(tidpivot);
 
 	/*
 	 * Lehman & Yao use lastleft as the leaf high key in all cases, but don't
@@ -2259,8 +2260,6 @@ _bt_truncate(Relation rel, IndexTuple lastleft, IndexTuple firstright,
 	 * TID.  (This is also the closest value to negative infinity that's
 	 * legally usable.)
 	 */
-	pivotheaptid = (ItemPointer) ((char *) tidpivot + newsize -
-								  sizeof(ItemPointerData));
 	ItemPointerCopy(BTreeTupleGetMaxHeapTID(lastleft), pivotheaptid);
 
 	/*


[parent: dd9ac7d5d806]