contrib/fixeddecimal: add support for Cloudberry

Add fixeddecimal to contrib recursive targets so it is built and tested with
the rest of contrib modules.

Rework contrib/fixeddecimal/Makefile to support both in-tree and PGXS builds:
- use standard contrib in-tree includes (src/Makefile.global + contrib-global.mk)
- keep USE_PGXS path for out-of-tree usage
- remove hard dependency on pg_config for in-tree builds
- fix generated SQL dependency path handling when srcdir is empty

Fix fixeddecimal runtime issues seen in distributed aggregate execution:
- avoid MAXINT8LEN macro conflict with core headers
- switch int64 overflow checks to pg_add_s64_overflow/pg_sub_s64_overflow
- harden aggregate state serialize/deserialize against NULL states
- restore memory context before early return in aggregate combine

Update fixeddecimal regression expected files for Cloudberry behavior
(distribution-key NOTICEs, GPORCA plans, and distributed index semantics).

With these changes, fixeddecimal builds, installs, and passes installcheck
as a regular contrib extension in Cloudberry.

Author: tuhaihe

.github/workflows/build-cloudberry-rocky8.yml

@@ -305,6 +305,7 @@ jobs:
                                "contrib/formatter_fixedwidth:installcheck",
                                "contrib/hstore:installcheck",
                                "contrib/indexscan:installcheck",
+                               "contrib/fixeddecimal:installcheck",
                                "contrib/pg_trgm:installcheck",
                                "contrib/indexscan:installcheck",
                                "contrib/pgcrypto:installcheck",

.github/workflows/build-cloudberry.yml

@@ -298,6 +298,7 @@ jobs:
                                "contrib/formatter_fixedwidth:installcheck",
                                "contrib/hstore:installcheck",
                                "contrib/indexscan:installcheck",
+                               "contrib/fixeddecimal:installcheck",
                                "contrib/pg_trgm:installcheck",
                                "contrib/indexscan:installcheck",
                                "contrib/pgcrypto:installcheck",

.github/workflows/build-deb-cloudberry.yml

@@ -237,6 +237,7 @@ jobs:
                                "contrib/formatter_fixedwidth:installcheck",
                                "contrib/hstore:installcheck",
                                "contrib/indexscan:installcheck",
+                               "contrib/fixeddecimal:installcheck",
                                "contrib/pg_trgm:installcheck",
                                "contrib/indexscan:installcheck",
                                "contrib/pgcrypto:installcheck",

contrib/Makefile

@@ -60,7 +60,8 @@ SUBDIRS += \
 		formatter \
 		formatter_fixedwidth \
 		extprotocol \
-		indexscan
+		indexscan \
+		fixeddecimal
 
 ifeq ($(with_ssl),openssl)
 SUBDIRS += sslinfo

contrib/fixeddecimal/Makefile

@@ -6,33 +6,57 @@ EXTENSION = fixeddecimal
 DATA = fixeddecimal--1.0.0--1.1.0.sql
 DATA_built = fixeddecimal--1.1.0.sql
 
