Merge branch 'xtm' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into xtm

kelvich · kelvich · commit 31dc8b4d7395 · 2015-09-10T19:17:01.000+03:00
diff --git a/contrib/pg_xtm/libdtm.c b/contrib/pg_xtm/libdtm.c
@@ -167,10 +167,11 @@ bool DtmGlobalStartTransaction(DTMConn dtm, GlobalTransactionId *gtid) {
 	return ok;
 }
 
-void DtmInitSnapshot(Snapshot snapshot, int nactive) {
+void DtmInitSnapshot(Snapshot snapshot) 
+{
 	#ifdef TEST
 	if (snapshot->xip == NULL) {
-		snapshot->xip = malloc(nactive * sizeof(TransactionId));
+		snapshot->xip = malloc(snapshot->xcnt * sizeof(TransactionId));
 		// FIXME: is this enough for tests?
 	}
 	#else
@@ -224,7 +225,8 @@ bool DtmGlobalGetSnapshot(DTMConn dtm, NodeId nodeid, TransactionId xid, Snapsho
 	s->xcnt = number;
 	Assert(s->xcnt == number); // the number should definitely fit into xcnt field size
 
-	DtmInitSnapshot(s, s->xcnt);
+	DtmInitSnapshot(s);
+
 	for (i = 0; i < s->xcnt; i++) {
 		if (!dtm_read_hex16(dtm, &number)) return false;
 		s->xip[i] = number;
diff --git a/contrib/pg_xtm/libdtm.h b/contrib/pg_xtm/libdtm.h
@@ -20,7 +20,7 @@ DTMConn DtmConnect(char *host, int port);
 // bad things will happen.
 void DtmDisconnect(DTMConn dtm);
 
-void DtmInitSnapshot(Snapshot snapshot, int nactive);
+void DtmInitSnapshot(Snapshot snapshot);
 
 typedef struct {
     TransactionId* xids;
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -40,13 +40,12 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot);
 static void DtmCopySnapshot(Snapshot dst, Snapshot src);
 static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn);
 static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
-static bool DtmTransactionIsRunning(TransactionId xid);
 static NodeId DtmNodeId;
 
 static DTMConn DtmConn;
 static SnapshotData DtmSnapshot = {HeapTupleSatisfiesMVCC};
 static bool DtmHasSnapshot = false;
-static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot, DtmTransactionIsRunning };
+static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot };
 static DTMConn DtmConn;
 
 static void DtmEnsureConnection(void)
@@ -72,20 +71,12 @@ static void DtmCopySnapshot(Snapshot dst, Snapshot src)
 static Snapshot DtmGetSnapshot(Snapshot snapshot)
 {
     if (DtmHasSnapshot) { 
-        CopyDtmSnapshot(snapshot, &DtmSnapshot);
+        DtmCopySnapshot(snapshot, &DtmSnapshot);
         return snapshot;
     }
     return GetLocalSnapshotData(snapshot);
 }
 
-static bool DtmTransactionIsRunning(TransactionId xid)
-{
-    XLogRecPtr lsn;
-    return DtmHasSnapshot
-        ? DtmGetTransactionStatus(xid, &lsn) == TRANSACTION_STATUS_IN_PROGRESS
-        : TransactionIdIsRunning(xid);
-} 
-
 static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn)
 {
     XidStatus status = CLOGTransactionIdGetStatus(xid, lsn);
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
@@ -43,7 +43,7 @@
 #include "miscadmin.h"
 #include "pg_trace.h"
 
-TransactionManager DefaultTM = { CLOGTransactionIdGetStatus, CLOGTransactionIdSetTreeStatus, GetLocalSnapshotData, TransactionIdIsRunning };
+TransactionManager DefaultTM = { CLOGTransactionIdGetStatus, CLOGTransactionIdSetTreeStatus, GetLocalSnapshotData };
 TransactionManager* TM = &DefaultTM;
 
 /*
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -946,12 +946,6 @@ ProcArrayApplyXidAssignment(TransactionId topxid,
 	LWLockRelease(ProcArrayLock);
 }
 
-bool
-TransactionIdIsInProgress(TransactionId xid)
-{
-    return TM->IsInProgress(xid);
-}
-
 /*
  * TransactionIdIsInProgress -- is given transaction running in some backend
  *
@@ -979,7 +973,7 @@ TransactionIdIsInProgress(TransactionId xid)
  * PGXACT again anyway; see GetNewTransactionId).
  */
 bool
-TransactionIdIsRunning(TransactionId xid)
+TransactionIdIsInProgress(TransactionId xid)
 {
 	static TransactionId *xids = NULL;
 	int			nxids = 0;
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -738,7 +738,7 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
  * token is also returned in snapshot->speculativeToken.
  */
 bool
-HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
+HeapTupleSatisfiesDirtyVerbose(HeapTuple htup, Snapshot snapshot,
 						Buffer buffer)
 {
 	HeapTupleHeader tuple = htup->t_data;
@@ -905,9 +905,11 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
 
 	if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))
 	{
-		if (!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask))
+		if (!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask)) {
 			snapshot->xmax = HeapTupleHeaderGetRawXmax(tuple);
-		return true;
+            return true;
+        }
+        return true;
 	}
 
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
diff --git a/src/include/access/xtm.h b/src/include/access/xtm.h
@@ -19,7 +19,6 @@ typedef struct
     XidStatus (*GetTransactionStatus)(TransactionId xid, XLogRecPtr *lsn);
     void (*SetTransactionStatus)(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
     Snapshot (*GetSnapshot)(Snapshot snapshot);
-    bool (*IsInProgress)(TransactionId xid);
 } TransactionManager;
 
 extern TransactionManager* TM;
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
@@ -53,7 +53,6 @@ extern bool ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc);
 extern RunningTransactions GetRunningTransactionData(void);
 
 extern bool TransactionIdIsInProgress(TransactionId xid);
-extern bool TransactionIdIsRunning(TransactionId xid);
 extern bool TransactionIdIsActive(TransactionId xid);
 extern TransactionId GetOldestXmin(Relation rel, bool ignoreVacuum);
 extern TransactionId GetOldestActiveTransactionId(void);
