Restore apply memory context after SPI call

knizhnik · knizhnik · commit 66fca4271d54 · 2017-04-06T17:01:33.000+03:00
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -403,6 +403,7 @@ process_remote_message(StringInfo s)
 			if (rc < 0) { 
 				MTM_ELOG(ERROR, "Failed to execute utility statement %s", messageBody);
 			} else { 
+				MemoryContextSwitchTo(MtmApplyContext);
 				PushActiveSnapshot(GetTransactionSnapshot());
 
 				if (MtmVacuumStmt != NULL) { 
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -550,7 +550,8 @@ pglogical_receiver_main(Datum main_arg)
 					if (stmt[0] == 'Z' || (stmt[0] == 'M' && (stmt[1] == 'L' || stmt[1] == 'A' || stmt[1] == 'C'))) {
 						MTM_LOG3("Process '%c' message from %d", stmt[1], nodeId);
 						if (stmt[0] == 'M' && stmt[1] == 'C') { /* concurrent DDL should be executed by parallel workers */
-							MtmExecute(stmt, msg_len);
+							//MtmExecute(stmt, msg_len);
+							MtmExecutor(stmt, msg_len);
 						} else {
 							MtmExecutor(stmt, msg_len); /* all other messages can be processed by receiver itself */
 						}
