User 2PC and strict isolation level handling in test mode

kelvich · kelvich · commit 035f868edb77 · 2016-10-04T17:46:44.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3798,7 +3798,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 					}
 					break;
 				case TRANS_STMT_PREPARE:
-				  //elog(ERROR, "Two phase commit is not supported by multimaster");
+					elog(ERROR, "Two phase commit is not supported by multimaster");
 					break;
 				case TRANS_STMT_COMMIT_PREPARED:
 				case TRANS_STMT_ROLLBACK_PREPARED:
@@ -3958,11 +3958,11 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		standard_ProcessUtility(parsetree, queryString, context,
 								params, dest, completionTag);
 	}
-	
-	if (MtmTx.isDistributed && XactIsoLevel != XACT_REPEATABLE_READ) { 
+
+	if (MtmTx.isDistributed && XactIsoLevel != XACT_REPEATABLE_READ && !MtmVolksWagenMode) {
 		elog(ERROR, "Isolation level %s is not supported by multimaster", isoLevelStr[XactIsoLevel]);
 	}
-	
+
 	if (MyXactAccessedTempRel)
 	{
 		MTM_LOG1("Xact accessed temp table, stopping replication");

Original file line number	Diff line number	Diff line change
`@@ -3798,7 +3798,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3798`	`3798`	`}`
`3799`	`3799`	`break;`
`3800`	`3800`	`case TRANS_STMT_PREPARE:`
`3801`		`- //elog(ERROR, "Two phase commit is not supported by multimaster");`
	`3801`	`+ elog(ERROR, "Two phase commit is not supported by multimaster");`
`3802`	`3802`	`break;`
`3803`	`3803`	`case TRANS_STMT_COMMIT_PREPARED:`
`3804`	`3804`	`case TRANS_STMT_ROLLBACK_PREPARED:`
`@@ -3958,11 +3958,11 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3958`	`3958`	`standard_ProcessUtility(parsetree, queryString, context,`
`3959`	`3959`	`params, dest, completionTag);`
`3960`	`3960`	`}`
`3961`		`-`
`3962`		`- if (MtmTx.isDistributed && XactIsoLevel != XACT_REPEATABLE_READ) {`
	`3961`	`+`
	`3962`	`+ if (MtmTx.isDistributed && XactIsoLevel != XACT_REPEATABLE_READ && !MtmVolksWagenMode) {`
`3963`	`3963`	`elog(ERROR, "Isolation level %s is not supported by multimaster", isoLevelStr[XactIsoLevel]);`
`3964`	`3964`	`}`
`3965`		`-`
	`3965`	`+`
`3966`	`3966`	`if (MyXactAccessedTempRel)`
`3967`	`3967`	`{`
`3968`	`3968`	`MTM_LOG1("Xact accessed temp table, stopping replication");`