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

kelvich · kelvich · commit 660f1875b563 · 2015-09-25T11:27:40.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -86,12 +86,14 @@ static TransactionId DtmMinXid;
 static bool DtmHasGlobalSnapshot;
 static bool DtmIsGlobalTransaction;
 static int DtmLocalXidReserve;
+static int DtmCurcid;
+static Snapshot DtmLastSnapshot;
 static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot, DtmGetNewTransactionId, DtmGetOldestXmin };
 
 
 #define XTM_TRACE(fmt, ...)
-//#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
-#define XTM_INFO(fmt, ...)
+#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+//#define XTM_INFO(fmt, ...)
 
 static void DumpSnapshot(Snapshot s, char *name)
 {
@@ -100,8 +102,8 @@ static void DumpSnapshot(Snapshot s, char *name)
 	char *cursor = buf;
 	cursor += sprintf(
 		cursor,
-		"snapshot %s for transaction %d: xmin=%d, xmax=%d, active=[",
-		name, GetCurrentTransactionId(), s->xmin, s->xmax
+		"snapshot %s(%p) for transaction %d: xmin=%d, xmax=%d, active=[",
+		name, s, GetCurrentTransactionId(), s->xmin, s->xmax
 	);
 	for (i = 0; i < s->xcnt; i++) {
 		if (i == 0) {
@@ -480,10 +482,12 @@ DtmGetNewTransactionId(bool isSubXact)
 
 static Snapshot DtmGetSnapshot(Snapshot snapshot)
 {
-	if (TransactionIdIsValid(DtmNextXid)) {
-		if (!DtmHasGlobalSnapshot) {
+	if (TransactionIdIsValid(DtmNextXid) && IsMVCCSnapshot(snapshot) && snapshot != &CatalogSnapshotData) { 
+		if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot || DtmCurcid != snapshot->curcid)) {
 			DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &DtmMinXid);
 		}
+        DtmCurcid = snapshot->curcid;
+        DtmLastSnapshot = snapshot;
 		DtmMergeSnapshots(snapshot, &DtmSnapshot);
 		if (!IsolationUsesXactSnapshot()) {
 			DtmHasGlobalSnapshot = false;
@@ -595,6 +599,7 @@ DtmXactCallback(XactEvent event, void *arg)
 				LWLockRelease(dtm->hashLock);
             }
             DtmNextXid = InvalidTransactionId;
+            DtmLastSnapshot = NULL;
 		}
 	}
 }
@@ -701,6 +706,7 @@ dtm_begin_transaction(PG_FUNCTION_ARGS)
 
 	DtmHasGlobalSnapshot = true;
     DtmIsGlobalTransaction = true;
+    DtmLastSnapshot = NULL;
 
 	PG_RETURN_INT32(DtmNextXid);
 }
@@ -716,6 +722,7 @@ Datum dtm_join_transaction(PG_FUNCTION_ARGS)
 
 	DtmHasGlobalSnapshot = true;
     DtmIsGlobalTransaction = true;
+    DtmLastSnapshot = NULL;
 
 	PG_RETURN_VOID();
 }
diff --git a/contrib/pg_xtm/tests/daemons.go b/contrib/pg_xtm/tests/daemons.go
@@ -91,6 +91,9 @@ func postgres(bin string, datadir string, port int, nodeid int, wg *sync.WaitGro
 		"-D", datadir,
 		"-p", strconv.Itoa(port),
 		"-c", "dtm.node_id=" + strconv.Itoa(nodeid),
+		"-c", "autovacuum=off",
+		"-c", "fsync=off",
+		"-c", "synchronous_commit=off",
 	}
 	name := "postgres " + datadir
 	c := make(chan string)
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -4,6 +4,7 @@ import (
     "fmt"
     "sync"
     "math/rand"
+    "time"
     "github.com/jackc/pgx"
 )
 
@@ -34,10 +35,10 @@ var running = false
 var nodes []int32 = []int32{0,1}
 
 func asyncCommit(conn *pgx.Conn, wg *sync.WaitGroup) {
-    exec(conn, "commit")    
+    exec(conn, "commit")
     wg.Done()
 }