-CFLAGS = `pg_config --includedir-server`
-
-TESTS = $(wildcard test/sql/*.sql)
-
-REGRESS_BRIN := $(shell pg_config --version | grep -qE "XL 9\.[5-9]| 10\.0| 11\.[0-9]| 12\.[0-9]" && echo brin-xl)
-REGRESS_BRIN += $(shell pg_config --version | grep -E "9\.[5-9]| 10\.0| 11\.[0-9]| 12\.[0-9]" | grep -qEv "XL" && echo brin)
-REGRESS_VERSION_SPECIFIC := $(shell pg_config --version | grep -qE "XL" && echo index-xl || echo index)
-REGRESS = $(shell echo aggregate cast comparison overflow $(REGRESS_BRIN) $(REGRESS_VERSION_SPECIFIC))
-
 REGRESS_OPTS = --inputdir=test --outputdir=test --load-extension=fixeddecimal
 
+ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-
-AGGSTATESQL := $(shell pg_config --version | grep -qE "XL" && echo fixeddecimalaggstate.sql)
-AGGFUNCSSQL := $(shell pg_config --version | grep -qE "XL" && echo fixeddecimal--xlaggs.sql)
 
-AGGFUNCSSQL := $(shell pg_config --version | grep -qE "9\.[6-9]| 10\.[0-9]| 11\.[0-9]| 12\.[0-9]" && echo fixeddecimal--parallelaggs.sql || echo fixeddecimal--aggs.sql)
-
-BRINSQL := $(shell pg_config --version | grep -qE "9\.[5-9]| 10\.[0-9]| 11\.[0-9]| 12\.[0-9]" && echo fixeddecimal--brin.sql)
-
-# 9.6 was the dawn of parallel query, so we'll use the parallel enabled .sql file from then on.
-BASESQL := $(shell pg_config --version | grep -qE "9\.[6-9]| 10\.[0-9]| 11\.[0-9]| 12\.[0-9]" && echo fixeddecimal--1.1.0_base_parallel.sql || echo fixeddecimal--1.1.0_base.sql)
-
-OBJECTS := $(addprefix $(srcdir)/, $(AGGSTATESQL) $(BASESQL) $(AGGFUNCSSQL) $(BRINSQL))
+PG_VERSION_STR := $(shell $(PG_CONFIG) --version)
+ifeq (,$(findstring XL,$(PG_VERSION_STR)))
+REGRESS_BRIN := brin
+REGRESS_VERSION_SPECIFIC := index
+AGGSTATESQL :=
+AGGFUNCSSQL := fixeddecimal--parallelaggs.sql
+BRINSQL := fixeddecimal--brin.sql
+BASESQL := fixeddecimal--1.1.0_base_parallel.sql
+else
+REGRESS_BRIN := brin-xl
+REGRESS_VERSION_SPECIFIC := index-xl
+AGGSTATESQL := fixeddecimalaggstate.sql
+AGGFUNCSSQL := fixeddecimal--xlaggs.sql
+BRINSQL :=
+BASESQL := fixeddecimal--1.1.0_base.sql
+endif
+else
+subdir = contrib/fixeddecimal
+top_builddir = ../..
+
+# Cloudberry in-tree builds are non-XL and support parallel/BRIN paths.
+REGRESS_BRIN := brin
+REGRESS_VERSION_SPECIFIC := index
+AGGSTATESQL :=
+AGGFUNCSSQL := fixeddecimal--parallelaggs.sql
+BRINSQL := fixeddecimal--brin.sql
+BASESQL := fixeddecimal--1.1.0_base_parallel.sql
+endif
+
+REGRESS = aggregate cast comparison overflow $(REGRESS_BRIN) $(REGRESS_VERSION_SPECIFIC)
+
+ifeq ($(srcdir),)
+FD_SRC_PREFIX :=
+else
+FD_SRC_PREFIX := $(srcdir)/
+endif
+
+OBJECTS := $(addprefix $(FD_SRC_PREFIX), $(AGGSTATESQL) $(BASESQL) $(AGGFUNCSSQL) $(BRINSQL))
 
 fixeddecimal--1.1.0.sql: $(OBJECTS)
 	cat $^ > $@
 
+ifdef USE_PGXS
+include $(PGXS)
+else
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif

contrib/fixeddecimal/fixeddecimal.c

@@ -22,14 +22,15 @@
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "access/hash.h"
+#include "common/int.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 
 #include "utils/int8.h"
 
 #include "utils/numeric.h"
 
-#define MAXINT8LEN		25
+#define FIXEDDECIMAL_INT64STRLEN	25
 
 /*
  * The scale which the number is actually stored.
@@ -681,7 +682,7 @@ Datum
 fixeddecimalout(PG_FUNCTION_ARGS)
 {
 	int64		val = PG_GETARG_INT64(0);
-	char		buf[MAXINT8LEN + 1];
+	char		buf[FIXEDDECIMAL_INT64STRLEN + 1];
 	char	   *end = fixeddecimal2str(val, buf);
 	PG_RETURN_CSTRING(pnstrdup(buf, end - buf));
 }
@@ -1258,21 +1259,11 @@ fixeddecimalum(PG_FUNCTION_ARGS)
 	int64		arg = PG_GETARG_INT64(0);
 	int64		result;
 
-#ifdef HAVE_BUILTIN_OVERFLOW
-	int64 zero = 0;
-
- 	if (__builtin_sub_overflow(zero, arg, &result))
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("fixeddecimal out of range")));
-#else
-	result = -arg;
-	/* overflow check (needed for INT64_MIN) */
-	if (arg != 0 && SAMESIGN(result, arg))
+	if (pg_sub_s64_overflow(0, arg, &result))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("fixeddecimal out of range")));
-#endif /* HAVE_BUILTIN_OVERFLOW */
+
 	PG_RETURN_INT64(result);
 }
 
@@ -1291,24 +1282,10 @@ fixeddecimalpl(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-#ifdef HAVE_BUILTIN_OVERFLOW
-	if (__builtin_add_overflow(arg1, arg2, &result))
+	if (pg_add_s64_overflow(arg1, arg2, &result))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("fixeddecimal out of range")));
-#else
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("fixeddecimal out of range")));
-#endif /* HAVE_BUILTIN_OVERFLOW */
 
 	PG_RETURN_INT64(result);
 }
@@ -1320,24 +1297,10 @@ fixeddecimalmi(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-#ifdef HAVE_BUILTIN_OVERFLOW
-	if (__builtin_sub_overflow(arg1, arg2, &result))
+	if (pg_sub_s64_overflow(arg1, arg2, &result))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("fixeddecimal out of range")));
-#else
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("fixeddecimal out of range")));
-#endif /* HAVE_BUILTIN_OVERFLOW */
 
 	PG_RETURN_INT64(result);
 }
