database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Add construct_array_builtin, deconstruct_array_builtin

Browse Source 
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:
Peter Eisentraut
2022-07-01 10:51:45 +02:00
parent 7c2d6f8d34
commit d746021de1
51 changed files with 284 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/hstore/hstore_gin.c
View File

@ -118,9 +118,7 @@ gin_extract_hstore_query(PG_FUNCTION_ARGS)
j;
text *item;
deconstruct_array(query,
TEXTOID, -1, false, TYPALIGN_INT,
&key_datums, &key_nulls, &key_count);
deconstruct_array_builtin(query, TEXTOID, &key_datums, &key_nulls, &key_count);
entries = (Datum *) palloc(sizeof(Datum) * key_count);

8
contrib/hstore/hstore_gist.c
View File

@ -560,9 +560,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
int key_count;
int i;
deconstruct_array(query,
TEXTOID, -1, false, TYPALIGN_INT,
&key_datums, &key_nulls, &key_count);
deconstruct_array_builtin(query, TEXTOID, &key_datums, &key_nulls, &key_count);
for (i = 0; res && i < key_count; ++i)
{
@ -583,9 +581,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
int key_count;
int i;
deconstruct_array(query,
TEXTOID, -1, false, TYPALIGN_INT,
&key_datums, &key_nulls, &key_count);
deconstruct_array_builtin(query, TEXTOID, &key_datums, &key_nulls, &key_count);
res = false;

12
contrib/hstore/hstore_io.c
View File

@ -567,9 +567,7 @@ hstore_from_arrays(PG_FUNCTION_ARGS)
(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
errmsg("wrong number of array subscripts")));
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);
/* see discussion in hstoreArrayToPairs() */
if (key_count > MaxAllocSize / sizeof(Pairs))
@ -606,9 +604,7 @@ hstore_from_arrays(PG_FUNCTION_ARGS)
(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
errmsg("arrays must have same bounds")));
deconstruct_array(value_array,
TEXTOID, -1, false, TYPALIGN_INT,
&value_datums, &value_nulls, &value_count);
deconstruct_array_builtin(value_array, TEXTOID, &value_datums, &value_nulls, &value_count);
Assert(key_count == value_count);
}
@ -696,9 +692,7 @@ hstore_from_array(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;

11
contrib/hstore/hstore_op.c
View File

@ -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);
}