Yet another not working version of XTM

knizhnik · knizhnik · commit 2485a593d84b · 2015-09-16T11:48:24.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -33,6 +33,9 @@
 
 #include "libdtm.h"
 
+#define MIN_DELAY  10000
+#define MAX_DELAY 100000
+
 void _PG_init(void);
 void _PG_fini(void);
 
@@ -121,30 +124,41 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
     return snapshot;
 }
 
-#if 0
 static bool IsInDtmSnapshot(TransactionId xid)
 {
     return DtmHasSnapshot
         && (/*xid > DtmSnapshot.xmax 
               || */bsearch(&xid, DtmSnapshot.xip, DtmSnapshot.xcnt, sizeof(TransactionId), xidComparator) != NULL);
 }
-#endif
         
 static bool DtmTransactionIsInProgress(TransactionId xid)
 {
-    return /*IsInDtmSnapshot(xid) || */ TransactionIdIsRunning(xid);
+#if 0
+    if (IsInDtmSnapshot(xid)) { 
+        unsigned delay = MIN_DELAY;
+        XLogRecPtr lsn;
+        while (CLOGTransactionIdGetStatus(xid, &lsn) == TRANSACTION_STATUS_IN_PROGRESS) { 
+            pg_usleep(delay);
+            if (delay < MAX_DELAY)  { 
+                delay *= 2;
+            }
+        }
+        return false;
+    }
+#endif
+    return TransactionIdIsRunning(xid) && !IsInDtmSnapshot(xid);
 }
 
 static XidStatus DtmGetGloabalTransStatus(TransactionId xid)
 {
-    unsigned delay = 1000;
+    unsigned delay = MIN_DELAY;
     while (true) { 
         XidStatus status;
         DtmEnsureConnection();    
         status = DtmGlobalGetTransStatus(DtmConn, DtmNodeId, xid);
         if (status == TRANSACTION_STATUS_IN_PROGRESS) { 
             pg_usleep(delay);
-            if (delay < 100000)  { 
+            if (delay < MAX_DELAY)  { 
                 delay *= 2;
             }
         } else { 
@@ -155,16 +169,17 @@ static XidStatus DtmGetGloabalTransStatus(TransactionId xid)
 
 static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn)
 {
-    XidStatus status = CLOGTransactionIdGetStatus(xid, lsn);
-#if 0
-    if (status == TRANSACTION_STATUS_IN_PROGRESS) { 
-        status = DtmGetGloabalTransStatus(xid);
-        if (status == TRANSACTION_STATUS_UNKNOWN) { 
-            status = TRANSACTION_STATUS_IN_PROGRESS;
+    if (IsInDtmSnapshot(xid)) { 
+        unsigned delay = MIN_DELAY;
+        XLogRecPtr lsn;
+        while (CLOGTransactionIdGetStatus(xid, &lsn) == TRANSACTION_STATUS_IN_PROGRESS) { 
+            pg_usleep(delay);
+            if (delay < MAX_DELAY)  { 
+                delay *= 2;
+            }
         }
     }
-#endif
-    return status;
+    return CLOGTransactionIdGetStatus(xid, lsn);
 }
 
 
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -3399,8 +3399,6 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 			TransactionId update_xact;
 			int			remain;
 
-            *(int*)0 = 0;
-
 			if (DoesMultiXactIdConflict((MultiXactId) xwait, infomask,
 										*lockmode))
 			{
@@ -3632,6 +3630,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	newtup->t_data->t_infomask2 |= infomask2_new_tuple;
 	HeapTupleHeaderSetXmax(newtup->t_data, xmax_new_tuple);
 
+#if 0
     { 
         char buf[256];
         sprintf(buf, "backend-%d.trace", getpid());
@@ -3649,6 +3648,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
         fclose(f);
     }
     Assert(xmax_new_tuple != xid || (newtup->t_data->t_infomask & HEAP_XMAX_LOCK_ONLY) != 0);
+#endif
 
 	/*
 	 * Replace cid with a combo cid if necessary.  Note that we already put
