Fix infinite loop of non-tx ddl statements

kelvich · kelvich · commit 80daa6b57e47 · 2016-10-05T19:16:08.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3897,7 +3897,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_IndexStmt:
 			{
 				IndexStmt *indexStmt = (IndexStmt *) parsetree;
-				if (indexStmt->concurrent && !IsTransactionBlock())
+				if (indexStmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)
 				{
 					skipCommand = true;
 					MtmProcessDDLCommand(queryString, false);
@@ -3909,7 +3909,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_DropStmt:
 			{
 				DropStmt *stmt = (DropStmt *) parsetree;
-				if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock())
+				if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)
 				{
 					skipCommand = true;
 					MtmProcessDDLCommand(queryString, false);

Original file line number	Diff line number	Diff line change
`@@ -3897,7 +3897,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3897`	`3897`	`case T_IndexStmt:`
`3898`	`3898`	`{`
`3899`	`3899`	`IndexStmt indexStmt = (IndexStmt ) parsetree;`
`3900`		`- if (indexStmt->concurrent && !IsTransactionBlock())`
	`3900`	`+ if (indexStmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)`
`3901`	`3901`	`{`
`3902`	`3902`	`skipCommand = true;`
`3903`	`3903`	`MtmProcessDDLCommand(queryString, false);`
`@@ -3909,7 +3909,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3909`	`3909`	`case T_DropStmt:`
`3910`	`3910`	`{`
`3911`	`3911`	`DropStmt stmt = (DropStmt ) parsetree;`
`3912`		`- if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock())`
	`3912`	`+ if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)`
`3913`	`3913`	`{`
`3914`	`3914`	`skipCommand = true;`
`3915`	`3915`	`MtmProcessDDLCommand(queryString, false);`