-    
+
 func commit(conn1, conn2 *pgx.Conn) {
     var wg sync.WaitGroup
     wg.Add(2)
@@ -66,33 +67,53 @@ func prepare_db() {
     exec(conn2, "create extension pg_dtm")
     exec(conn2, "drop table if exists t")
     exec(conn2, "create table t(u int primary key, v int)")
-    
+
 //    xid = execQuery(conn1, "select dtm_begin_transaction(2)")
 //    exec(conn2, "select dtm_join_transaction($1)", xid)
 
     // strt transaction
     exec(conn1, "begin transaction isolation level " + ISOLATION_LEVEL)
     exec(conn2, "begin transaction isolation level " + ISOLATION_LEVEL)
-        
+
     for i := 0; i < N_ACCOUNTS; i++ {
         exec(conn1, "insert into t values($1, $2)", i, INIT_AMOUNT)
         exec(conn2, "insert into t values($1, $2)", i, INIT_AMOUNT)
     }
-    
+
     commit(conn1, conn2)
 }
 
 func max(a, b int64) int64 {
     if a >= b {
         return a
-    } 
+    }
     return b
 }
 
-func transfer(id int, wg *sync.WaitGroup) {
+func progress(total int, cCommits chan int, cAborts chan int) {
+    commits := 0
+    aborts := 0
+    start := time.Now()
+    for newcommits := range cCommits {
+        newaborts := <-cAborts
+        commits += newcommits
+        aborts += newaborts
+        if time.Since(start).Seconds() > 1 {
+            fmt.Printf(
+                "progress %0.2f%%: %d commits, %d aborts\n",
+                float32(commits) * 100.0 / float32(total), commits, aborts,
+            )
+            start = time.Now()
+        }
+    }
+}
+
+func transfer(id int, cCommits chan int, cAborts chan int, wg *sync.WaitGroup) {
     var err error
     var xid int32
-    var nConflicts = 0
+    var nAborts = 0
+    var nCommits = 0
+    var myCommits = 0
 
     conn1, err := pgx.Connect(cfg1)
     checkErr(err)
@@ -102,10 +123,11 @@ func transfer(id int, wg *sync.WaitGroup) {
     checkErr(err)
     defer conn2.Close()
 
-    for i := 0; i < N_ITERATIONS; i++ {
-        //amount := 2*rand.Intn(2) - 1
-        amount := 1
-        account1 := rand.Intn(N_ACCOUNTS) 
+    start := time.Now()
+    for myCommits < N_ITERATIONS {
+        amount := 2*rand.Intn(2000) - 1
+        //amount := 1
+        account1 := rand.Intn(N_ACCOUNTS)
         account2 := rand.Intn(N_ACCOUNTS)
 
         xid = execQuery(conn1, "select dtm_begin_transaction(2)")
@@ -114,25 +136,35 @@ func transfer(id int, wg *sync.WaitGroup) {
         // 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 {  
+
+        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")
-            nConflicts += 1
-            i -= 1
-        } else { 
+            nAborts += 1
+        } else {
             commit(conn1, conn2)
-        }       
+            nCommits += 1
+            myCommits += 1
+        }
+
+        if time.Since(start).Seconds() > 1 {
+            cCommits <- nCommits
+            cAborts <- nAborts
+            nCommits = 0
+            nAborts = 0
+            start = time.Now()
+        }
     }
-    fmt.Println("Test completed with ",nConflicts," conflicts")
+    cCommits <- nCommits
+    cAborts <- nAborts
     wg.Done()
 }
 
 func inspect(wg *sync.WaitGroup) {
     var sum1, sum2, sum int64
-    var prevSum int64 = 0 
+    var prevSum int64 = 0
     var xid int32
 
     {
@@ -142,28 +174,33 @@ func inspect(wg *sync.WaitGroup) {
         conn2, err := pgx.Connect(cfg2)
         checkErr(err)
 
-    for running {
+        for running {
+            xid = execQuery(conn1, "select dtm_begin_transaction(2)")
+            exec(conn2, "select dtm_join_transaction($1)", xid)
+
+            exec(conn1, "begin transaction isolation level " + ISOLATION_LEVEL)
+            exec(conn2, "begin transaction isolation level " + ISOLATION_LEVEL)
+
+            sum1 = execQuery64(conn1, "select sum(v) from t")
+            sum2 = execQuery64(conn2, "select sum(v) from t")
+
+            sum = sum1 + sum2
+            if (sum != prevSum) {
+                xmin1 := execQuery(conn1, "select dtm_get_current_snapshot_xmin()")
+                xmax1 := execQuery(conn1, "select dtm_get_current_snapshot_xmax()")
+                xmin2 := execQuery(conn2, "select dtm_get_current_snapshot_xmin()")
+                xmax2 := execQuery(conn2, "select dtm_get_current_snapshot_xmax()")
+                fmt.Printf(
+                    "Total=%d xid=%d snap1=[%d, %d) snap2=[%d, %d)\n",
+                    sum, xid, xmin1, xmax1, xmin2, xmax2,
+                )
+                prevSum = sum
+            }
 
-       
-        xid = execQuery(conn1, "select dtm_begin_transaction(2)")
-        exec(conn2, "select dtm_join_transaction($1)", xid)
-        
-        exec(conn1, "begin transaction isolation level " + ISOLATION_LEVEL)
-        exec(conn2, "begin transaction isolation level " + ISOLATION_LEVEL)
- 
-        sum1 = execQuery64(conn1, "select sum(v) from t")
-        sum2 = execQuery64(conn2, "select sum(v) from t")
-
-        sum = sum1 + sum2
-        if (sum != prevSum) {
-            fmt.Println("Total = ", sum, "xid=", xid, "snap1={", execQuery(conn1, "select dtm_get_current_snapshot_xmin()"), execQuery(conn1, "select dtm_get_current_snapshot_xmax()"), "}, snap2={",  execQuery(conn2, "select dtm_get_current_snapshot_xmin()"), execQuery(conn2, "select dtm_get_current_snapshot_xmax()"), "}")
-            prevSum = sum
-        }        
-
-        commit(conn1, conn2)
-    }
-         conn1.Close()
-         conn2.Close()
+            commit(conn1, conn2)
+        }
+        conn1.Close()
+        conn2.Close()
     }
     wg.Done()
 }
@@ -174,9 +211,13 @@ func main() {
 
     prepare_db()
 
+    cCommits := make(chan int)
+    cAborts := make(chan int)
+    go progress(TRANSFER_CONNECTIONS * N_ITERATIONS, cCommits, cAborts)
+
     transferWg.Add(TRANSFER_CONNECTIONS)
     for i:=0; i<TRANSFER_CONNECTIONS; i++ {
-        go transfer(i, &transferWg)
+        go transfer(i, cCommits, cAborts, &transferWg)
     }
     running = true
     inspectWg.Add(1)
@@ -185,6 +226,8 @@ func main() {
     transferWg.Wait()
     running = false
     inspectWg.Wait()
+
+    fmt.Printf("done\n")
 }
 
 func exec(conn *pgx.Conn, stmt string, arguments ...interface{}) {
@@ -216,10 +259,11 @@ func execQuery64(conn *pgx.Conn, stmt string, arguments ...interface{}) int64 {
     checkErr(err)
     return result
 }
+
 func checkErr(err error) {
     if err != nil {
         panic(err)
     }
 }
 
-
+// vim: expandtab ts=4 sts=4 sw=4
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -970,7 +970,7 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
  * and more contention on the PGXACT array.
  */
 bool 
-HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
+_HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 					   Buffer buffer)
 {
 	HeapTupleHeader tuple = htup->t_data;
@@ -1156,7 +1156,7 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 
 	return false;
 }
-#if 0
+#if 1
 bool 
 HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 					   Buffer buffer)
