send GUC variables to nodes

kelvich · kelvich · commit 1cb8c175e37c · 2016-04-07T15:44:56.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -140,7 +140,7 @@ HTAB* MtmXid2State;
 static HTAB* MtmGid2State;
 static HTAB* MtmLocalTables;
 
-static bool  MtmIsRecoverySession;
+static bool MtmIsRecoverySession;
 
 static MtmCurrentTrans MtmTx;
 
@@ -199,6 +199,9 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 							 ProcessUtilityContext context, ParamListInfo params,
 							 DestReceiver *dest, char *completionTag);
 
+static StringInfo	MtmGUCBuffer;
+static bool			MtmGUCBufferAllocated = false;
+
 /*
  * -------------------------------------------
  * Synchronize access to MTM structures.
@@ -2239,6 +2242,12 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 	{ 
 		if (conns[i]) 
 		{
+			if (MtmGUCBufferAllocated && !MtmRunUtilityStmt(conns[i], MtmGUCBuffer->data, &utility_errmsg) && !ignoreError)
+			{
+				errorMsg = "Failed to set GUC variables at node %d";
+				failedNode = i;
+				break;
+			}
 			if (!MtmRunUtilityStmt(conns[i], "BEGIN TRANSACTION", &utility_errmsg) && !ignoreError)
 			{
 				errorMsg = "Failed to start transaction at node %d";
@@ -2250,7 +2259,10 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 				if (i + 1 == MtmNodeId)
 					errorMsg = utility_errmsg;
 				else
+				{
+					elog(ERROR, utility_errmsg);
 					errorMsg = "Failed to run command at node %d";
+				}
 
 				failedNode = i;
 				break;
@@ -2412,7 +2424,6 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_FetchStmt:
 		case T_DoStmt:
 		case T_CreateTableSpaceStmt:
-		case T_DropTableSpaceStmt:
 		case T_AlterTableSpaceOptionsStmt:
 		case T_TruncateStmt:
 		case T_CommentStmt: /* XXX: we could replicate these */;
@@ -2421,9 +2432,9 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_ExecuteStmt:
 		case T_DeallocateStmt:
 		case T_GrantStmt: /* XXX: we could replicate some of these these */;
-		case T_GrantRoleStmt:
-		case T_AlterDatabaseStmt:
-		case T_AlterDatabaseSetStmt:
+		//case T_GrantRoleStmt:
+		//case T_AlterDatabaseStmt:
+		//case T_AlterDatabaseSetStmt:
 		case T_NotifyStmt:
 		case T_ListenStmt:
 		case T_UnlistenStmt:
@@ -2432,22 +2443,46 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_VacuumStmt:
 		case T_ExplainStmt:
 		case T_AlterSystemStmt:
-		case T_VariableSetStmt:
 		case T_VariableShowStmt:
 		case T_DiscardStmt:
-		case T_CreateEventTrigStmt:
-		case T_AlterEventTrigStmt:
-		case T_CreateRoleStmt:
-		case T_AlterRoleStmt:
-		case T_AlterRoleSetStmt:
-		case T_DropRoleStmt:
+		//case T_CreateEventTrigStmt:
+		//case T_AlterEventTrigStmt:
+		//case T_CreateRoleStmt:
+		//case T_AlterRoleStmt:
+		//case T_AlterRoleSetStmt:
+		//case T_DropRoleStmt:
 		case T_ReassignOwnedStmt:
 		case T_LockStmt:
-		case T_ConstraintsSetStmt:
+		//case T_ConstraintsSetStmt:
 		case T_CheckPointStmt:
 		case T_ReindexStmt:
 		    skipCommand = true;
 			break;
+		case T_VariableSetStmt:
+			{
+				//VariableSetStmt *stmt = (VariableSetStmt *) parsetree;
+
+				if (!MtmGUCBufferAllocated)
+				{
+					MemoryContext oldcontext;
+
+					oldcontext = MemoryContextSwitchTo(TopMemoryContext);
+					MtmGUCBuffer = makeStringInfo();
+					MemoryContextSwitchTo(oldcontext);
+					MtmGUCBufferAllocated = true;
+				}
+
+				//appendStringInfoString(MtmGUCBuffer, "SET ");
+				//appendStringInfoString(MtmGUCBuffer, stmt->name);
+				//appendStringInfoString(MtmGUCBuffer, " TO ");
+				//appendStringInfoString(MtmGUCBuffer, ExtractSetVariableArgs(stmt));
+				//appendStringInfoString(MtmGUCBuffer, "; ");
+
+				appendStringInfoString(MtmGUCBuffer, queryString);
+
+				skipCommand = true;
+			}
+			break;
 		case T_CreateStmt:
 			{
 				/* Do not replicate temp tables */
@@ -2495,7 +2530,6 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 				}
 			}
 			break;
-		case T_CreateSchemaStmt:
 	    default:
 			skipCommand = false;
 			break;
