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/ruleutils.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/backend/utils/adt/ruleutils.c') diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index c3937a60fd3..26cf4fa9a0e 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -2406,9 +2406,8 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand, if (isnull) elog(ERROR, "null indkey for index %u", indexId); - deconstruct_array(DatumGetArrayTypeP(cols), - INT2OID, 2, true, TYPALIGN_SHORT, - &keys, NULL, &nKeys); + deconstruct_array_builtin(DatumGetArrayTypeP(cols), INT2OID, + &keys, NULL, &nKeys); for (j = keyatts; j < nKeys; j++) { @@ -2531,9 +2530,8 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand, elog(ERROR, "null conexclop for constraint %u", constraintId); - deconstruct_array(DatumGetArrayTypeP(val), - OIDOID, sizeof(Oid), true, TYPALIGN_INT, - &elems, NULL, &nElems); + deconstruct_array_builtin(DatumGetArrayTypeP(val), OIDOID, + &elems, NULL, &nElems); operators = (Oid *) palloc(nElems * sizeof(Oid)); for (i = 0; i < nElems; i++) @@ -2587,9 +2585,8 @@ decompile_column_index_array(Datum column_index_array, Oid relId, int j; /* Extract data from array of int16 */ - deconstruct_array(DatumGetArrayTypeP(column_index_array), - INT2OID, 2, true, TYPALIGN_SHORT, - &keys, NULL, &nKeys); + deconstruct_array_builtin(DatumGetArrayTypeP(column_index_array), INT2OID, + &keys, NULL, &nKeys); for (j = 0; j < nKeys; j++) { @@ -12752,9 +12749,8 @@ get_reloptions(StringInfo buf, Datum reloptions) int noptions; int i; - deconstruct_array(DatumGetArrayTypeP(reloptions), - TEXTOID, -1, false, TYPALIGN_INT, - &options, NULL, &noptions); + deconstruct_array_builtin(DatumGetArrayTypeP(reloptions), TEXTOID, + &options, NULL, &noptions); for (i = 0; i < noptions; i++) { -- cgit v1.2.3