port xtm

Author: kelvich

src/backend/access/transam/Makefile

@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
 OBJS = clog.o commit_ts.o generic_xlog.o multixact.o parallel.o rmgr.o slru.o \
 	subtrans.o timeline.o transam.o twophase.o twophase_rmgr.o varsup.o \
 	xact.o xlog.o xlogarchive.o xlogfuncs.o \
-	xloginsert.o xlogreader.o xlogutils.o
+	xloginsert.o xlogreader.o xlogutils.o xtm.o global_snapshot.o
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/access/transam/clog.c

@@ -38,6 +38,7 @@
 #include "access/xlog.h"
 #include "access/xloginsert.h"
 #include "access/xlogutils.h"
+#include "access/xtm.h"
 #include "miscadmin.h"
 #include "pg_trace.h"
 
@@ -79,6 +80,12 @@ static SlruCtlData ClogCtlData;
 
 #define ClogCtl (&ClogCtlData)
 
+void
+TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
+					TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
+{
+	return TM->SetTransactionStatus(xid, nsubxids, subxids, status, lsn);
+}
 
 static int	ZeroCLOGPage(int64 pageno, bool writeXlog);
 static void WriteZeroPageXlogRec(int64 pageno);
@@ -145,7 +152,7 @@ static void set_status_by_pages(int nsubxids, TransactionId *subxids,
  * cache yet.
  */
 void
-TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
+PgTransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
 						   TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
 {
 	int64		pageno = TransactionIdToPage(xid);	/* get page of parent */
@@ -351,10 +358,10 @@ TransactionIdSetStatusBit(TransactionId xid, XidStatus status, XLogRecPtr lsn, i
 	 * Current state change should be from 0 or subcommitted to target state
 	 * or we should already be there when replaying changes during recovery.
 	 */
-	Assert(curval == 0 ||
-		   (curval == TRANSACTION_STATUS_SUB_COMMITTED &&
-			status != TRANSACTION_STATUS_IN_PROGRESS) ||
-		   curval == status);
+/*	Assert(curval == 0 || */
+/*		   (curval == TRANSACTION_STATUS_SUB_COMMITTED && */
+/*			status != TRANSACTION_STATUS_IN_PROGRESS) || */
+/*		   curval == status); */
 
 	/* note this assumes exclusive access to the clog page */
 	byteval = *byteptr;
@@ -396,6 +403,12 @@ TransactionIdSetStatusBit(TransactionId xid, XidStatus status, XLogRecPtr lsn, i
  */
 XidStatus
 TransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn)
+{
+	return TM->GetTransactionStatus(xid, lsn);
+}
+
+XidStatus
+PgTransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn)
 {
 	int64		pageno = TransactionIdToPage(xid);
 	int			byteno = TransactionIdToByte(xid);