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 --- src/backend/utils/adt/lockfuncs.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/backend/utils/adt/lockfuncs.c') diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 023a004ac89..dedee7af5cb 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -538,10 +538,7 @@ pg_blocking_pids(PG_FUNCTION_ARGS) /* Assert we didn't overrun arrayelems[] */ Assert(narrayelems <= lockData->nlocks); - /* Construct array, using hardwired knowledge about int4 type */ - PG_RETURN_ARRAYTYPE_P(construct_array(arrayelems, narrayelems, - INT4OID, - sizeof(int32), true, TYPALIGN_INT)); + PG_RETURN_ARRAYTYPE_P(construct_array_builtin(arrayelems, narrayelems, INT4OID)); } @@ -579,10 +576,7 @@ pg_safe_snapshot_blocking_pids(PG_FUNCTION_ARGS) else blocker_datums = NULL; - /* Construct array, using hardwired knowledge about int4 type */ - PG_RETURN_ARRAYTYPE_P(construct_array(blocker_datums, num_blockers, - INT4OID, - sizeof(int32), true, TYPALIGN_INT)); + PG_RETURN_ARRAYTYPE_P(construct_array_builtin(blocker_datums, num_blockers, INT4OID)); } -- cgit v1.2.3