diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/intagg/int_aggregate.c | 2 | ||||
| -rw-r--r-- | contrib/intarray/_int_tool.c | 5 | ||||
| -rw-r--r-- | contrib/tsearch2/query_rewrite.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c index 3c7bb7ff870..afe5dd526fe 100644 --- a/contrib/intagg/int_aggregate.c +++ b/contrib/intagg/int_aggregate.c @@ -87,7 +87,7 @@ GetPGArray(PGARRAY * p, AggState *aggstate, bool fAdd) p = (PGARRAY *) MemoryContextAlloc(aggstate->aggcontext, cb); p->a.size = cb; p->a.ndim = 1; - p->a.flags = 0; + p->a.dataoffset = 0; /* we don't support nulls, for now */ p->a.elemtype = INT4OID; p->items = 0; p->lower = START_NUM; diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c index a3399874ada..13c5d1e9e24 100644 --- a/contrib/intarray/_int_tool.c +++ b/contrib/intarray/_int_tool.c @@ -208,12 +208,13 @@ ArrayType * new_intArrayType(int num) { ArrayType *r; - int nbytes = ARR_OVERHEAD(NDIM) + sizeof(int) * num; + int nbytes = ARR_OVERHEAD_NONULLS(NDIM) + sizeof(int) * num; r = (ArrayType *) palloc0(nbytes); ARR_SIZE(r) = nbytes; ARR_NDIM(r) = NDIM; + r->dataoffset = 0; /* marker for no null bitmap */ ARR_ELEMTYPE(r) = INT4OID; *((int *) ARR_DIMS(r)) = num; *((int *) ARR_LBOUND(r)) = 1; @@ -224,7 +225,7 @@ new_intArrayType(int num) ArrayType * resize_intArrayType(ArrayType *a, int num) { - int nbytes = ARR_OVERHEAD(NDIM) + sizeof(int) * num; + int nbytes = ARR_OVERHEAD_NONULLS(NDIM) + sizeof(int) * num; if (num == ARRNELEMS(a)) return a; diff --git a/contrib/tsearch2/query_rewrite.c b/contrib/tsearch2/query_rewrite.c index 163801c230b..e3d40cc44d8 100644 --- a/contrib/tsearch2/query_rewrite.c +++ b/contrib/tsearch2/query_rewrite.c @@ -232,7 +232,7 @@ rewrite_accum(PG_FUNCTION_ARGS) { if (ARR_ELEMTYPE(qa) != tsqOid) elog(ERROR, "array should contain tsquery type"); - deconstruct_array(qa, tsqOid, -1, false, 'i', &elemsp, &nelemsp); + deconstruct_array(qa, tsqOid, -1, false, 'i', &elemsp, NULL, &nelemsp); q = (QUERYTYPE*)DatumGetPointer( elemsp[0] ); if ( q->size == 0 ) { |