Use iptr of RumSortItem

Artur Zakirov · Artur Zakirov · commit abba8f5aff83 · 2016-06-01T17:50:16.000+03:00
diff --git a/rumsort.c b/rumsort.c
@@ -3849,8 +3849,6 @@ comparetup_rum(const SortTuple *a, const SortTuple *b, Tuplesortstate *state)
 	float8		v1 = DatumGetFloat8(a->datum1);
 	float8		v2 = DatumGetFloat8(b->datum1);
 	int			i;
-	IndexTuple	tuple1;
-	IndexTuple	tuple2;
 
 	if (v1 < v2)
 		return -1;
@@ -3868,22 +3866,18 @@ comparetup_rum(const SortTuple *a, const SortTuple *b, Tuplesortstate *state)
 	}
 
 	/*
-	 * If key values are equal, we sort on ItemPointer.  This does not affect
-	 * validity of the finished index, but it may be useful to have index
-	 * scans in physical order.
+	 * If key values are equal, we sort on ItemPointer.
 	 */
-	tuple1 = (IndexTuple) a->tuple;
-	tuple2 = (IndexTuple) b->tuple;
 	{
-		BlockNumber blk1 = ItemPointerGetBlockNumber(&tuple1->t_tid);
-		BlockNumber blk2 = ItemPointerGetBlockNumber(&tuple2->t_tid);
+		BlockNumber blk1 = ItemPointerGetBlockNumber(&i1->iptr);
+		BlockNumber blk2 = ItemPointerGetBlockNumber(&i2->iptr);
 
 		if (blk1 != blk2)
 			return (blk1 < blk2) ? -1 : 1;
 	}
 	{
-		OffsetNumber pos1 = ItemPointerGetOffsetNumber(&tuple1->t_tid);
-		OffsetNumber pos2 = ItemPointerGetOffsetNumber(&tuple2->t_tid);
+		OffsetNumber pos1 = ItemPointerGetOffsetNumber(&i1->iptr);
+		OffsetNumber pos2 = ItemPointerGetOffsetNumber(&i2->iptr);
 
 		if (pos1 != pos2)
 			return (pos1 < pos2) ? -1 : 1;
