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

knizhnik · knizhnik · commit 7ba7388e5800 · 2015-10-21T18:40:01.000+03:00
diff --git a/contrib/pg_dtm/tests/transfers.sh b/contrib/pg_dtm/tests/transfers.sh
@@ -6,5 +6,5 @@ go run transfers.go \
 	-v \
 	-m \
 	-u 100000 \
-	-w 10 \
+	-w 8 \
 	-g
diff --git a/contrib/pg_tsdtm/pg_dtm.c b/contrib/pg_tsdtm/pg_dtm.c
@@ -73,8 +73,6 @@ static HTAB* gtid2xid;
 static DtmNodeState* local;
 static DtmTransState dtm_tx;
 
-//static TransactionId DatmOldestXid = FirstNormalTransactionId;
-//static cid_t DtmOldestCid = INVALID_CID;
 static int DtmVacuumDelay;
 
 static Snapshot DtmGetSnapshot(Snapshot snapshot);
@@ -301,8 +299,7 @@ Datum
 dtm_begin_prepare(PG_FUNCTION_ARGS)
 {
     GlobalTransactionId gtid = PG_GETARG_CSTRING(0);
-    nodeid_t coordinator = PG_GETARG_INT32(1);
-    DtmLocalBeginPrepare(gtid, coordinator);
+    DtmLocalBeginPrepare(gtid);
 	DTM_TRACE((stderr, "Backend %d begins prepare of transaction %s\n", getpid(), gtid));
 	PG_RETURN_VOID();
 }
@@ -375,7 +372,6 @@ static TransactionId DtmAdjustOldestXid(TransactionId xid)
         DtmTransStatus *ts, *prev = NULL;
         timestamp_t cutoff_time = dtm_get_current_time() - DtmVacuumDelay*USEC;
         SpinLockAcquire(&local->lock);
-#if 1
         for (ts = local->trans_list_head; ts != NULL && ts->cid < cutoff_time; prev = ts, ts = ts->next) { 
             if (prev != NULL) { 
                 hash_search(xid2status, &prev->xid, HASH_REMOVE, NULL);
@@ -387,16 +383,6 @@ static TransactionId DtmAdjustOldestXid(TransactionId xid)
         } else { 
             xid = FirstNormalTransactionId;
         }
-#else               
-        ts = (DtmTransStatus*)hash_search(xid2status, &xid, HASH_FIND, NULL);
-        if (ts == NULL || ts->cid + DtmVacuumDelay*USEC > dtm_get_current_time()) { 
-            xid = DtmOldestXid;
-        } else /*if (ts->cid > DtmOldestCid)*/ { 
-            DTM_TRACE(("Set new oldest xid=%u csn=%lu now=%lu\n", xid, ts->cid, dtm_get_current_time()));
-            DtmOldestXid = xid;
-            DtmOldestCid = ts->cid;
-        }
-#endif
         SpinLockRelease(&local->lock);
     }
     return xid;
