Fix infinite loop of non-tx ddl statements

kelvich · kelvich · commit 0ce22e96c558 · 2017-11-13T02:17:32.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -3896,7 +3896,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);
@@ -3908,7 +3908,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
`@@ -3896,7 +3896,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3896`	`3896`	`case T_IndexStmt:`
`3897`	`3897`	`{`
`3898`	`3898`	`IndexStmt indexStmt = (IndexStmt ) parsetree;`
`3899`		`- if (indexStmt->concurrent && !IsTransactionBlock())`
	`3899`	`+ if (indexStmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)`
`3900`	`3900`	`{`
`3901`	`3901`	`skipCommand = true;`
`3902`	`3902`	`MtmProcessDDLCommand(queryString, false);`
`@@ -3908,7 +3908,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3908`	`3908`	`case T_DropStmt:`
`3909`	`3909`	`{`
`3910`	`3910`	`DropStmt stmt = (DropStmt ) parsetree;`
`3911`		`- if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock())`
	`3911`	`+ if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)`
`3912`	`3912`	`{`
`3913`	`3913`	`skipCommand = true;`
`3914`	`3914`	`MtmProcessDDLCommand(queryString, false);`