database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

Move checking an explicit VARIADIC "any" argument into the parser.

Browse Source 
This is more efficient and simpler . It does mean that an untyped NULL
can no longer be used in such cases, which should be mentioned in
Release Notes, but doesn't seem a terrible loss. The workaround is to
cast the NULL to some array type.

Pavel Stehule, reviewed by Jeevan Chalke.
This commit is contained in:
Andrew Dunstan
2013-07-18 11:52:12 -04:00
parent 405a468b02
commit d26888bc4d
7 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/backend/utils/adt/varlena.c
View File

@ -3820,7 +3820,6 @@ concat_internal(const char *sepstr, int argidx,
*/
if (get_fn_expr_variadic(fcinfo->flinfo))
{
Oid arr_typid;
ArrayType *arr;
/* Should have just the one argument */
@ -3831,20 +3830,16 @@ concat_internal(const char *sepstr, int argidx,
return NULL;
/*
* Non-null argument had better be an array. The parser doesn't
* enforce this for VARIADIC ANY functions (maybe it should?), so that
* check uses ereport not just elog.
* Non-null argument had better be an array
*
* Correct values are ensured by parser check, but this function
* can be called directly, bypassing the parser, so we should do
* some minimal check too - this form of call requires correctly set
* expr argtype in flinfo.
*/
arr_typid = get_fn_expr_argtype(fcinfo->flinfo, argidx);
if (!OidIsValid(arr_typid))
elog(ERROR, "could not determine data type of concat() input");
Assert(OidIsValid(get_fn_expr_argtype(fcinfo->flinfo, argidx)));
Assert(OidIsValid(get_element_type(get_fn_expr_argtype(fcinfo->flinfo, argidx))));
if (!OidIsValid(get_element_type(arr_typid)))
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("VARIADIC argument must be an array")));
/* OK, safe to fetch the array value */
arr = PG_GETARG_ARRAYTYPE_P(argidx);
/*
@ -4049,7 +4044,6 @@ text_format(PG_FUNCTION_ARGS)
/* If argument is marked VARIADIC, expand array into elements */
if (get_fn_expr_variadic(fcinfo->flinfo))
{
Oid arr_typid;
ArrayType *arr;
int16 elmlen;
bool elmbyval;
@ -4065,20 +4059,16 @@ text_format(PG_FUNCTION_ARGS)
else
{
/*
* Non-null argument had better be an array. The parser doesn't
* enforce this for VARIADIC ANY functions (maybe it should?), so
* that check uses ereport not just elog.
* Non-null argument had better be an array
*
* Correct values are ensured by parser check, but this function
* can be called directly, bypassing the parser, so we should do
* some minimal check too - this form of call requires correctly set
* expr argtype in flinfo.
*/
arr_typid = get_fn_expr_argtype(fcinfo->flinfo, 1);
if (!OidIsValid(arr_typid))
elog(ERROR, "could not determine data type of format() input");
Assert(OidIsValid(get_fn_expr_argtype(fcinfo->flinfo, 1)));
Assert(OidIsValid(get_element_type(get_fn_expr_argtype(fcinfo->flinfo, 1))));
if (!OidIsValid(get_element_type(arr_typid)))
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("VARIADIC argument must be an array")));
/* OK, safe to fetch the array value */
arr = PG_GETARG_ARRAYTYPE_P(1);
/* Get info about array element type */