@@ -419,7 +405,6 @@ TransactionId DtmGetOldestXmin(Relation rel, bool ignoreVacuum)
 bool DtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
 {
     timestamp_t delay = MIN_WAIT_TIMEOUT;
-
     Assert(xid != InvalidTransactionId);
 
     SpinLockAcquire(&local->lock);
diff --git a/contrib/pg_tsdtm/pg_dtm.h b/contrib/pg_tsdtm/pg_dtm.h
@@ -23,7 +23,7 @@ cid_t DtmLocalExtend(DtmTransState* x, GlobalTransactionId gtid);
 /* Function called at first access to any datanode except first one involved in distributed transaction */
 cid_t DtmLocalAccess(DtmTransState* x, GlobalTransactionId gtid, cid_t snapshot);
 /* Mark transaction as in-doubt */
-void  DtmLocalBeginPrepare(GlobalTransactionId gtid, nodeid_t coordinator);
+void  DtmLocalBeginPrepare(GlobalTransactionId gtid);
 /* Choose CSN for global transaction */
 cid_t DtmLocalPrepare(GlobalTransactionId gtid, cid_t cid);
 /* Assign CSN to global transaction */
diff --git a/contrib/pg_tsdtm/tests/transfers.go b/contrib/pg_tsdtm/tests/transfers.go
@@ -11,7 +11,7 @@ import (
 const (
     TRANSFER_CONNECTIONS = 8
     INIT_AMOUNT = 10000
-    N_ITERATIONS = 100000
+    N_ITERATIONS = 10000//0
     N_ACCOUNTS = 2//100000
 )
 
@@ -92,6 +92,8 @@ func transfer(id int, wg *sync.WaitGroup) {
     var snapshot int64
     var csn int64
 
+    nGlobalTrans := 0
+    
     conn1, err := pgx.Connect(cfg1)
     checkErr(err)
     defer conn1.Close()
@@ -101,38 +103,62 @@ func transfer(id int, wg *sync.WaitGroup) {
     defer conn2.Close()
 
     for i := 0; i < N_ITERATIONS; i++ {
+        var dst *pgx.Conn
+        var src *pgx.Conn       
+        choice := rand.Intn(3)-1
         gtid := strconv.Itoa(id) + "." + strconv.Itoa(i)
+        if choice < 0 { 
+            src = conn1
+            dst = conn1
+            exec(conn1, "begin transaction")
+        } else if choice > 0 { 
+            src = conn2
+            dst = conn2
+            exec(conn2, "begin transaction")
+        } else { 
+            src = conn1
+            dst = conn2
+            exec(conn1, "begin transaction")
+            exec(conn2, "begin transaction")
+            snapshot = execQuery(conn1, "select dtm_extend($1)", gtid)
+            snapshot = execQuery(conn2, "select dtm_access($1, $2)", snapshot, gtid)
+        } 
         //amount := 2*rand.Intn(2) - 1
         amount := 1
         account1 := rand.Intn(N_ACCOUNTS) 
         account2 := rand.Intn(N_ACCOUNTS)
+        
+        if account1 > account2 {
+           tmp := account1
+           account1 = account2
+           account2 = tmp
+        }
 
-        exec(conn1, "begin transaction")
-        exec(conn2, "begin transaction")
-
-        snapshot = execQuery(conn1, "select dtm_extend($1)", gtid)
-        snapshot = execQuery(conn2, "select dtm_access($1, $2)", snapshot, gtid)
-
-        exec(conn1, "update t set v = v + $1 where u=$2", amount, account1)
-        exec(conn2, "update t set v = v - $1 where u=$2", amount, account2)
+        exec(src, "update t set v = v - $1 where u=$2", amount, account1)
+        exec(dst, "update t set v = v + $1 where u=$2", amount, account2)
 
-        exec(conn1, "prepare transaction '" + gtid + "'")
-        exec(conn2, "prepare transaction '" + gtid + "'")
+        if (src != dst) {
+            exec(conn1, "prepare transaction '" + gtid + "'")
+            exec(conn2, "prepare transaction '" + gtid + "'")
 
-        exec(conn1, "select dtm_begin_prepare($1)", gtid)
-        exec(conn2, "select dtm_begin_prepare($1)", gtid)
+            exec(conn1, "select dtm_begin_prepare($1)", gtid)
+            exec(conn2, "select dtm_begin_prepare($1)", gtid)
 
-        csn = execQuery(conn1, "select dtm_prepare($1, 0)", gtid)
-        csn = execQuery(conn2, "select dtm_prepare($1, $2)", gtid, csn)
+            csn = execQuery(conn1, "select dtm_prepare($1, 0)", gtid)
+            csn = execQuery(conn2, "select dtm_prepare($1, $2)", gtid, csn)
 
-        exec(conn1, "select dtm_end_prepare($1, $2)", gtid, csn)
-        exec(conn2, "select dtm_end_prepare($1, $2)", gtid, csn)
+            exec(conn1, "select dtm_end_prepare($1, $2)", gtid, csn)
+            exec(conn2, "select dtm_end_prepare($1, $2)", gtid, csn)
 
-        exec(conn1, "commit prepared '" + gtid + "'")
-        exec(conn2, "commit prepared '" + gtid + "'")
-    }
+            exec(conn1, "commit prepared '" + gtid + "'")
+            exec(conn2, "commit prepared '" + gtid + "'")
+            nGlobalTrans++
+        } else {
+            exec(dst, "commit")            
+        } 
+    } 
 
-    fmt.Println("Test completed")
+    fmt.Printf("Test completed, performed %d global transactions\n", nGlobalTrans)
     wg.Done()
 }
 

-Original file line number
+Diff line change
 	-v \
 	-m \
 	-u 100000 \
 -	-w 10 \
 +	-w 8 \
 	-g