diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-02 00:34:24 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-02 00:34:24 +0000 |
| commit | 608d843e616982d7508fce47de556ef9ecc27c48 (patch) | |
| tree | 35a69b7154da844528ee5eca948f6b76d0a6020f /src/backend/utils/adt/arrayfuncs.c | |
| parent | 1aac2c852a2ccd817daf2dac99cf450e7822eb20 (diff) | |
| download | postgresql-608d843e616982d7508fce47de556ef9ecc27c48.tar.gz postgresql-608d843e616982d7508fce47de556ef9ecc27c48.zip | |
Array slice extraction should produce a result array with index lower
bounds of 1, not the lower bound subscripts of the original slice.
Per bug report from Andre Holzner, 1-Feb-02.
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 77a6f00378c..8a657493284 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.74 2002/03/01 22:17:10 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.75 2002/03/02 00:34:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -839,7 +839,8 @@ array_get_slice(ArrayType *array, int i, ndim, *dim, - *lb; + *lb, + *newlb; int fixedDim[1], fixedLb[1]; char *arraydataptr; @@ -911,7 +912,14 @@ array_get_slice(ArrayType *array, newarray->ndim = ndim; newarray->flags = 0; memcpy(ARR_DIMS(newarray), span, ndim * sizeof(int)); - memcpy(ARR_LBOUND(newarray), lowerIndx, ndim * sizeof(int)); + /* + * Lower bounds of the new array are set to 1. Formerly (before 7.3) + * we copied the given lowerIndx values ... but that seems confusing. + */ + newlb = ARR_LBOUND(newarray); + for (i = 0; i < ndim; i++) + newlb[i] = 1; + array_extract_slice(ndim, dim, lb, arraydataptr, elmlen, lowerIndx, upperIndx, ARR_DATA_PTR(newarray)); |