Ignore concurrent option in create index and enable user two-phase transactions

knizhnik · knizhnik · commit 7ede347fe477 · 2016-10-04T09:59:22.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3777,6 +3777,16 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	MTM_LOG3("%d: Process utility statement %s", MyProcPid, queryString);
 	switch (nodeTag(parsetree))
 	{
+	    case T_IndexStmt:
+		    {
+				IndexStmt* stmt = (IndexStmt*) parsetree;
+				if (stmt->concurrent) { 
+					stmt->concurrent = false;
+					elog(WARNING, "Disable concurrent option for index creation");
+				}
+				break;
+			}
+
 	    case T_TransactionStmt:
 			{
 				TransactionStmt *stmt = (TransactionStmt *) parsetree;
@@ -3792,7 +3802,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:
diff --git a/regress.sql b/regress.sql
@@ -1,7 +1,7 @@
 create extension multimaster;
-ALTER DATABASE "postgres" SET lc_messages TO 'C';
-ALTER DATABASE "postgres" SET lc_monetary TO 'C';
-ALTER DATABASE "postgres" SET lc_numeric TO 'C';
-ALTER DATABASE "postgres" SET lc_time TO 'C';
-ALTER DATABASE "postgres" SET timezone_abbreviations TO 'Default';
+ALTER DATABASE "regression" SET lc_messages TO 'C';
+ALTER DATABASE "regression" SET lc_monetary TO 'C';
+ALTER DATABASE "regression" SET lc_numeric TO 'C';
+ALTER DATABASE "regression" SET lc_time TO 'C';
+ALTER DATABASE "regression" SET timezone_abbreviations TO 'Default';
 
