Update script

knizhnik · knizhnik · commit b92769caf577 · 2015-09-18T11:09:37.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -59,7 +59,7 @@ static DTMConn DtmConn;
 
 #define XTM_TRACE(fmt, ...) 
 //#define XTM_TRACE(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
-#define XTM_INFO(fmt, ...) elog(WARNING, fmt, ## __VA_ARGS__)
+#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
 #define XTM_CONNECT_ATTEMPTS 10
 
 static void DtmEnsureConnection(void)
@@ -310,7 +310,6 @@ dtm_get_snapshot(PG_FUNCTION_ARGS)
     DtmGlobalGetSnapshot(DtmConn, DtmNodeId, GetCurrentTransactionId(), &DtmSnapshot);
 
     XTM_TRACE("XTM: dtm_get_snapshot \n");
-    Assert(!DtmHasSnapshot);
     DtmHasSnapshot = true;
     DtmGlobalTransaction = true;
 	PG_RETURN_VOID();
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -77,8 +77,8 @@ func prepare_db() {
     exec(conn2, "select dtm_begin_transaction($1, $2)", nodes, xids)
     
     // first global statement 
-    //exec(conn1, "select dtm_get_snapshot()")
-    //exec(conn2, "select dtm_get_snapshot()")
+    exec(conn1, "select dtm_get_snapshot()")
+    exec(conn2, "select dtm_get_snapshot()")
     
     for i := 0; i < N_ACCOUNTS; i++ {
         exec(conn1, "insert into t values($1, $2)", i, INIT_AMOUNT)
@@ -97,6 +97,7 @@ func max(a, b int64) int64 {
 
 func transfer(id int, wg *sync.WaitGroup) {
     var err error
+    var sum1, sum2, sum int32
     var xids []int32 = make([]int32, 2)
 
     conn1, err := pgx.Connect(cfg1)
@@ -126,12 +127,29 @@ func transfer(id int, wg *sync.WaitGroup) {
         exec(conn2, "select dtm_begin_transaction($1, $2)", nodes, xids)
         
         // first global statement 
-        // exec(conn1, "select dtm_get_snapshot()")
-        // exec(conn2, "select dtm_get_snapshot()")
+        exec(conn1, "select dtm_get_snapshot()")
+        exec(conn2, "select dtm_get_snapshot()")
+        
+        sum1 = execQuery(conn1, "select sum(v) from t")
+        sum2 = execQuery(conn2, "select sum(v) from t")
+        sum = sum1 + sum2
         
+        exec(conn1, "select dtm_get_snapshot()")
+        exec(conn2, "select dtm_get_snapshot()")
+
         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(conn1, "select dtm_get_snapshot()")
+        exec(conn2, "select dtm_get_snapshot()")
 
+        sum1 = execQuery(conn1, "select sum(v) from t")
+        sum2 = execQuery(conn2, "select sum(v) from t")
+                
+        if (sum1 + sum2 != sum) { 
+            fmt.Println("Before = ", sum, ", after=", sum1 + sum2, ", xids=", xids)        
+        }
+        
         commit(conn1, conn2)
     }
 
