Merge branch 'master' of github.com:postgrespro/postgres_cluster

kelvich · kelvich · commit 439df3857a66 · 2016-10-04T17:21:44.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -755,9 +755,6 @@ MtmBeginTransaction(MtmCurrentTrans* x)
 			MtmUnlock();			
 			elog(ERROR, "Multimaster node is not online: current status %s", MtmNodeStatusMnem[Mtm->status]);
 		}
-		if (x->isDistributed && XactIsoLevel != XACT_REPEATABLE_READ) { 
-			elog(LOG, "Isolation level %s is not supported by multimaster", isoLevelStr[XactIsoLevel]);
-		}
 		x->containsDML = false;
         x->snapshot = MtmAssignCSN();	
 		x->gtid.xid = InvalidTransactionId;
@@ -984,9 +981,13 @@ MtmAbortPreparedTransaction(MtmCurrentTrans* x)
 	if (x->status != TRANSACTION_STATUS_ABORTED) { 
 		MtmLock(LW_EXCLUSIVE);
 		tm = (MtmTransMap*)hash_search(MtmGid2State, x->gid, HASH_REMOVE, NULL);
-		Assert(tm != NULL && tm->state != NULL);
-		MTM_LOG1("Abort prepared transaction %d with gid='%s'", x->xid, x->gid);
-		MtmAbortTransaction(tm->state);
+		if (tm == NULL) { 
+			elog(WARNING, "Global transaciton ID %s is not found", x->gid);
+		} else { 
+			Assert(tm->state != NULL);
+			MTM_LOG1("Abort prepared transaction %d with gid='%s'", x->xid, x->gid);
+			MtmAbortTransaction(tm->state);
+		}
 		MtmUnlock();
 		x->status = TRANSACTION_STATUS_ABORTED;
 	} else { 
@@ -3782,6 +3783,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;
@@ -3797,7 +3808,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:
@@ -3957,7 +3968,11 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		standard_ProcessUtility(parsetree, queryString, context,
 								params, dest, completionTag);
 	}
-
+	
+	if (MtmTx.isDistributed && XactIsoLevel != XACT_REPEATABLE_READ) { 
+		elog(ERROR, "Isolation level %s is not supported by multimaster", isoLevelStr[XactIsoLevel]);
+	}
+	
 	if (MyXactAccessedTempRel)
 	{
 		MTM_LOG1("Xact accessed temp table, stopping replication");
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';
 
