database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Repair bug #2694 concerning an ARRAY[] construct whose inputs are empty

Browse Source 
sub-arrays.  Per discussion, if all inputs are empty arrays then result
must be an empty array too, whereas a mix of empty and nonempty arrays
should (and already did) draw an error.  In the back branches, the
construct was strict: any NULL input immediately yielded a NULL output;
so I left that behavior alone.  HEAD was simply ignoring NULL sub-arrays,
which doesn't seem very sensible.  For lack of a better idea it now
treats NULL sub-arrays the same as empty ones.
This commit is contained in:
Tom Lane
2006-11-06 18:21:31 +00:00
parent 36e012e727
commit f0395d50e9
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/backend/executor/execQual.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.196 2006/10/06 17:13:59 petere Exp $ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.197 2006/11/06 18:21:31 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2280,6 +2280,7 @@ ExecEvalArray(ArrayExprState *astate, ExprContext *econtext,
int *elem_lbs = NULL; int *elem_lbs = NULL;
bool firstone = true; bool firstone = true;
bool havenulls = false; bool havenulls = false;
bool haveempty = false;
char **subdata; char **subdata;
bits8 **subbitmaps; bits8 **subbitmaps;
int *subbytes; int *subbytes;
@ -2302,11 +2303,15 @@ ExecEvalArray(ArrayExprState *astate, ExprContext *econtext,
bool eisnull; bool eisnull;
Datum arraydatum; Datum arraydatum;
ArrayType *array; ArrayType *array;
int this_ndims;
arraydatum = ExecEvalExpr(e, econtext, &eisnull, NULL); arraydatum = ExecEvalExpr(e, econtext, &eisnull, NULL);
/* ignore null subarrays */ /* temporarily ignore null subarrays */
if (eisnull) if (eisnull)
{
haveempty = true;
continue; continue;
}
array = DatumGetArrayTypeP(arraydatum); array = DatumGetArrayTypeP(arraydatum);
@ -2320,10 +2325,18 @@ ExecEvalArray(ArrayExprState *astate, ExprContext *econtext,
format_type_be(ARR_ELEMTYPE(array)), format_type_be(ARR_ELEMTYPE(array)),
format_type_be(element_type)))); format_type_be(element_type))));
this_ndims = ARR_NDIM(array);
/* temporarily ignore zero-dimensional subarrays */
if (this_ndims <= 0)
{
haveempty = true;
continue;
}
if (firstone) if (firstone)
{ {
/* Get sub-array details from first member */ /* Get sub-array details from first member */
elem_ndims = ARR_NDIM(array); elem_ndims = this_ndims;
ndims = elem_ndims + 1; ndims = elem_ndims + 1;
if (ndims <= 0 || ndims > MAXDIM) if (ndims <= 0 || ndims > MAXDIM)
ereport(ERROR, ereport(ERROR,
@ -2341,7 +2354,7 @@ ExecEvalArray(ArrayExprState *astate, ExprContext *econtext,
else else
{ {
/* Check other sub-arrays are compatible */ /* Check other sub-arrays are compatible */
if (elem_ndims != ARR_NDIM(array) || if (elem_ndims != this_ndims ||
memcmp(elem_dims, ARR_DIMS(array), memcmp(elem_dims, ARR_DIMS(array),
elem_ndims * sizeof(int)) != 0 || elem_ndims * sizeof(int)) != 0 ||
memcmp(elem_lbs, ARR_LBOUND(array), memcmp(elem_lbs, ARR_LBOUND(array),
@ -2356,13 +2369,29 @@ ExecEvalArray(ArrayExprState *astate, ExprContext *econtext,
subbitmaps[outer_nelems] = ARR_NULLBITMAP(array); subbitmaps[outer_nelems] = ARR_NULLBITMAP(array);
subbytes[outer_nelems] = ARR_SIZE(array) - ARR_DATA_OFFSET(array); subbytes[outer_nelems] = ARR_SIZE(array) - ARR_DATA_OFFSET(array);
nbytes += subbytes[outer_nelems]; nbytes += subbytes[outer_nelems];
subnitems[outer_nelems] = ArrayGetNItems(ARR_NDIM(array), subnitems[outer_nelems] = ArrayGetNItems(this_ndims,
ARR_DIMS(array)); ARR_DIMS(array));
nitems += subnitems[outer_nelems]; nitems += subnitems[outer_nelems];
havenulls |= ARR_HASNULL(array); havenulls |= ARR_HASNULL(array);
outer_nelems++; outer_nelems++;
} }
/*
* If all items were null or empty arrays, return an empty array;
* otherwise, if some were and some weren't, raise error. (Note:
* we must special-case this somehow to avoid trying to generate
* a 1-D array formed from empty arrays. It's not ideal...)
*/
if (haveempty)
{
if (ndims == 0) /* didn't find any nonempty array */
return PointerGetDatum(construct_empty_array(element_type));
ereport(ERROR,
(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
errmsg("multidimensional arrays must have array "
"expressions with matching dimensions")));
}
/* setup for multi-D array */ /* setup for multi-D array */
dims[0] = outer_nelems; dims[0] = outer_nelems;
lbs[0] = 1; lbs[0] = 1;