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

kelvich · kelvich · commit b1cd83ca52ca · 2015-09-24T14:13:13.000+03:00
diff --git a/contrib/pg_xtm/dtmd/src/main.c b/contrib/pg_xtm/dtmd/src/main.c
@@ -454,7 +454,7 @@ static char *onsnapshot(void *stream, void *clientdata, cmd_t *cmd) {
 
 	// FIXME: Remote this assert if you do not have a barrier upon getting
 	// snapshot in backends. The assert should indicate that situation :)
-	assert(CLIENT_SNAPSENT(clientdata) == t->snapshots_count);
+	// assert(CLIENT_SNAPSENT(clientdata) == t->snapshots_count);
 
 	return destructive_concat(strdup(head), snapser);
 }
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -12,8 +12,8 @@ const (
     INIT_AMOUNT = 10000
     N_ITERATIONS = 100000
     N_ACCOUNTS = TRANSFER_CONNECTIONS//100000
-    ISOLATION_LEVEL = "repeatable read"
-    //ISOLATION_LEVEL = "read committed"
+    //ISOLATION_LEVEL = "repeatable read"
+    ISOLATION_LEVEL = "read committed"
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ static char onsnapshot(void stream, void clientdata, cmd_t cmd) {`
`454`	`454`
`455`	`455`	`// FIXME: Remote this assert if you do not have a barrier upon getting`
`456`	`456`	`// snapshot in backends. The assert should indicate that situation :)`
`457`		`- assert(CLIENT_SNAPSENT(clientdata) == t->snapshots_count);`
	`457`	`+ // assert(CLIENT_SNAPSENT(clientdata) == t->snapshots_count);`
`458`	`458`
`459`	`459`	`return destructive_concat(strdup(head), snapser);`
`460`	`460`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ const (`
`12`	`12`	`INIT_AMOUNT = 10000`
`13`	`13`	`N_ITERATIONS = 100000`
`14`	`14`	`N_ACCOUNTS = TRANSFER_CONNECTIONS//100000`
`15`		`- ISOLATION_LEVEL = "repeatable read"`
`16`		`- //ISOLATION_LEVEL = "read committed"`
	`15`	`+ //ISOLATION_LEVEL = "repeatable read"`
	`16`	`+ ISOLATION_LEVEL = "read committed"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`