Some fixes.

Alexander Korotkov · Alexander Korotkov · commit a2f01b97f135 · 2016-10-17T19:50:57.000+03:00
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
@@ -567,7 +567,6 @@ heap_getsysattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
 		case ObjectIdAttributeNumber:
 			result = ObjectIdGetDatum(HeapTupleGetOid(tup));
 			break;
-		/* FIXME */
 		case MinTransactionIdAttributeNumber:
 			result = TransactionIdGetDatum(HeapTupleGetRawXmin(tup));
 			break;
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -2292,8 +2292,7 @@ heap_get_latest_tid(Relation relation,
 static void
 UpdateXmaxHintBits(HeapTupleHeader tuple, Buffer buffer, TransactionId xid)
 {
-	/* FIXME */
-	/*Assert(TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple), xid));*/
+	Assert(TransactionIdEquals(HeapTupleHeaderGetRawXmax(BufferGetPage(buffer), tuple), xid));
 	Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));
 
 	if (!(tuple->t_infomask & (HEAP_XMAX_COMMITTED | HEAP_XMAX_INVALID)))
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
@@ -515,8 +515,7 @@ lookup_C_func(HeapTuple procedureTuple)
 					NULL);
 	if (entry == NULL)
 		return NULL;			/* no such entry */
-	/* FIXME */
-	if (/*entry->fn_xmin == HeapTupleHeaderGetRawXmin(procedureTuple->t_data) &&*/
+	if (entry->fn_xmin == HeapTupleGetRawXmin(procedureTuple) &&
 		ItemPointerEquals(&entry->fn_tid, &procedureTuple->t_self))
 		return entry;			/* OK */
 	return NULL;				/* entry is out of date */
@@ -553,8 +552,7 @@ record_C_func(HeapTuple procedureTuple,
 					HASH_ENTER,
 					&found);
 	/* OID is already filled in */
-	/* FIXME */
-	/*entry->fn_xmin = HeapTupleHeaderGetRawXmin(procedureTuple->t_data);*/
+	entry->fn_xmin = HeapTupleGetRawXmin(procedureTuple);
 	entry->fn_tid = procedureTuple->t_self;
 	entry->user_fn = user_fn;
 	entry->inforec = inforec;
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
@@ -396,6 +396,13 @@ struct HeapTupleHeaderData
 		(tup)->t_data->t_choice.t_heap.t_xmax) \
 )
 
+#define HeapTupleHeaderGetRawXmax(page, tup) \
+( \
+	ShortTransactionIdToNormal( \
+		((tup)->t_infomask & HEAP_XMAX_IS_MULTI) ? ((PageHeader)(page))->pd_multi_epoch : ((PageHeader)(page))->pd_xid_epoch, \
+		(tup)->t_choice.t_heap.t_xmax) \
+)
+
 #define HeapTupleSetXmax(tup, xid) \
 ( \
 	(tup)->t_data->t_choice.t_heap.t_xmax = \

Original file line number	Diff line number	Diff line change
`@@ -2292,8 +2292,7 @@ heap_get_latest_tid(Relation relation,`
`2292`	`2292`	`static void`
`2293`	`2293`	`UpdateXmaxHintBits(HeapTupleHeader tuple, Buffer buffer, TransactionId xid)`
`2294`	`2294`	`{`
`2295`		`- /* FIXME */`
`2296`		`- /Assert(TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple), xid));/`
	`2295`	`+ Assert(TransactionIdEquals(HeapTupleHeaderGetRawXmax(BufferGetPage(buffer), tuple), xid));`
`2297`	`2296`	`Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));`
`2298`	`2297`
`2299`	`2298`	`if (!(tuple->t_infomask & (HEAP_XMAX_COMMITTED \| HEAP_XMAX_INVALID)))`