Various fixes for aggregates for Postgres-XL

Patch by Pavan Deolasee

Author: david-rowley

contrib/fixeddecimal/fixeddecimal--xlaggs.sql

@@ -2,25 +2,25 @@
 -- Aggregate Support
 
 
-CREATE FUNCTION fixeddecimalaggstatecombine(FIXEDDECIMALAGGSTATE, INTERNAL)
+CREATE FUNCTION fixeddecimalaggstatecombine(FIXEDDECIMALAGGSTATE, FIXEDDECIMALAGGSTATE)
 RETURNS FIXEDDECIMALAGGSTATE
 AS 'fixeddecimal', 'fixeddecimalaggstatecombine'
 LANGUAGE C IMMUTABLE;
 
-CREATE FUNCTION fixeddecimal_avg_accum(INTERNAL, FIXEDDECIMAL)
-RETURNS INTERNAL
+CREATE FUNCTION fixeddecimal_avg_accum(FIXEDDECIMALAGGSTATE, FIXEDDECIMAL)
+RETURNS FIXEDDECIMALAGGSTATE
 AS 'fixeddecimal', 'fixeddecimal_avg_accum'
 LANGUAGE C IMMUTABLE;
 
-CREATE FUNCTION fixeddecimal_sum(INTERNAL)
+CREATE FUNCTION fixeddecimal_sum(FIXEDDECIMALAGGSTATE)
 RETURNS FIXEDDECIMAL
 AS 'fixeddecimal', 'fixeddecimal_sum'
-LANGUAGE C IMMUTABLE STRICT;
+LANGUAGE C IMMUTABLE;
 
-CREATE FUNCTION fixeddecimal_avg(INTERNAL)
+CREATE FUNCTION fixeddecimal_avg(FIXEDDECIMALAGGSTATE)
 RETURNS FIXEDDECIMAL
 AS 'fixeddecimal', 'fixeddecimal_avg'
-LANGUAGE C IMMUTABLE STRICT;
+LANGUAGE C IMMUTABLE;
 
 CREATE AGGREGATE min(FIXEDDECIMAL) (
     SFUNC = fixeddecimalsmaller,
@@ -43,15 +43,15 @@ CREATE AGGREGATE sum(FIXEDDECIMAL) (
     CFUNC = fixeddecimalaggstatecombine,
     CTYPE = FIXEDDECIMALAGGSTATE,
     FINALFUNC = fixeddecimal_sum,
-    STYPE = INTERNAL
+    STYPE = FIXEDDECIMALAGGSTATE
 );
 
 CREATE AGGREGATE avg(FIXEDDECIMAL) (
     SFUNC = fixeddecimal_avg_accum,
     CFUNC = fixeddecimalaggstatecombine,
     CTYPE = FIXEDDECIMALAGGSTATE,
     FINALFUNC = fixeddecimal_avg,
-    STYPE = INTERNAL
+    STYPE = FIXEDDECIMALAGGSTATE
 );
 
 

contrib/fixeddecimal/fixeddecimal.c

@@ -1746,7 +1746,7 @@ fixeddecimalaggstatein(PG_FUNCTION_ARGS)
 	FixedDecimalAggState   *state;
 	char				   *token;
 
-	state = (FixedDecimalAggState *) palloc0(sizeof(FixedDecimalAggState));
+	state = (FixedDecimalAggState *) palloc(sizeof(FixedDecimalAggState));
 
 	token = strtok(str, ":");
 	state->sumX = DatumGetInt64(DirectFunctionCall3(fixeddecimalin, CStringGetDatum(token), 0, -1));
@@ -1771,6 +1771,7 @@ fixeddecimalaggstateout(PG_FUNCTION_ARGS)
 	p = fixeddecimal2str(state->sumX, buf);
 	*p++ = ':';
 	p = pg_int64tostr(p, state->N);
+
 	PG_RETURN_CSTRING(pnstrdup(buf, p - buf));
 }
 
@@ -1810,14 +1811,41 @@ fixeddecimalaggstatesend(PG_FUNCTION_ARGS)
 Datum
 fixeddecimalaggstatecombine(PG_FUNCTION_ARGS)
 {
-	FixedDecimalAggState *state1 = (FixedDecimalAggState *) PG_GETARG_POINTER(0);
-	FixedDecimalAggState *state2 = (FixedDecimalAggState *) PG_GETARG_POINTER(1);
-	FixedDecimalAggState *newstate = palloc(sizeof(FixedDecimalAggState));
+	FixedDecimalAggState *collectstate;
+	FixedDecimalAggState *transstate;
+	MemoryContext agg_context;
+	MemoryContext old_context;
+
+	if (!AggCheckCallContext(fcinfo, &agg_context))
+		elog(ERROR, "aggregate function called in non-aggregate context");
+
+	old_context = MemoryContextSwitchTo(agg_context);
 
-	newstate->sumX = DatumGetInt64(DirectFunctionCall2(fixeddecimalpl, Int64GetDatum(state1->sumX), Int64GetDatum(state2->sumX)));
-	newstate->N = DatumGetInt64(DirectFunctionCall2(int8pl, Int64GetDatum(state1->N), Int64GetDatum(state2->N)));
+	collectstate = PG_ARGISNULL(0) ? NULL : (FixedDecimalAggState *)
+		PG_GETARG_POINTER(0);
 
-	PG_RETURN_POINTER(newstate);
+	if (collectstate == NULL)
+	{
+		collectstate = (FixedDecimalAggState *) palloc(sizeof
+				(FixedDecimalAggState));
+		collectstate->sumX = 0;
+		collectstate->N = 0;
+	}
+
+	transstate = PG_ARGISNULL(1) ? NULL : (FixedDecimalAggState *)
+		PG_GETARG_POINTER(1);
+
+	if (transstate == NULL)
+		PG_RETURN_POINTER(collectstate);
+
+	collectstate->sumX = DatumGetInt64(DirectFunctionCall2(fixeddecimalpl,
+				Int64GetDatum(collectstate->sumX), Int64GetDatum(transstate->sumX)));
+	collectstate->N = DatumGetInt64(DirectFunctionCall2(int8pl,
+				Int64GetDatum(collectstate->N), Int64GetDatum(transstate->N)));
+
+	MemoryContextSwitchTo(old_context);
+
+	PG_RETURN_POINTER(collectstate);
 }
 
-#endif /* PGXC */
+#endif /* PGXC */

contrib/fixeddecimal/fixeddecimalaggstate.sql

@@ -35,6 +35,7 @@ CREATE TYPE FIXEDDECIMALAGGSTATE (
     STORAGE        = plain,
     CATEGORY       = 'N',
     PREFERRED      = false,
-    COLLATABLE     = false
+    COLLATABLE     = false,
+    PASSEDBYVALUE
 );