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/jsonfuncs.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/jsonfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/jsonfuncs.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index d427bdfbe0d..9819e1a45ce 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -1000,8 +1000,7 @@ get_path_all(FunctionCallInfo fcinfo, bool as_text) if (array_contains_nulls(path)) PG_RETURN_NULL(); - deconstruct_array(path, TEXTOID, -1, false, TYPALIGN_INT, - &pathtext, &pathnulls, &npath); + deconstruct_array_builtin(path, TEXTOID, &pathtext, &pathnulls, &npath); tpath = palloc(npath * sizeof(char *)); ipath = palloc(npath * sizeof(int)); @@ -1456,8 +1455,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text) if (array_contains_nulls(path)) PG_RETURN_NULL(); - deconstruct_array(path, TEXTOID, -1, false, TYPALIGN_INT, - &pathtext, &pathnulls, &npath); + deconstruct_array_builtin(path, TEXTOID, &pathtext, &pathnulls, &npath); res = jsonb_get_element(jb, pathtext, npath, &isnull, as_text); @@ -4370,8 +4368,7 @@ jsonb_delete_array(PG_FUNCTION_ARGS) if (JB_ROOT_COUNT(in) == 0) PG_RETURN_JSONB_P(in); - deconstruct_array(keys, TEXTOID, -1, false, TYPALIGN_INT, - &keys_elems, &keys_nulls, &keys_len); + deconstruct_array_builtin(keys, TEXTOID, &keys_elems, &keys_nulls, &keys_len); if (keys_len == 0) PG_RETURN_JSONB_P(in); @@ -4523,8 +4520,7 @@ jsonb_set(PG_FUNCTION_ARGS) if (JB_ROOT_COUNT(in) == 0 && !create) PG_RETURN_JSONB_P(in); - deconstruct_array(path, TEXTOID, -1, false, TYPALIGN_INT, - &path_elems, &path_nulls, &path_len); + deconstruct_array_builtin(path, TEXTOID, &path_elems, &path_nulls, &path_len); if (path_len == 0) PG_RETURN_JSONB_P(in); @@ -4635,8 +4631,7 @@ jsonb_delete_path(PG_FUNCTION_ARGS) if (JB_ROOT_COUNT(in) == 0) PG_RETURN_JSONB_P(in); - deconstruct_array(path, TEXTOID, -1, false, TYPALIGN_INT, - &path_elems, &path_nulls, &path_len); + deconstruct_array_builtin(path, TEXTOID, &path_elems, &path_nulls, &path_len); if (path_len == 0) PG_RETURN_JSONB_P(in); @@ -4681,8 +4676,7 @@ jsonb_insert(PG_FUNCTION_ARGS) (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("cannot set path in scalar"))); - deconstruct_array(path, TEXTOID, -1, false, TYPALIGN_INT, - &path_elems, &path_nulls, &path_len); + deconstruct_array_builtin(path, TEXTOID, &path_elems, &path_nulls, &path_len); if (path_len == 0) PG_RETURN_JSONB_P(in); |