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

kvap · kvap · commit ab845b0c5b1e · 2015-09-08T18:30:33.000+03:00
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -33,6 +33,7 @@ var running = false
 func prepare_db() {
     var xids [2]int
     var csn int64a
+    nodes := []int{0,1}
 
     conn1, err := pgx.Connect(cfg1)
     checkErr(err)
@@ -61,7 +62,7 @@ func prepare_db() {
     xids[1] = execQuery(conn2, "select txid_current()")
     
     // register global transaction in DTMD
-    exec(conn1, "select dtm_global_transaction($1)", xids)
+    exec(conn1, "select dtm_global_transaction($1)", nodes, xids)
     
     // first global statement 
     exec(conn1, "select dtm_get_snapshot()")
diff --git a/install.sh b/install.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+./install/bin/pg_ctl -D ./install/data1 stop
+./install/bin/pg_ctl -D ./install/data2 stop
+
+rm -rf install
+
+make install
+
+cd contrib/pg_xtm/
+
+make clean
+make
+make install
+
+cd ../..
+
+./install/bin/initdb -D ./install/data1
+./install/bin/initdb -D ./install/data2
+
+sed -i '' 's/#port =.*/port = 5433/' ./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
+
+
+cd contrib/pg_dtm/dtmd
+make clean
+make
+./bin/dtmd
