Fix broken compare function for tsquery_ops. Per Tom's report.

feodor · feodor · commit be939544a68f · 2008-04-20T09:17:57.000Z
I never understood why initial authors GiST in pgsql choose so
stgrange signature for 'same' method:
bool *sameFn(Datum a, Datum b, bool* result)
instead of simple, logical
bool sameFn(Datum a, Datum b)
This change will break any existing GiST extension, so we still live with
it and will live.
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.5 2008/04/14 17:05:33 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.6 2008/04/20 09:17:57 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,8 +106,11 @@ gtsquery_same(PG_FUNCTION_ARGS)
 {
 	TSQuerySign *a = (TSQuerySign *) PG_GETARG_POINTER(0);
 	TSQuerySign *b = (TSQuerySign *) PG_GETARG_POINTER(1);
+	bool		*result = (bool *) PG_GETARG_POINTER(2);
 
-	PG_RETURN_POINTER(*a == *b);
+	*result = (*a == *b) ? true : false;
+
+	PG_RETURN_POINTER(result);
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.5 2008/04/14 17:05:33 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.6 2008/04/20 09:17:57 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -106,8 +106,11 @@ gtsquery_same(PG_FUNCTION_ARGS)`
`106`	`106`	`{`
`107`	`107`	`TSQuerySign a = (TSQuerySign ) PG_GETARG_POINTER(0);`
`108`	`108`	`TSQuerySign b = (TSQuerySign ) PG_GETARG_POINTER(1);`
	`109`	`+ bool result = (bool ) PG_GETARG_POINTER(2);`
`109`	`110`
`110`		`- PG_RETURN_POINTER(a == b);`
	`111`	`+ result = (a == *b) ? true : false;`
	`112`	`+`
	`113`	`+ PG_RETURN_POINTER(result);`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`static int`