From e314c3f53f2ff8e58f459fb3211ae87fce460be7 Mon Sep 17 00:00:00 2001 From: Teodor Sigaev Date: Mon, 3 Apr 2006 10:27:28 +0000 Subject: Detoast query in g_intbig_consistent and copy query in g_int_consistent. Minor cleanups. --- contrib/intarray/_intbig_gist.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'contrib/intarray/_intbig_gist.c') diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c index e4588a0d4bb..a6cc6b4f24d 100644 --- a/contrib/intarray/_intbig_gist.c +++ b/contrib/intarray/_intbig_gist.c @@ -440,22 +440,27 @@ Datum g_intbig_consistent(PG_FUNCTION_ARGS) { GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); - ArrayType *query = (ArrayType *) PG_GETARG_POINTER(1); + ArrayType *query = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_POINTER(1)); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); bool retval; - if ( ISALLTRUE(DatumGetPointer(entry->key)) ) + if ( ISALLTRUE(DatumGetPointer(entry->key)) ) { + PG_FREE_IF_COPY(query, 1); PG_RETURN_BOOL(true); + } if (strategy == BooleanSearchStrategy) { - PG_RETURN_BOOL(signconsistent((QUERYTYPE *) query, + retval = signconsistent((QUERYTYPE *) query, GETSIGN(DatumGetPointer(entry->key)), - false)); + false); + PG_FREE_IF_COPY(query, 1); + PG_RETURN_BOOL( retval ); } - /* XXX what about toasted input? */ - if (ARRISVOID(query)) - return FALSE; + if (ARRISVOID(query)) { + PG_FREE_IF_COPY(query, 1); + PG_RETURN_BOOL( FALSE ); + } switch (strategy) { @@ -520,6 +525,8 @@ g_intbig_consistent(PG_FUNCTION_ARGS) default: retval = FALSE; } + + PG_FREE_IF_COPY(query, 1); PG_RETURN_BOOL(retval); } -- cgit v1.2.3