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

knizhnik · knizhnik · commit 406ab7918b9b · 2016-04-11T12:26:23.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2245,8 +2245,23 @@ MtmNoticeReceiver(void *i, const PGresult *res)
 
 	stripped_notice = palloc0(len);
 
-	/* Strip "NOTICE:  " from beginning and "\n" from end of error string */
-	strncpy(stripped_notice, notice + 9, len - 1 - 9);
+	if (*notice == 'N')
+	{
+		/* Strip "NOTICE:  " from beginning and "\n" from end of error string */
+		strncpy(stripped_notice, notice + 9, len - 1 - 9);
+		elog(NOTICE, "%s", stripped_notice);
+	}
+	else if (*notice == 'W')
+	{
+		/* Strip "WARNING:  " from beginning and "\n" from end of error string */
+		strncpy(stripped_notice, notice + 10, len - 1 - 10);
+		elog(WARNING, "%s", stripped_notice);
+	}
+	else
+	{
+		stripped_notice = notice;
+		elog(WARNING, "%s", stripped_notice);
+	}
 
 	MTM_LOG1("%s", stripped_notice);
 	pfree(stripped_notice);
@@ -2478,41 +2493,45 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_PrepareStmt:
 		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_NotifyStmt:
 		case T_ListenStmt:
 		case T_UnlistenStmt:
 		case T_LoadStmt:
 		case T_ClusterStmt: /* XXX: we could replicate these */;
 		case T_VacuumStmt:
 		case T_ExplainStmt:
-		//case T_AlterSystemStmt:
 		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_ReassignOwnedStmt:
 		case T_LockStmt:
-		//case T_ConstraintsSetStmt:
 		case T_CheckPointStmt:
 		case T_ReindexStmt:
 		    skipCommand = true;
 			break;
+		case T_DiscardStmt:
+			{
+				//DiscardStmt *stmt = (DiscardStmt *) parsetree;
+				//skipCommand = stmt->target == DISCARD_TEMP;
+
+				skipCommand = true;
+
+				if (MtmGUCBufferAllocated)
+				{
+					// XXX: move allocation somewhere to backend startup and check
+					// where buffer is empty in send routines.
+					MtmGUCBufferAllocated = false;
+					pfree(MtmGUCBuffer);
+				}
+
+			}
+			break;
 		case T_VariableSetStmt:
 			{
 				VariableSetStmt *stmt = (VariableSetStmt *) parsetree;
 
 				skipCommand = true;
 
 				/* Prevent SET TRANSACTION from replication */
-				if (MtmTx.isTransactionBlock || stmt->kind == VAR_SET_MULTI)
+				if (stmt->kind == VAR_SET_MULTI)
 					break;
 
 				if (!MtmGUCBufferAllocated)
@@ -2525,13 +2544,10 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 					MtmGUCBufferAllocated = true;
 				}
 
-				//appendStringInfoString(MtmGUCBuffer, "SET ");
-				//appendStringInfoString(MtmGUCBuffer, stmt->name);
-				//appendStringInfoString(MtmGUCBuffer, " TO ");
-				//appendStringInfoString(MtmGUCBuffer, ExtractSetVariableArgs(stmt));
-				//appendStringInfoString(MtmGUCBuffer, "; ");
-
 				appendStringInfoString(MtmGUCBuffer, queryString);
+
+				// sometimes there is no ';' char at the end.
+				appendStringInfoString(MtmGUCBuffer, ";");
 			}
 			break;
 		case T_CreateStmt:
diff --git a/src/test/regress/expected/create_function_3.out b/src/test/regress/expected/create_function_3.out
@@ -127,7 +127,7 @@ SELECT proname, proleakproof FROM pg_proc
  functext_e_2 | t
 (2 rows)
 
-ALTER FUNCTION functext_E_2(int) NOT LEAKPROOF;	-- remove leakproog attribute
+ALTER FUNCTION functext_E_2(int) NOT LEAKPROOF;	-- remove leakproof attribute
 SELECT proname, proleakproof FROM pg_proc
        WHERE oid in ('functext_E_1'::regproc,
                      'functext_E_2'::regproc) ORDER BY proname;
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
@@ -90,8 +90,8 @@ test: join
 test: aggregates
 test: groupingsets
 test: transactions
-ignore: random
-test: random
+#ignore: random
+#test: random
 test: portals
 test: arrays
 test: btree_index
@@ -151,12 +151,12 @@ test: rangefuncs
 test: prepare
 test: without_oid
 test: conversion
-test: truncate
+#test: truncate
 test: alter_table
 test: sequence
 test: polymorphism
 test: rowtypes
-test: returning
+#test: returning
 test: largeobject
 test: with
 test: xml
