diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-26 17:54:02 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-26 17:54:02 +0000 |
| commit | 5cabcfccce4b8b826c9b30828f3012b7926a6946 (patch) | |
| tree | 3e14c0710a45b4195734dd3189eb89eac4969073 /src/backend/executor | |
| parent | 8009c275925dda90f1275ba70f5c2a63abaa520b (diff) | |
| download | postgresql-5cabcfccce4b8b826c9b30828f3012b7926a6946.tar.gz postgresql-5cabcfccce4b8b826c9b30828f3012b7926a6946.zip | |
Modify array operations to include array's element type OID in the
array header, and to compute sizing and alignment of array elements
the same way normal tuple access operations do --- viz, using the
tupmacs.h macros att_addlength and att_align. This makes the world
safe for arrays of cstrings or intervals, and should make it much
easier to write array-type-polymorphic functions; as examples see
the cleanups of array_out and contrib/array_iterator. By Joe Conway
and Tom Lane.
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execQual.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index f74f8f1b41b..e481ea11596 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.100 2002/07/20 05:16:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.101 2002/08/26 17:53:57 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -219,35 +219,38 @@ ExecEvalArrayRef(ArrayRef *arrayRef, resultArray = array_set(array_source, i, upper.indx, sourceData, - arrayRef->refelembyval, - arrayRef->refelemlength, arrayRef->refattrlength, + arrayRef->refelemlength, + arrayRef->refelembyval, + arrayRef->refelemalign, isNull); else resultArray = array_set_slice(array_source, i, upper.indx, lower.indx, (ArrayType *) DatumGetPointer(sourceData), - arrayRef->refelembyval, - arrayRef->refelemlength, arrayRef->refattrlength, + arrayRef->refelemlength, + arrayRef->refelembyval, + arrayRef->refelemalign, isNull); return PointerGetDatum(resultArray); } if (lIndex == NULL) - return array_ref(array_source, i, - upper.indx, - arrayRef->refelembyval, - arrayRef->refelemlength, + return array_ref(array_source, i, upper.indx, arrayRef->refattrlength, + arrayRef->refelemlength, + arrayRef->refelembyval, + arrayRef->refelemalign, isNull); else { resultArray = array_get_slice(array_source, i, upper.indx, lower.indx, - arrayRef->refelembyval, - arrayRef->refelemlength, arrayRef->refattrlength, + arrayRef->refelemlength, + arrayRef->refelembyval, + arrayRef->refelemalign, isNull); return PointerGetDatum(resultArray); } |