Fix memory context usage for concurrent DDL statements

knizhnik · knizhnik · commit 75c6cedbf6f3 · 2016-10-14T23:40:48.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3942,18 +3942,18 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 			break;
 
 		case T_VacuumStmt:
-		  if (context == PROCESS_UTILITY_TOPLEVEL) {
+		  skipCommand = true;		  
+		  if (context == PROCESS_UTILITY_TOPLEVEL) {			  
 			  MtmProcessDDLCommand(queryString, false, true);
 			  MtmTx.isDistributed = false;
-			  skipCommand = true;		  
-			  break;
-		  } else {
+		  } else if (MtmApplyContext != NULL) {
 			  MemoryContext oldContext = MemoryContextSwitchTo(MtmApplyContext);
 			  Assert(oldContext != MtmApplyContext);
 			  MtmVacuumStmt = (VacuumStmt*)copyObject(parsetree);
 			  MemoryContextSwitchTo(oldContext);
 			  return;
 		  }
+		  break;
 
 		case T_CreateDomainStmt:
 			/* Detect temp tables access */
@@ -4050,10 +4050,10 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 						 MtmProcessDDLCommand(queryString, false, true);
 						 MtmTx.isDistributed = false;
 						 skipCommand = true;
-					 } else { 
+					 } else if (MtmApplyContext != NULL) { 
 						 MemoryContext oldContext = MemoryContextSwitchTo(MtmApplyContext);
 						 Assert(oldContext != MtmApplyContext);
-						 MtmIndexStmt = indexStmt;
+						 MtmIndexStmt = (IndexStmt*)copyObject(indexStmt);
 						 MemoryContextSwitchTo(oldContext);
 						 return;
 					 }
@@ -4070,10 +4070,10 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 						MtmProcessDDLCommand(queryString, false, true);
 						MtmTx.isDistributed = false;
 						skipCommand = true;
-					} else {
+					} else if (MtmApplyContext != NULL) {
 						 MemoryContext oldContext = MemoryContextSwitchTo(MtmApplyContext);
 						 Assert(oldContext != MtmApplyContext);
-						 MtmDropStmt = stmt;
+						 MtmDropStmt = (DropStmt*)copyObject(stmt);
 						 MemoryContextSwitchTo(oldContext);
 						 return;
 					}
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -390,19 +390,21 @@ process_remote_message(StringInfo s)
 			if (rc < 0) { 
 				elog(ERROR, "Failed to execute utility statement %s", messageBody);
 			} else { 
+				PushActiveSnapshot(GetTransactionSnapshot());
+
 				if (MtmVacuumStmt != NULL) { 
 					ExecVacuum(MtmVacuumStmt, 1);
 				} else if (MtmIndexStmt != NULL) {
+					MemoryContext oldContext = MemoryContextSwitchTo(MtmApplyContext);
 					Oid relid =	RangeVarGetRelidExtended(MtmIndexStmt->relation, ShareUpdateExclusiveLock,
 														 false, false,
 														 NULL,
 														 NULL);
 					
 					/* Run parse analysis ... */
-					//MtmIndexStmt = transformIndexStmt(relid, MtmIndexStmt, messageBody);
-
-					PushActiveSnapshot(GetTransactionSnapshot());
+					MtmIndexStmt = transformIndexStmt(relid, MtmIndexStmt, messageBody);
 
+					MemoryContextSwitchTo(oldContext);
 
 					DefineIndex(relid,		/* OID of heap relation */
 								MtmIndexStmt,
@@ -412,12 +414,11 @@ process_remote_message(StringInfo s)
 								false,		/* skip_build */
 								false);		/* quiet */
 					
-					if (ActiveSnapshotSet())
-						PopActiveSnapshot();
-
 				} else if (MtmDropStmt != NULL) { 
 					RemoveObjects(MtmDropStmt);
 				}
+				if (ActiveSnapshotSet())
+					PopActiveSnapshot();
 			}
 			if (standalone) { 
 				CommitTransactionCommand();
