Fix multi_logical_optimizer merge regression. aggregate_utils still needs fixing

2019-08-22 21:56:42 +00:00 · 2019-08-22 21:56:42 +00:00 · 17ed25e09a
parent 5d6ee5104b
commit 17ed25e09a
1 changed files with 5 additions and 0 deletions
--- 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)