diff options
Diffstat (limited to 'contrib/hstore')
| -rw-r--r-- | contrib/hstore/hstore_gin.c | 4 | ||||
| -rw-r--r-- | contrib/hstore/hstore_gist.c | 8 | ||||
| -rw-r--r-- | contrib/hstore/hstore_io.c | 12 | ||||
| -rw-r--r-- | contrib/hstore/hstore_op.c | 11 |
4 files changed, 9 insertions, 26 deletions
diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c index 908530261ae..766c00bb6a7 100644 --- a/contrib/hstore/hstore_gin.c +++ b/contrib/hstore/hstore_gin.c @@ -118,9 +118,7 @@ gin_extract_hstore_query(PG_FUNCTION_ARGS) j; text *item; - deconstruct_array(query, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(query, TEXTOID, &key_datums, &key_nulls, &key_count); entries = (Datum *) palloc(sizeof(Datum) * key_count); diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c index 016bfa4a4c0..39ba92a6bf4 100644 --- a/contrib/hstore/hstore_gist.c +++ b/contrib/hstore/hstore_gist.c @@ -560,9 +560,7 @@ ghstore_consistent(PG_FUNCTION_ARGS) int key_count; int i; - deconstruct_array(query, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(query, TEXTOID, &key_datums, &key_nulls, &key_count); for (i = 0; res && i < key_count; ++i) { @@ -583,9 +581,7 @@ ghstore_consistent(PG_FUNCTION_ARGS) int key_count; int i; - deconstruct_array(query, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(query, TEXTOID, &key_datums, &key_nulls, &key_count); res = false; diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c index b3304ff8445..fb72bb6cfe4 100644 --- a/contrib/hstore/hstore_io.c +++ b/contrib/hstore/hstore_io.c @@ -567,9 +567,7 @@ hstore_from_arrays(PG_FUNCTION_ARGS) (errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR), errmsg("wrong number of array subscripts"))); - deconstruct_array(key_array, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(key_array, TEXTOID, &key_datums, &key_nulls, &key_count); /* see discussion in hstoreArrayToPairs() */ if (key_count > MaxAllocSize / sizeof(Pairs)) @@ -606,9 +604,7 @@ hstore_from_arrays(PG_FUNCTION_ARGS) (errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR), errmsg("arrays must have same bounds"))); - deconstruct_array(value_array, - TEXTOID, -1, false, TYPALIGN_INT, - &value_datums, &value_nulls, &value_count); + deconstruct_array_builtin(value_array, TEXTOID, &value_datums, &value_nulls, &value_count); Assert(key_count == value_count); } @@ -696,9 +692,7 @@ hstore_from_array(PG_FUNCTION_ARGS) errmsg("wrong number of array subscripts"))); } - deconstruct_array(in_array, - TEXTOID, -1, false, TYPALIGN_INT, - &in_datums, &in_nulls, &in_count); + deconstruct_array_builtin(in_array, TEXTOID, &in_datums, &in_nulls, &in_count); count = in_count / 2; diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c index dd79d01cac3..2f540d7ed6c 100644 --- a/contrib/hstore/hstore_op.c +++ b/contrib/hstore/hstore_op.c @@ -80,9 +80,7 @@ hstoreArrayToPairs(ArrayType *a, int *npairs) int i, j; - deconstruct_array(a, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(a, TEXTOID, &key_datums, &key_nulls, &key_count); if (key_count == 0) { @@ -582,9 +580,7 @@ hstore_slice_to_array(PG_FUNCTION_ARGS) int key_count; int i; - deconstruct_array(key_array, - TEXTOID, -1, false, TYPALIGN_INT, - &key_datums, &key_nulls, &key_count); + deconstruct_array_builtin(key_array, TEXTOID, &key_datums, &key_nulls, &key_count); if (key_count == 0) { @@ -719,8 +715,7 @@ hstore_akeys(PG_FUNCTION_ARGS) d[i] = PointerGetDatum(t); } - a = construct_array(d, count, - TEXTOID, -1, false, TYPALIGN_INT); + a = construct_array_builtin(d, count, TEXTOID); PG_RETURN_POINTER(a); } |