From 020921f1eb384771b4b4e0ef6504c02af0d4ccfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <gunkmute@gmail.com>
Date: Thu, 10 Oct 2019 22:00:57 +0000
Subject: [PATCH] Fixes from testing with create_distributed_function

---
 .../distributed/planner/multi_logical_optimizer.c        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/planner/multi_logical_optimizer.c b/src/backend/distributed/planner/multi_logical_optimizer.c
index 4123d6fa8..8e755c20b 100644
--- a/src/backend/distributed/planner/multi_logical_optimizer.c
+++ b/src/backend/distributed/planner/multi_logical_optimizer.c
@@ -1897,6 +1897,10 @@ MasterAggregateExpression(Aggref *originalAggregate,
 
 			newMasterExpression = (Expr *) newMasterAggregate;
 		}
+		else
+		{
+			elog(ERROR, "Aggregate lacks COMBINEFUNC");
+		}
 	}
 	else
 	{
@@ -2946,8 +2950,9 @@ WorkerAggregateExpressionList(Aggref *originalAggregate,
 			Oid workerPartialId = AggregateFunctionOidWithoutInput(
 				WORKER_PARTIAL_AGGREGATE_NAME);
 
-			aggparam = makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum(
-									 originalAggregate->aggfnoid), false, true);
+			aggparam = makeConst(REGPROCEDUREOID, -1, InvalidOid, sizeof(Oid),
+								 ObjectIdGetDatum(originalAggregate->aggfnoid), false,
+								 true);
 			aggArguments = list_make1(makeTargetEntry((Expr *) aggparam, 1, NULL, false));
 			foreach(originalAggArgCell, originalAggregate->args)
 			{