From 17ed25e09a325a4e4e06c3efc84cb0174a4af059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <gunkmute@gmail.com>
Date: Thu, 22 Aug 2019 21:56:42 +0000
Subject: [PATCH] Fix multi_logical_optimizer merge regression. aggregate_utils
 still needs fixing

---
 src/backend/distributed/planner/multi_logical_optimizer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/backend/distributed/planner/multi_logical_optimizer.c b/src/backend/distributed/planner/multi_logical_optimizer.c
index 5e09031a8..658205487 100644
--- a/src/backend/distributed/planner/multi_logical_optimizer.c
+++ b/src/backend/distributed/planner/multi_logical_optimizer.c
@@ -3135,7 +3135,12 @@ AggregateFunctionOidWithoutInput(const char *functionName)
 	heapTuple = systable_getnext(scanDescriptor);
 	if (HeapTupleIsValid(heapTuple))
 	{
+#if PG_VERSION_NUM < 120000
 		functionOid = HeapTupleGetOid(heapTuple);
+#else
+		Form_pg_proc procForm = (Form_pg_proc) GETSTRUCT(heapTuple);
+		functionOid = procForm->oid;
+#endif
 	}
 
 	if (functionOid == InvalidOid)