diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2006-04-03 09:35:35 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2006-04-03 09:35:35 +0000 |
| commit | 06e44788774db29fc7efe8084fc34c3c79235761 (patch) | |
| tree | 239bbe20ecd8d5a97475be66b3cbcd3b8f2df05d /contrib/intarray/_int_gist.c | |
| parent | e88d84b7370cf2191dc178309f356cfebb48a5d0 (diff) | |
| download | postgresql-06e44788774db29fc7efe8084fc34c3c79235761.tar.gz postgresql-06e44788774db29fc7efe8084fc34c3c79235761.zip | |
Detoast query in g_intbig_consistent and copy query in g_int_consistent.
Minor cleanups.
Diffstat (limited to 'contrib/intarray/_int_gist.c')
| -rw-r--r-- | contrib/intarray/_int_gist.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c index 4f777bc40b8..c812e6571ab 100644 --- a/contrib/intarray/_int_gist.c +++ b/contrib/intarray/_int_gist.c @@ -32,20 +32,23 @@ Datum g_int_consistent(PG_FUNCTION_ARGS) { GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); - ArrayType *query = (ArrayType *) PG_GETARG_POINTER(1); + ArrayType *query = (ArrayType *) PG_DETOAST_DATUM_COPY(PG_GETARG_POINTER(1)); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); bool retval; - if (strategy == BooleanSearchStrategy) - PG_RETURN_BOOL(execconsistent((QUERYTYPE *) query, + if (strategy == BooleanSearchStrategy) { + retval = execconsistent((QUERYTYPE *) query, (ArrayType *) DatumGetPointer(entry->key), - ISLEAFKEY((ArrayType *) DatumGetPointer(entry->key)))); + ISLEAFKEY((ArrayType *) DatumGetPointer(entry->key))); + pfree( query ); + PG_RETURN_BOOL(retval); + } - /* XXX are we sure it's safe to scribble on the query object here? */ - /* XXX what about toasted input? */ /* sort query for fast search, key is already sorted */ - if (ARRISVOID(query)) + if (ARRISVOID(query)) { + pfree( query ); PG_RETURN_BOOL(false); + } PREPAREARR(query); switch (strategy) @@ -81,6 +84,7 @@ g_int_consistent(PG_FUNCTION_ARGS) default: retval = FALSE; } + pfree( query ); PG_RETURN_BOOL(retval); } |