Add IsInProgress method to XTM API

knizhnik · knizhnik · commit ae47bde61dc0 · 2015-09-13T23:22:08.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -44,12 +44,13 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction
 static XidStatus DtmGetGloabalTransStatus(TransactionId xid);
 static void DtmUpdateRecentXmin(void);
 static bool IsInDtmSnapshot(TransactionId xid);
+static bool DtmTransactionIsInProgress(TransactionId xid);
 
 static NodeId DtmNodeId;
 static DTMConn DtmConn;
 static SnapshotData DtmSnapshot = {HeapTupleSatisfiesMVCC};
 static bool DtmHasSnapshot = false;
-static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot };
+static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot, DtmTransactionIsInProgress };
 static DTMConn DtmConn;
 
 static void DtmEnsureConnection(void)
@@ -78,7 +79,7 @@ static void DtmUpdateRecentXmin(void)
 {
     TransactionId xmin = DtmSnapshot.xmin;
     if (xmin != InvalidTransactionId) { 
-        xmin -= vacuum_defer_cleanup_age;
+        xmin -= vacuum_defer_cleanup_age;        
         if (!TransactionIdIsNormal(xmin)) {
             xmin = FirstNormalTransactionId;
         }
@@ -107,17 +108,22 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
 static bool IsInDtmSnapshot(TransactionId xid)
 {
     return DtmHasSnapshot
-        && (xid > DtmSnapshot.xmax 
-            || bsearch(&xid, DtmSnapshot.xip, DtmSnapshot.xcnt, sizeof(TransactionId), xidComparator) != NULL);
+        && (/*xid > DtmSnapshot.xmax 
+              || */bsearch(&xid, DtmSnapshot.xip, DtmSnapshot.xcnt, sizeof(TransactionId), xidComparator) != NULL);
 }
         
+static bool DtmTransactionIsInProgress(TransactionId xid)
+{
+    return IsInDtmSnapshot(xid) || TransactionIdIsRunning(xid);
+}
 
 static XidStatus DtmGetGloabalTransStatus(TransactionId xid)
 {
     unsigned delay = 1000;
     while (true) { 
+        XidStatus status;
         DtmEnsureConnection();    
-        XidStatus status = DtmGlobalGetTransStatus(DtmConn, DtmNodeId, xid);
+        status = DtmGlobalGetTransStatus(DtmConn, DtmNodeId, xid);
         if (status == TRANSACTION_STATUS_IN_PROGRESS) { 
             pg_usleep(delay);
             if (delay < 100000)  { 
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
@@ -44,7 +44,7 @@
 #include "miscadmin.h"
 #include "pg_trace.h"
 
-TransactionManager DefaultTM = { CLOGTransactionIdGetStatus, CLOGTransactionIdSetTreeStatus, GetLocalSnapshotData };
+TransactionManager DefaultTM = { CLOGTransactionIdGetStatus, CLOGTransactionIdSetTreeStatus, GetLocalSnapshotData, TransactionIdIsRunning };
 TransactionManager* TM = &DefaultTM;
 
 /*
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -945,6 +945,12 @@ ProcArrayApplyXidAssignment(TransactionId topxid,
 	LWLockRelease(ProcArrayLock);
 }
 
+bool
+TransactionIdIsInProgress(TransactionId xid)
+{
+    TM->IsInProgress(xid);
+}
+
 /*
  * TransactionIdIsInProgress -- is given transaction running in some backend
  *
@@ -972,7 +978,7 @@ ProcArrayApplyXidAssignment(TransactionId topxid,
  * PGXACT again anyway; see GetNewTransactionId).
  */
 bool
-TransactionIdIsInProgress(TransactionId xid)
+TransactionIdIsRunning(TransactionId xid)
 {
 	static TransactionId *xids = NULL;
 	int			nxids = 0;
@@ -3867,42 +3873,3 @@ KnownAssignedXidsReset(void)
 	LWLockRelease(ProcArrayLock);
 }
 
-static bool TransactionIsStillInProgress(TransactionId xid, Snapshot snapshot)
-{
-    return (xid > snapshot->xmax) || (bsearch(&xid, snapshot->xip, snapshot->xcnt, sizeof(TransactionId), xidComparator) != NULL);
-}
-
-
-void VacuumProcArray(Snapshot snapshot)
-{
-    int i;
-    int nInProgress = 0;
-    int nCompleted = 0;
-	ProcArrayStruct *arrayP = procArray;
-
-	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
-	for (i = arrayP->numProcs; --i >= 0;)
-	{
-		int		pgprocno = arrayP->pgprocnos[i];
-		PGXACT *pgxact = &allPgXact[pgprocno];
-		TransactionId pxid = pgxact->xid;
-        
- 		if (!TransactionIdIsValid(pxid)) {
-			continue;
-        }
-        if (TransactionIsStillInProgress(pxid, snapshot)) { 
-            //elog(WARNING, "procArray[%d]=%d is in progress\n", i, pxid);
-            nInProgress += 1;
-            continue;
-        }
-        if (RemoveGXid(pxid)) { 
-            nCompleted += 1;
-            memmove(&arrayP->pgprocnos[i], &arrayP->pgprocnos[i + 1],
-                    (arrayP->numProcs - i - 1) * sizeof(int));
-            arrayP->pgprocnos[arrayP->numProcs - 1] = -1;		/* for debugging */
-            arrayP->numProcs--;
-        }
-    }
-	LWLockRelease(ProcArrayLock);
-    elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);
-}
diff --git a/src/include/access/xtm.h b/src/include/access/xtm.h
@@ -19,6 +19,7 @@ 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
@@ -52,6 +52,7 @@ extern bool ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc);
 
 extern RunningTransactions GetRunningTransactionData(void);
 
+extern bool TransactionIdIsRunning(TransactionId xid);
 extern bool TransactionIdIsInProgress(TransactionId xid);
 extern bool TransactionIdIsActive(TransactionId xid);
 extern TransactionId GetOldestXmin(Relation rel, bool ignoreVacuum);
