some crutches to GUC handling

kelvich · kelvich · commit 10b1f04d71ba · 2016-09-22T17:07:02.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3583,7 +3583,12 @@ static void MtmGucSet(VariableSetStmt *stmt, const char *queryStr)
 				hash_search(MtmGucHash, key, HASH_REMOVE, NULL);
 			}
 			break;
+
 		case VAR_RESET_ALL:
+			{
+				hash_destroy(MtmGucHash);
+				MtmGucHashInit();
+			}
 			break;
 
 		case VAR_SET_MULTI:
@@ -3595,7 +3600,11 @@ static void MtmGucSet(VariableSetStmt *stmt, const char *queryStr)
 
 static void MtmGucDiscard(DiscardStmt *stmt)
 {
-
+	if (stmt->target == DISCARD_ALL)
+	{
+		hash_destroy(MtmGucHash);
+		MtmGucHashInit();
+	}
 }
 
 static void MtmGucClear(void)
@@ -3620,7 +3629,18 @@ static char * MtmGucSerialize(void)
 			appendStringInfoString(serialized_gucs, "SET ");
 			appendStringInfoString(serialized_gucs, hentry->key);
 			appendStringInfoString(serialized_gucs, " TO ");
-			appendStringInfoString(serialized_gucs, hentry->value);
+
+			/* quite a crutch */
+			if (strcmp(hentry->key, "work_mem") == 0)
+			{
+				appendStringInfoString(serialized_gucs, "'");
+				appendStringInfoString(serialized_gucs, hentry->value);
+				appendStringInfoString(serialized_gucs, "'");
+			}
+			else
+			{
+				appendStringInfoString(serialized_gucs, hentry->value);
+			}
 			appendStringInfoString(serialized_gucs, "; ");
 		}
 	}
