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

kvap · kvap · commit 7c03440e6c1b · 2015-09-25T14:05:36.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -482,7 +482,7 @@ DtmGetNewTransactionId(bool isSubXact)
 
 static Snapshot DtmGetSnapshot(Snapshot snapshot)
 {
-	if (TransactionIdIsValid(DtmNextXid) && IsMVCCSnapshot(snapshot) && snapshot != &CatalogSnapshotData) { 
+	if (TransactionIdIsValid(DtmNextXid) /*&& IsMVCCSnapshot(snapshot)*/ && snapshot != &CatalogSnapshotData) { 
 		if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot || DtmCurcid != snapshot->curcid)) {
 			DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &DtmMinXid);
 		}
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -11,7 +11,7 @@ import (
 const (
     TRANSFER_CONNECTIONS = 8
     INIT_AMOUNT = 10000
-    N_ITERATIONS = 10000
+    N_ITERATIONS = 100000
     N_ACCOUNTS = TRANSFER_CONNECTIONS//100000
     //ISOLATION_LEVEL = "repeatable read"
     ISOLATION_LEVEL = "read committed"
diff --git a/install.sh b/install.sh
@@ -26,6 +26,9 @@ sed -i '' 's/#fsync =.*/fsync = off/' ./install/data2/postgresql.conf
 echo 'dtm.node_id = 0' >> ./install/data1/postgresql.conf
 echo 'dtm.node_id = 1' >> ./install/data2/postgresql.conf
 
+echo 'autovacuum = off' >> ./install/data1/postgresql.conf
+echo 'autovacuum = off' >> ./install/data2/postgresql.conf
+
 ./install/bin/pg_ctl -D ./install/data1 -l ./install/data1/log start
 ./install/bin/pg_ctl -D ./install/data2 -l ./install/data2/log start
 

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ DtmGetNewTransactionId(bool isSubXact)`
`482`	`482`
`483`	`483`	`static Snapshot DtmGetSnapshot(Snapshot snapshot)`
`484`	`484`	`{`
`485`		`- if (TransactionIdIsValid(DtmNextXid) && IsMVCCSnapshot(snapshot) && snapshot != &CatalogSnapshotData) {`
	`485`	`+ if (TransactionIdIsValid(DtmNextXid) /&& IsMVCCSnapshot(snapshot)/ && snapshot != &CatalogSnapshotData) {`
`486`	`486`	`if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot \|\| DtmCurcid != snapshot->curcid)) {`
`487`	`487`	`DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &DtmMinXid);`
`488`	`488`	`}`