Detoast query in g_intbig_consistent and copy query in g_int_consistent

feodor · feodor · commit 7f129956e16e · 2006-04-03T08:21:05.000Z
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
@@ -32,17 +32,19 @@ 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),
-									  GIST_LEAF(entry)));
+									  GIST_LEAF(entry));
+
+		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 */
 	CHECKARRVALID(query);
 	if (ARRISVOID(query))
@@ -82,6 +84,7 @@ g_int_consistent(PG_FUNCTION_ARGS)
 		default:
 			retval = FALSE;
 	}
+	pfree( query );
 	PG_RETURN_BOOL(retval);
 }
 
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
@@ -497,7 +497,7 @@ 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;
 
@@ -506,12 +506,13 @@ g_intbig_consistent(PG_FUNCTION_ARGS)
 
 	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 );
+		return retval;
 	}
 
-	/* XXX what about toasted input? */
 	CHECKARRVALID(query);
 	if (ARRISVOID(query))
 		return FALSE;
@@ -597,5 +598,6 @@ g_intbig_consistent(PG_FUNCTION_ARGS)
 		default:
 			retval = FALSE;
 	}
+	PG_FREE_IF_COPY( query, 1 );
 	PG_RETURN_BOOL(retval);
 }

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ Datum`
`497`	`497`	`g_intbig_consistent(PG_FUNCTION_ARGS)`
`498`	`498`	`{`
`499`	`499`	`GISTENTRY entry = (GISTENTRY ) PG_GETARG_POINTER(0);`
`500`		`- ArrayType query = (ArrayType ) PG_GETARG_POINTER(1);`
	`500`	`+ ArrayType query = (ArrayType ) PG_DETOAST_DATUM(PG_GETARG_POINTER(1));`
`501`	`501`	`StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);`
`502`	`502`	`bool retval;`
`503`	`503`
`@@ -506,12 +506,13 @@ g_intbig_consistent(PG_FUNCTION_ARGS)`
`506`	`506`
`507`	`507`	`if (strategy == BooleanSearchStrategy)`
`508`	`508`	`{`
`509`		`- PG_RETURN_BOOL(signconsistent((QUERYTYPE *) query,`
	`509`	`+ retval =signconsistent((QUERYTYPE *) query,`
`510`	`510`	`GETSIGN(DatumGetPointer(entry->key)),`
`511`		`- false));`
	`511`	`+ false);`
	`512`	`+ PG_FREE_IF_COPY( query, 1 );`
	`513`	`+ return retval;`
`512`	`514`	`}`
`513`	`515`
`514`		`- /* XXX what about toasted input? */`
`515`	`516`	`CHECKARRVALID(query);`
`516`	`517`	`if (ARRISVOID(query))`
`517`	`518`	`return FALSE;`
`@@ -597,5 +598,6 @@ g_intbig_consistent(PG_FUNCTION_ARGS)`
`597`	`598`	`default:`
`598`	`599`	`retval = FALSE;`
`599`	`600`	`}`
	`601`	`+ PG_FREE_IF_COPY( query, 1 );`
`600`	`602`	`PG_RETURN_BOOL(retval);`
`601`	`603`	`}`