Fix readfuncs/outfuncs problems in last night's Gather patch.

robertmhaas · robertmhaas · commit 286a3a68dcaf · 2015-10-01T09:19:26.000-04:00
KaiGai Kohei, with one correction by me.
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
@@ -439,8 +439,8 @@ _outGather(StringInfo str, const Gather *node)
 
 	_outPlanInfo(str, (const Plan *) node);
 
-	WRITE_UINT_FIELD(num_workers);
-	WRITE_UINT_FIELD(single_copy);
+	WRITE_INT_FIELD(num_workers);
+	WRITE_BOOL_FIELD(single_copy);
 }
 
 static void
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
@@ -1998,6 +1998,22 @@ _readUnique(void)
 	READ_DONE();
 }
 
+/*
+ * _readGather
+ */
+static Gather *
+_readGather(void)
+{
+	READ_LOCALS(Gather);
+
+	ReadCommonPlan(&local_node->plan);
+
+	READ_INT_FIELD(num_workers);
+	READ_BOOL_FIELD(single_copy);
+
+	READ_DONE();
+}
+
 /*
  * _readHash
  */
@@ -2365,6 +2381,8 @@ parseNodeString(void)
 		return_value = _readWindowAgg();
 	else if (MATCH("UNIQUE", 6))
 		return_value = _readUnique();
+	else if (MATCH("GATHER", 6))
+		return_value = _readGather();
 	else if (MATCH("HASH", 4))
 		return_value = _readHash();
 	else if (MATCH("SETOP", 5))

Original file line number	Diff line number	Diff line change
`@@ -439,8 +439,8 @@ _outGather(StringInfo str, const Gather *node)`
`439`	`439`
`440`	`440`	`_outPlanInfo(str, (const Plan *) node);`
`441`	`441`
`442`		`- WRITE_UINT_FIELD(num_workers);`
`443`		`- WRITE_UINT_FIELD(single_copy);`
	`442`	`+ WRITE_INT_FIELD(num_workers);`
	`443`	`+ WRITE_BOOL_FIELD(single_copy);`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`static void`