diff options
| author | Peter Eisentraut | 2022-07-01 08:51:45 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2022-07-01 09:23:15 +0000 |
| commit | d746021de18baf0f29eff0388204a0664f41eb8b (patch) | |
| tree | 21074e7935e62cd054e702d79e5c1fe7c8544733 /src/backend/utils/fmgr/funcapi.c | |
| parent | 7c2d6f8d3400edab2b91de7765db9ec71235fac9 (diff) | |
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 <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/2914356f-9e5f-8c59-2995-5997fc48bcba%40enterprisedb.com
Diffstat (limited to 'src/backend/utils/fmgr/funcapi.c')
| -rw-r--r-- | src/backend/utils/fmgr/funcapi.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 9197b0f1e26..a1fe50ffca8 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -1390,9 +1390,8 @@ get_func_arg_info(HeapTuple procTup, *p_argnames = NULL; else { - deconstruct_array(DatumGetArrayTypeP(proargnames), - TEXTOID, -1, false, TYPALIGN_INT, - &elems, NULL, &nelems); + deconstruct_array_builtin(DatumGetArrayTypeP(proargnames), TEXTOID, + &elems, NULL, &nelems); if (nelems != numargs) /* should not happen */ elog(ERROR, "proargnames must have the same number of elements as the function has arguments"); *p_argnames = (char **) palloc(sizeof(char *) * numargs); @@ -1506,8 +1505,7 @@ get_func_input_arg_names(Datum proargnames, Datum proargmodes, ARR_HASNULL(arr) || ARR_ELEMTYPE(arr) != TEXTOID) elog(ERROR, "proargnames is not a 1-D text array or it contains nulls"); - deconstruct_array(arr, TEXTOID, -1, false, TYPALIGN_INT, - &argnames, NULL, &numargs); + deconstruct_array_builtin(arr, TEXTOID, &argnames, NULL, &numargs); if (proargmodes != PointerGetDatum(NULL)) { arr = DatumGetArrayTypeP(proargmodes); /* ensure not toasted */ @@ -1621,8 +1619,7 @@ get_func_result_name(Oid functionId) ARR_ELEMTYPE(arr) != TEXTOID) elog(ERROR, "proargnames is not a 1-D text array of length %d or it contains nulls", numargs); - deconstruct_array(arr, TEXTOID, -1, false, TYPALIGN_INT, - &argnames, NULL, &nargnames); + deconstruct_array_builtin(arr, TEXTOID, &argnames, NULL, &nargnames); Assert(nargnames == numargs); /* scan for output argument(s) */ @@ -1770,8 +1767,7 @@ build_function_result_tupdesc_d(char prokind, ARR_ELEMTYPE(arr) != TEXTOID) elog(ERROR, "proargnames is not a 1-D text array of length %d or it contains nulls", numargs); - deconstruct_array(arr, TEXTOID, -1, false, TYPALIGN_INT, - &argnames, NULL, &nargnames); + deconstruct_array_builtin(arr, TEXTOID, &argnames, NULL, &nargnames); Assert(nargnames == numargs); } |