external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes from testing with create_distributed_function

fix_120_custom_aggregates_distribute_multiarg
Philip Dubé 2019-10-10 22:00:57 +00:00
parent 47318ee7e0
commit 020921f1eb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/distributed/planner/multi_logical_optimizer.c
View File

@ -1897,6 +1897,10 @@ MasterAggregateExpression(Aggref *originalAggregate,
newMasterExpression = (Expr *) newMasterAggregate; newMasterExpression = (Expr *) newMasterAggregate;
} }
else
{
elog(ERROR, "Aggregate lacks COMBINEFUNC");
}
} }
else else
{ {
@ -2946,8 +2950,9 @@ WorkerAggregateExpressionList(Aggref *originalAggregate,
Oid workerPartialId = AggregateFunctionOidWithoutInput( Oid workerPartialId = AggregateFunctionOidWithoutInput(
WORKER_PARTIAL_AGGREGATE_NAME); WORKER_PARTIAL_AGGREGATE_NAME);
aggparam = makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum( aggparam = makeConst(REGPROCEDUREOID, -1, InvalidOid, sizeof(Oid),
originalAggregate->aggfnoid), false, true); ObjectIdGetDatum(originalAggregate->aggfnoid), false,
true);
aggArguments = list_make1(makeTargetEntry((Expr *) aggparam, 1, NULL, false)); aggArguments = list_make1(makeTargetEntry((Expr *) aggparam, 1, NULL, false));
foreach(originalAggArgCell, originalAggregate->args) foreach(originalAggArgCell, originalAggregate->args)
{ {