From 5cabcfccce4b8b826c9b30828f3012b7926a6946 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 26 Aug 2002 17:54:02 +0000 Subject: Modify array operations to include array's element type OID in the array header, and to compute sizing and alignment of array elements the same way normal tuple access operations do --- viz, using the tupmacs.h macros att_addlength and att_align. This makes the world safe for arrays of cstrings or intervals, and should make it much easier to write array-type-polymorphic functions; as examples see the cleanups of array_out and contrib/array_iterator. By Joe Conway and Tom Lane. --- src/backend/utils/adt/numeric.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/backend/utils/adt/numeric.c') diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 1af7402fb38..99ef1327e48 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.50 2002/02/18 14:25:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.51 2002/08/26 17:53:58 tgl Exp $ * * ---------- */ @@ -18,6 +18,7 @@ #include #include +#include "catalog/pg_type.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/int8.h" @@ -1734,7 +1735,7 @@ do_numeric_accum(ArrayType *transarray, Numeric newval) /* We assume the input is array of numeric */ deconstruct_array(transarray, - false, -1, 'i', + NUMERICOID, -1, false, 'i', &transdatums, &ndatums); if (ndatums != 3) elog(ERROR, "do_numeric_accum: expected 3-element numeric array"); @@ -1755,7 +1756,7 @@ do_numeric_accum(ArrayType *transarray, Numeric newval) transdatums[2] = sumX2; result = construct_array(transdatums, 3, - false, -1, 'i'); + NUMERICOID, -1, false, 'i'); return result; } @@ -1825,7 +1826,7 @@ numeric_avg(PG_FUNCTION_ARGS) /* We assume the input is array of numeric */ deconstruct_array(transarray, - false, -1, 'i', + NUMERICOID, -1, false, 'i', &transdatums, &ndatums); if (ndatums != 3) elog(ERROR, "numeric_avg: expected 3-element numeric array"); @@ -1861,7 +1862,7 @@ numeric_variance(PG_FUNCTION_ARGS) /* We assume the input is array of numeric */ deconstruct_array(transarray, - false, -1, 'i', + NUMERICOID, -1, false, 'i', &transdatums, &ndatums); if (ndatums != 3) elog(ERROR, "numeric_variance: expected 3-element numeric array"); @@ -1940,7 +1941,7 @@ numeric_stddev(PG_FUNCTION_ARGS) /* We assume the input is array of numeric */ deconstruct_array(transarray, - false, -1, 'i', + NUMERICOID, -1, false, 'i', &transdatums, &ndatums); if (ndatums != 3) elog(ERROR, "numeric_stddev: expected 3-element numeric array"); -- cgit v1.2.3