mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
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
This commit is contained in:
@@ -80,9 +80,7 @@ hstoreArrayToPairs(ArrayType *a, int *npairs)
|
||||
int i,
|
||||
j;
|
||||
|
||||
deconstruct_array(a,
|
||||
TEXTOID, -1, false, TYPALIGN_INT,
|
||||
&key_datums, &key_nulls, &key_count);
|
||||
deconstruct_array_builtin(a, TEXTOID, &key_datums, &key_nulls, &key_count);
|
||||
|
||||
if (key_count == 0)
|
||||
{
|
||||
@@ -582,9 +580,7 @@ hstore_slice_to_array(PG_FUNCTION_ARGS)
|
||||
int key_count;
|
||||
int i;
|
||||
|
||||
deconstruct_array(key_array,
|
||||
TEXTOID, -1, false, TYPALIGN_INT,
|
||||
&key_datums, &key_nulls, &key_count);
|
||||
deconstruct_array_builtin(key_array, TEXTOID, &key_datums, &key_nulls, &key_count);
|
||||
|
||||
if (key_count == 0)
|
||||
{
|
||||
@@ -719,8 +715,7 @@ hstore_akeys(PG_FUNCTION_ARGS)
|
||||
d[i] = PointerGetDatum(t);
|
||||
}
|
||||
|
||||
a = construct_array(d, count,
|
||||
TEXTOID, -1, false, TYPALIGN_INT);
|
||||
a = construct_array_builtin(d, count, TEXTOID);
|
||||
|
||||
PG_RETURN_POINTER(a);
|
||||
}
|
||||
|
Reference in New Issue
Block a user