Add local transaction to the transfers test.

kvap · kvap · commit c7644baaa703 · 2015-09-25T14:05:11.000+03:00
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -115,13 +115,15 @@ func transfer(id int, cCommits chan int, cAborts chan int, wg *sync.WaitGroup) {
     var nCommits = 0
     var myCommits = 0
 
-    conn1, err := pgx.Connect(cfg1)
+    var conn [2]*pgx.Conn
+
+    conn[0], err = pgx.Connect(cfg1)
     checkErr(err)
-    defer conn1.Close()
+    defer conn[0].Close()
 
-    conn2, err := pgx.Connect(cfg2)
+    conn[1], err = pgx.Connect(cfg2)
     checkErr(err)
-    defer conn2.Close()
+    defer conn[1].Close()
 
     start := time.Now()
     for myCommits < N_ITERATIONS {
@@ -130,23 +132,43 @@ func transfer(id int, cCommits chan int, cAborts chan int, wg *sync.WaitGroup) {
         account1 := rand.Intn(N_ACCOUNTS)
         account2 := rand.Intn(N_ACCOUNTS)
 
-        xid = execQuery(conn1, "select dtm_begin_transaction(2)")
-        exec(conn2, "select dtm_join_transaction($1)", xid)
-
-        // start transaction
-        exec(conn1, "begin transaction isolation level " + ISOLATION_LEVEL)
-        exec(conn2, "begin transaction isolation level " + ISOLATION_LEVEL)
-
-        ok1 := execUpdate(conn1, "update t set v = v + $1 where u=$2", amount, account1)
-        ok2 := execUpdate(conn2, "update t set v = v - $1 where u=$2", amount, account2)
-        if !ok1 || !ok2 {
-            exec(conn1, "rollback")
-            exec(conn2, "rollback")
-            nAborts += 1
+        src := conn[rand.Intn(2)]
+        dst := conn[rand.Intn(2)]
+
+        if src == dst {
+            // local transaction
+            exec(src, "begin transaction isolation level " + ISOLATION_LEVEL)
+            ok1 := execUpdate(src, "update t set v = v - $1 where u=$2", amount, account1)
+            ok2 := execUpdate(src, "update t set v = v + $1 where u=$2", amount, account2)
+            if !ok1 || !ok2 {
+                exec(src, "rollback")
+                nAborts += 1
+            } else {
+                exec(src, "commit")
+                nCommits += 1
+                myCommits += 1
+            }
         } else {
-            commit(conn1, conn2)
-            nCommits += 1
-            myCommits += 1
+            // global transaction
+            xid = execQuery(src, "select dtm_begin_transaction(2)")
+            exec(dst, "select dtm_join_transaction($1)", xid)
+
+            // start transaction
+            exec(src, "begin transaction isolation level " + ISOLATION_LEVEL)
+            exec(dst, "begin transaction isolation level " + ISOLATION_LEVEL)
+
+            ok1 := execUpdate(src, "update t set v = v - $1 where u=$2", amount, account1)
+            ok2 := execUpdate(dst, "update t set v = v + $1 where u=$2", amount, account2)
+
+            if !ok1 || !ok2 {
+                exec(src, "rollback")
+                exec(dst, "rollback")
+                nAborts += 1
+            } else {
+                commit(src, dst)
+                nCommits += 1
+                myCommits += 1
+            }
         }
 
         if time.Since(start).Seconds() > 1 {
