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/utils/adt/jsonb.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/utils/adt/jsonb.c')
| -rw-r--r-- | src/backend/utils/adt/jsonb.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index 39355e242d2..f700c5b4c93 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -1378,9 +1378,7 @@ jsonb_object(PG_FUNCTION_ARGS) errmsg("wrong number of array subscripts"))); } - deconstruct_array(in_array, - TEXTOID, -1, false, TYPALIGN_INT, - &in_datums, &in_nulls, &in_count); + deconstruct_array_builtin(in_array, TEXTOID, &in_datums, &in_nulls, &in_count); count = in_count / 2; @@ -1466,13 +1464,8 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS) if (nkdims == 0) goto close_object; - deconstruct_array(key_array, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); - - deconstruct_array(val_array, - TEXTOID, -1, false, TYPALIGN_INT, - &val_datums, &val_nulls, &val_count); + deconstruct_array_builtin(key_array, TEXTOID, &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(val_array, TEXTOID, &val_datums, &val_nulls, &val_count); if (key_count != val_count) ereport(ERROR, |