From d746021de18baf0f29eff0388204a0664f41eb8b Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 1 Jul 2022 10:51:45 +0200 Subject: Add construct_array_builtin, deconstruct_array_builtin There were many calls to construct_array() and deconstruct_array() for built-in types, for example, when dealing with system catalog columns. These all hardcoded the type attributes necessary to pass to these functions. To simplify this a bit, add construct_array_builtin(), deconstruct_array_builtin() as wrappers that centralize this hardcoded knowledge. This simplifies many call sites and reduces the amount of hardcoded stuff that is spread around. Reviewed-by: Tom Lane Discussion: https://www.postgresql.org/message-id/flat/2914356f-9e5f-8c59-2995-5997fc48bcba%40enterprisedb.com --- contrib/pageinspect/ginfuncs.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'contrib/pageinspect/ginfuncs.c') diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c index 31aca7b0006..952e9d51a87 100644 --- a/contrib/pageinspect/ginfuncs.c +++ b/contrib/pageinspect/ginfuncs.c @@ -166,9 +166,7 @@ gin_page_opaque_info(PG_FUNCTION_ARGS) values[0] = Int64GetDatum(opaq->rightlink); values[1] = Int32GetDatum(opaq->maxoff); - values[2] = PointerGetDatum(construct_array(flags, nflags, - TEXTOID, - -1, false, TYPALIGN_INT)); + values[2] = PointerGetDatum(construct_array_builtin(flags, nflags, TEXTOID)); /* Build and return the result tuple. */ resultTuple = heap_form_tuple(tupdesc, values, nulls); @@ -273,11 +271,7 @@ gin_leafpage_items(PG_FUNCTION_ARGS) tids_datum = (Datum *) palloc(ndecoded * sizeof(Datum)); for (i = 0; i < ndecoded; i++) tids_datum[i] = ItemPointerGetDatum(&tids[i]); - values[2] = PointerGetDatum(construct_array(tids_datum, - ndecoded, - TIDOID, - sizeof(ItemPointerData), - false, TYPALIGN_SHORT)); + values[2] = PointerGetDatum(construct_array_builtin(tids_datum, ndecoded, TIDOID)); pfree(tids_datum); pfree(tids); -- cgit v1.2.3