mirror of
https://github.com/postgres/postgres.git
synced 2025-12-19 17:02:53 +03:00
Arrays are toastable. (At least if you initdb, which I didn't force.)
Remove a bunch of crufty code for large-object-based arrays, which is superseded by TOAST and likely hasn't worked in a long time anyway. Clean up array code a little, and in particular eliminate its habit of scribbling on the input array (ie, modifying the input tuple :-().
This commit is contained in:
Tom Lane
@@ -5,18 +5,18 @@
|
||||
* following files:
|
||||
* utils/adt/arrayfuncs.c
|
||||
* utils/adt/arrayutils.c
|
||||
* utils/adt/chunk.c
|
||||
*
|
||||
*
|
||||
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: array.h,v 1.26 2000/07/17 03:05:32 tgl Exp $
|
||||
* $Id: array.h,v 1.27 2000/07/22 03:34:35 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* XXX the data array should be MAXALIGN'd -- notice that the array
|
||||
* allocation code does not allocate the extra space required for this,
|
||||
* even though the array-packing code does the MAXALIGNs.
|
||||
* XXX the data array should be MAXALIGN'd -- currently we only INTALIGN
|
||||
* which is NOT good enough for, eg, arrays of Interval. Changing this
|
||||
* will break existing user tables so hold off until we have some other
|
||||
* reason to break user tables (like WAL).
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -34,6 +34,7 @@ typedef struct
|
||||
int32 size; /* total array size (varlena requirement) */
|
||||
int ndim; /* # of dimensions */
|
||||
int flags; /* implementation flags */
|
||||
/* flags field is currently unused, always zero. */
|
||||
} ArrayType;
|
||||
|
||||
/*
|
||||
@@ -46,35 +47,8 @@ typedef struct
|
||||
#define PG_RETURN_ARRAYTYPE_P(x) PG_RETURN_POINTER(x)
|
||||
|
||||
/*
|
||||
* bitmask of ArrayType flags field:
|
||||
* 1st bit - large object flag
|
||||
* 2nd bit - chunk flag (array is chunked if set)
|
||||
* 3rd,4th,&5th bit - large object type (used only if bit 1 is set)
|
||||
*/
|
||||
#define ARR_LOB_FLAG (0x1)
|
||||
#define ARR_CHK_FLAG (0x2)
|
||||
#define ARR_OBJ_MASK (0x1c)
|
||||
|
||||
#define ARR_SIZE(a) (((ArrayType *) a)->size)
|
||||
#define ARR_NDIM(a) (((ArrayType *) a)->ndim)
|
||||
#define ARR_FLAGS(a) (((ArrayType *) a)->flags)
|
||||
|
||||
#define ARR_IS_LO(a) \
|
||||
(((ArrayType *) a)->flags & ARR_LOB_FLAG)
|
||||
#define SET_LO_FLAG(f,a) \
|
||||
(((ArrayType *) a)->flags |= ((f) ? ARR_LOB_FLAG : 0x0))
|
||||
|
||||
#define ARR_IS_CHUNKED(a) \
|
||||
(((ArrayType *) a)->flags & ARR_CHK_FLAG)
|
||||
#define SET_CHUNK_FLAG(f,a) \
|
||||
(((ArrayType *) a)->flags |= ((f) ? ARR_CHK_FLAG : 0x0))
|
||||
|
||||
#define ARR_OBJ_TYPE(a) \
|
||||
((ARR_FLAGS(a) & ARR_OBJ_MASK) >> 2)
|
||||
#define SET_OBJ_TYPE(f,a) \
|
||||
((ARR_FLAGS(a)&= ~ARR_OBJ_MASK), (ARR_FLAGS(a)|=((f<<2)&ARR_OBJ_MASK)))
|
||||
|
||||
/*
|
||||
* Access macros for array header fields.
|
||||
*
|
||||
* ARR_DIMS returns a pointer to an array of array dimensions (number of
|
||||
* elements along the various array axes).
|
||||
*
|
||||
@@ -85,39 +59,27 @@ typedef struct
|
||||
*
|
||||
* Unlike C, the default lower bound is 1.
|
||||
*/
|
||||
#define ARR_DIMS(a) \
|
||||
((int *) (((char *) a) + sizeof(ArrayType)))
|
||||
#define ARR_LBOUND(a) \
|
||||
((int *) (((char *) a) + sizeof(ArrayType) + \
|
||||
(sizeof(int) * (((ArrayType *) a)->ndim))))
|
||||
#define ARR_SIZE(a) (((ArrayType *) (a))->size)
|
||||
#define ARR_NDIM(a) (((ArrayType *) (a))->ndim)
|
||||
|
||||
/*
|
||||
* Returns a pointer to the actual array data.
|
||||
*/
|
||||
#define ARR_DATA_PTR(a) \
|
||||
(((char *) a) + \
|
||||
MAXALIGN(sizeof(ArrayType) + 2 * (sizeof(int) * (a)->ndim)))
|
||||
#define ARR_DIMS(a) \
|
||||
((int *) (((char *) (a)) + sizeof(ArrayType)))
|
||||
#define ARR_LBOUND(a) \
|
||||
((int *) (((char *) (a)) + sizeof(ArrayType) + \
|
||||
(sizeof(int) * ARR_NDIM(a))))
|
||||
|
||||
/*
|
||||
* The total array header size for an array of dimension n (in bytes).
|
||||
*/
|
||||
#define ARR_OVERHEAD(n) \
|
||||
(MAXALIGN(sizeof(ArrayType) + 2 * (n) * sizeof(int)))
|
||||
(MAXALIGN(sizeof(ArrayType) + 2 * sizeof(int) * (n)))
|
||||
|
||||
/*------------------------------------------------------------------------
|
||||
* Miscellaneous helper definitions and routines for arrayfuncs.c
|
||||
*------------------------------------------------------------------------
|
||||
/*
|
||||
* Returns a pointer to the actual array data.
|
||||
*/
|
||||
#define ARR_DATA_PTR(a) \
|
||||
(((char *) (a)) + ARR_OVERHEAD(ARR_NDIM(a)))
|
||||
|
||||
#define RETURN_NULL(type) do { *isNull = true; return (type) 0; } while (0)
|
||||
|
||||
#define NAME_LEN 30
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char lo_name[NAME_LEN];
|
||||
int C[MAXDIM];
|
||||
} CHUNK_INFO;
|
||||
|
||||
/*
|
||||
* prototypes for functions defined in arrayfuncs.c
|
||||
@@ -134,13 +96,16 @@ extern ArrayType *array_set(ArrayType *array, int nSubscripts, int *indx,
|
||||
Datum dataValue,
|
||||
bool elmbyval, int elmlen,
|
||||
int arraylen, bool *isNull);
|
||||
extern ArrayType *array_clip(ArrayType *array, int nSubscripts,
|
||||
int *upperIndx, int *lowerIndx,
|
||||
bool elmbyval, int elmlen, bool *isNull);
|
||||
extern ArrayType *array_assgn(ArrayType *array, int nSubscripts,
|
||||
int *upperIndx, int *lowerIndx,
|
||||
ArrayType *newArr,
|
||||
bool elmbyval, int elmlen, bool *isNull);
|
||||
extern ArrayType *array_get_slice(ArrayType *array, int nSubscripts,
|
||||
int *upperIndx, int *lowerIndx,
|
||||
bool elmbyval, int elmlen,
|
||||
int arraylen, bool *isNull);
|
||||
extern ArrayType *array_set_slice(ArrayType *array, int nSubscripts,
|
||||
int *upperIndx, int *lowerIndx,
|
||||
ArrayType *srcArray,
|
||||
bool elmbyval, int elmlen,
|
||||
int arraylen, bool *isNull);
|
||||
|
||||
extern Datum array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType);
|
||||
|
||||
extern ArrayType *construct_array(Datum *elems, int nelems,
|
||||
@@ -149,35 +114,18 @@ extern void deconstruct_array(ArrayType *array,
|
||||
bool elmbyval, int elmlen, char elmalign,
|
||||
Datum **elemsp, int *nelemsp);
|
||||
|
||||
extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
|
||||
int isSrcLO, int isDestLO);
|
||||
extern char *_array_newLO(int *fd, int flag);
|
||||
|
||||
|
||||
/*
|
||||
* prototypes for functions defined in arrayutils.c
|
||||
* [these names seem to be too generic. Add prefix for arrays? -- AY]
|
||||
*/
|
||||
|
||||
extern int GetOffset(int n, int *dim, int *lb, int *indx);
|
||||
extern int getNitems(int n, int *a);
|
||||
extern int compute_size(int *st, int *endp, int n, int base);
|
||||
extern void mda_get_offset_values(int n, int *dist, int *PC, int *span);
|
||||
extern int ArrayGetOffset(int n, int *dim, int *lb, int *indx);
|
||||
extern int ArrayGetOffset0(int n, int *tup, int *scale);
|
||||
extern int ArrayGetNItems(int n, int *a);
|
||||
extern void mda_get_range(int n, int *span, int *st, int *endp);
|
||||
extern void mda_get_prod(int n, int *range, int *P);
|
||||
extern int tuple2linear(int n, int *tup, int *scale);
|
||||
extern void array2chunk_coord(int n, int *C, int *a_coord, int *c_coord);
|
||||
extern int next_tuple(int n, int *curr, int *span);
|
||||
|
||||
/*
|
||||
* prototypes for functions defined in chunk.c
|
||||
*/
|
||||
extern char *_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize,
|
||||
int *nbytes, char *chunkfile);
|
||||
extern int _ReadChunkArray(int *st, int *endp, int bsize, int fp,
|
||||
char *destfp, ArrayType *array, int isDestLO, bool *isNull);
|
||||
extern struct varlena *_ReadChunkArray1El(int *st, int bsize, int fp,
|
||||
ArrayType *array, bool *isNull);
|
||||
extern void mda_get_prod(int n, int *range, int *prod);
|
||||
extern void mda_get_offset_values(int n, int *dist, int *prod, int *span);
|
||||
extern int mda_next_tuple(int n, int *curr, int *span);
|
||||
|
||||
|
||||
#endif /* ARRAY_H */
|
||||
|
||||
Reference in New Issue
Block a user