diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-07-01 10:51:45 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-07-01 11:23:15 +0200 |
| commit | d746021de18baf0f29eff0388204a0664f41eb8b (patch) | |
| tree | 21074e7935e62cd054e702d79e5c1fe7c8544733 /src/backend/commands/extension.c | |
| parent | 7c2d6f8d3400edab2b91de7765db9ec71235fac9 (diff) | |
| download | postgresql-d746021de18baf0f29eff0388204a0664f41eb8b.tar.gz postgresql-d746021de18baf0f29eff0388204a0664f41eb8b.zip | |
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 <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/2914356f-9e5f-8c59-2995-5997fc48bcba%40enterprisedb.com
Diffstat (limited to 'src/backend/commands/extension.c')
| -rw-r--r-- | src/backend/commands/extension.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 767d9b96190..7b3aceee119 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -2251,9 +2251,7 @@ convert_requires_to_datum(List *requires) datums[ndatums++] = DirectFunctionCall1(namein, CStringGetDatum(curreq)); } - a = construct_array(datums, ndatums, - NAMEOID, - NAMEDATALEN, false, TYPALIGN_CHAR); + a = construct_array_builtin(datums, ndatums, NAMEOID); return PointerGetDatum(a); } @@ -2433,9 +2431,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) arrayLength = 0; arrayIndex = 1; - a = construct_array(&elementDatum, 1, - OIDOID, - sizeof(Oid), true, TYPALIGN_INT); + a = construct_array_builtin(&elementDatum, 1, OIDOID); } else { @@ -2486,9 +2482,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) if (arrayLength != 0) elog(ERROR, "extconfig and extcondition arrays do not match"); - a = construct_array(&elementDatum, 1, - TEXTOID, - -1, false, TYPALIGN_INT); + a = construct_array_builtin(&elementDatum, 1, TEXTOID); } else { @@ -2630,14 +2624,12 @@ extension_config_remove(Oid extensionoid, Oid tableoid) int i; /* We already checked there are no nulls */ - deconstruct_array(a, OIDOID, sizeof(Oid), true, TYPALIGN_INT, - &dvalues, NULL, &nelems); + deconstruct_array_builtin(a, OIDOID, &dvalues, NULL, &nelems); for (i = arrayIndex; i < arrayLength - 1; i++) dvalues[i] = dvalues[i + 1]; - a = construct_array(dvalues, arrayLength - 1, - OIDOID, sizeof(Oid), true, TYPALIGN_INT); + a = construct_array_builtin(dvalues, arrayLength - 1, OIDOID); repl_val[Anum_pg_extension_extconfig - 1] = PointerGetDatum(a); } @@ -2676,14 +2668,12 @@ extension_config_remove(Oid extensionoid, Oid tableoid) int i; /* We already checked there are no nulls */ - deconstruct_array(a, TEXTOID, -1, false, TYPALIGN_INT, - &dvalues, NULL, &nelems); + deconstruct_array_builtin(a, TEXTOID, &dvalues, NULL, &nelems); for (i = arrayIndex; i < arrayLength - 1; i++) dvalues[i] = dvalues[i + 1]; - a = construct_array(dvalues, arrayLength - 1, - TEXTOID, -1, false, TYPALIGN_INT); + a = construct_array_builtin(dvalues, arrayLength - 1, TEXTOID); repl_val[Anum_pg_extension_extcondition - 1] = PointerGetDatum(a); } |