@@ -2163,18 +2126,11 @@ makeFixedDecimalAggState(FunctionCallInfo fcinfo)
 static void
 fixeddecimal_accum(FixedDecimalAggState *state, int64 newval)
 {
-#ifdef HAVE_BUILTIN_OVERFLOW
-	if (__builtin_add_overflow(state->sumX, newval, &state->sumX))
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("fixeddecimal out of range")));
-	state->N++;
-#else
 	if (state->N++ > 0)
 	{
-		int64 result = state->sumX + newval;
+		int64 result;
 
-		if (SAMESIGN(state->sumX, newval) && !SAMESIGN(result, state->sumX))
+		if (pg_add_s64_overflow(state->sumX, newval, &result))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("fixeddecimal out of range")));
@@ -2183,7 +2139,6 @@ fixeddecimal_accum(FixedDecimalAggState *state, int64 newval)
 	}
 	else
 		state->sumX = newval;
-#endif /* HAVE_BUILTIN_OVERFLOW */
 }
 
 Datum
@@ -2264,7 +2219,7 @@ Datum
 fixeddecimalaggstateout(PG_FUNCTION_ARGS)
 {
 	FixedDecimalAggState *state = (FixedDecimalAggState *) PG_GETARG_POINTER(0);
-	char		buf[MAXINT8LEN + 1 + MAXINT8LEN + 1];
+	char		buf[FIXEDDECIMAL_INT64STRLEN + 1 + FIXEDDECIMAL_INT64STRLEN + 1];
 	char	   *p;
 
 	p = fixeddecimal2str(state->sumX, buf);
@@ -2318,6 +2273,9 @@ fixeddecimalaggstateserialize(PG_FUNCTION_ARGS)
 	if (!AggCheckCallContext(fcinfo, NULL))
 		elog(ERROR, "aggregate function called in non-aggregate context");
 
+	if (PG_ARGISNULL(0))
+		PG_RETURN_NULL();
+
 	state = (FixedDecimalAggState *) PG_GETARG_POINTER(0);
 
 	pq_begintypsend(&buf);
@@ -2343,6 +2301,9 @@ fixeddecimalaggstatedeserialize(PG_FUNCTION_ARGS)
 	if (!AggCheckCallContext(fcinfo, NULL))
 		elog(ERROR, "aggregate function called in non-aggregate context");
 
+	if (PG_ARGISNULL(0))
+		PG_RETURN_NULL();
+
 	sstate = PG_GETARG_BYTEA_P(0);
 
 	/*
@@ -2395,7 +2356,10 @@ fixeddecimalaggstatecombine(PG_FUNCTION_ARGS)
 		PG_GETARG_POINTER(1);
 
 	if (transstate == NULL)
+	{
+		MemoryContextSwitchTo(old_context);
 		PG_RETURN_POINTER(collectstate);
+	}
 
 	collectstate->sumX = DatumGetInt64(DirectFunctionCall2(fixeddecimalpl,
 				Int64GetDatum(collectstate->sumX), Int64GetDatum(transstate->sumX)));

contrib/fixeddecimal/fixeddecimal.control

@@ -1,4 +1,4 @@
-comment = 'fixeddecimal'
+comment = 'Exact fixed-point decimal type with operators, aggregates, and index support'
 default_version = '1.1.0'
 relocatable = false
 module_pathname = '$libdir/fixeddecimal'

contrib/fixeddecimal/test/expected/aggregate.out

@@ -1,4 +1,5 @@
 CREATE TABLE fixed_decimal(a FIXEDDECIMAL NOT NULL);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 INSERT INTO fixed_decimal VALUES('92233720368547758.07'),('0.01'),('-92233720368547758.08'),('-0.01');
 SELECT SUM(a) FROM fixed_decimal WHERE a > 0;
 ERROR:  fixeddecimal out of range

contrib/fixeddecimal/test/expected/brin.out

@@ -1,16 +1,19 @@
 -- Test BRIN indexes
 SET enable_seqscan = off;
 CREATE TABLE fixdec (d FIXEDDECIMAL, txt TEXT);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'd' as the Apache Cloudberry data distribution key for this table.
 INSERT INTO fixdec SELECT s.i,REPEAT('0',64) FROM generate_series(1,10000) s(i);
 CREATE INDEX fixdec_d_idx ON fixdec USING BRIN (d);
 EXPLAIN (COSTS OFF) SELECT * FROM fixdec WHERE d > '9999'::FIXEDDECIMAL;
-                    QUERY PLAN                     
----------------------------------------------------
- Bitmap Heap Scan on fixdec
-   Recheck Cond: (d > '9999.00'::fixeddecimal)
-   ->  Bitmap Index Scan on fixdec_d_idx
-         Index Cond: (d > '9999.00'::fixeddecimal)
-(4 rows)
+                          QUERY PLAN
+---------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Bitmap Heap Scan on fixdec
+         Recheck Cond: (d > '9999.00'::fixeddecimal)
+         ->  Bitmap Index Scan on fixdec_d_idx
+               Index Cond: (d > '9999.00'::fixeddecimal)
+ Optimizer: GPORCA
+(6 rows)
 
 SELECT * FROM fixdec WHERE d > '9999'::FIXEDDECIMAL;
     d     |                               txt