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

return the right bytes

fix_120_custom_aggregates_distribute_multiarg
Philip Dubé 2019-08-01 17:33:46 +00:00
parent baef1d2f85
commit c801889e08
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/distributed/utils/aggregate_utils.c
View File

@ -145,7 +145,7 @@ stypebox_serialize(PG_FUNCTION_ARGS)
pfree(valbytes); /* TODO I get to free this right? */ pfree(valbytes); /* TODO I get to free this right? */
} }
PG_RETURN_BYTEA_P(valbytes); PG_RETURN_BYTEA_P(realbytes);
} }
@ -296,6 +296,7 @@ stypebox_combine(PG_FUNCTION_ARGS)
inner_fcinfo->argnull[0] = box1->value_null; inner_fcinfo->argnull[0] = box1->value_null;
inner_fcinfo->arg[1] = box2->value; inner_fcinfo->arg[1] = box2->value;
inner_fcinfo->argnull[1] = box2->value_null; inner_fcinfo->argnull[1] = box2->value_null;
/* TODO Deal with memory management juggling (see executor/nodeAgg) */ /* TODO Deal with memory management juggling (see executor/nodeAgg) */
box1->value = FunctionCallInvoke(inner_fcinfo); box1->value = FunctionCallInvoke(inner_fcinfo);
box1->value_null = inner_fcinfo->isnull; box1->value_null = inner_fcinfo->isnull;
@ -347,6 +348,7 @@ worker_partial_agg_sfunc(PG_FUNCTION_ARGS)
} }
} }
} }
/* Deal with memory management juggling (see executor/nodeAgg) */ /* Deal with memory management juggling (see executor/nodeAgg) */
inner_fcinfo->arg[0] = box->value; inner_fcinfo->arg[0] = box->value;
inner_fcinfo->argnull[0] = box->value_null; inner_fcinfo->argnull[0] = box->value_null;