Adjust the names of a couple of tsearch index support functions that had

tglsfdc · tglsfdc · commit 11fccbeaebb1 · 2007-11-28T19:33:05.000Z
inappropriately generic-sounding names.  This is more or less free since
we already forced initdb for the next beta, and it may prevent confusion or
name conflicts (particularly at the C-global-symbol level) down the road.
Per my proposal yesterday.
diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.3 2007/11/16 00:34:54 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.4 2007/11/28 19:33:04 tgl Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -552,8 +552,8 @@ AS
         OPERATOR        2       @@@ (tsvector, tsquery) RECHECK,
         FUNCTION        1       bttextcmp(text, text),
         FUNCTION        2       gin_extract_tsvector(tsvector,internal),
-        FUNCTION        3       gin_extract_query(internal,internal,smallint),
-        FUNCTION        4       gin_ts_consistent(internal,smallint,internal),
+        FUNCTION        3       gin_extract_tsquery(tsquery,internal,smallint),
+        FUNCTION        4       gin_tsquery_consistent(internal,smallint,tsquery),
         STORAGE         text;
 
 CREATE OPERATOR CLASS tsvector_ops
diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.7 2007/11/15 22:25:16 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.8 2007/11/28 19:33:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ gin_extract_tsvector(PG_FUNCTION_ARGS)
 }
 
 Datum
-gin_extract_query(PG_FUNCTION_ARGS)
+gin_extract_tsquery(PG_FUNCTION_ARGS)
 {
 	TSQuery		query = PG_GETARG_TSQUERY(0);
 	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
@@ -124,10 +124,9 @@ checkcondition_gin(void *checkval, QueryOperand *val)
 }
 
 Datum
-gin_ts_consistent(PG_FUNCTION_ARGS)
+gin_tsquery_consistent(PG_FUNCTION_ARGS)
 {
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
-
 	/* StrategyNumber strategy = PG_GETARG_UINT16(1); */
 	TSQuery		query = PG_GETARG_TSQUERY(2);
 	bool		res = FALSE;
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.439 2007/11/27 18:29:11 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.440 2007/11/28 19:33:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200711272
+#define CATALOG_VERSION_NO	200711281
 
 #endif
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.480 2007/11/27 18:29:11 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.481 2007/11/28 19:33:04 tgl Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -4223,9 +4223,9 @@ DESCR("GiST tsvector support");
 
 DATA(insert OID = 3656 (  gin_extract_tsvector	PGNSP PGUID 12 1 0 f f t f i 2 2281 "3614 2281" _null_ _null_ _null_	gin_extract_tsvector - _null_ _null_ ));
 DESCR("GIN tsvector support");
-DATA(insert OID = 3657 (  gin_extract_query		PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 21" _null_ _null_ _null_ gin_extract_query - _null_ _null_ ));
+DATA(insert OID = 3657 (  gin_extract_tsquery	PGNSP PGUID 12 1 0 f f t f i 3 2281 "3615 2281 21" _null_ _null_ _null_ gin_extract_tsquery - _null_ _null_ ));
 DESCR("GIN tsvector support");
-DATA(insert OID = 3658 (  gin_ts_consistent		PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 21 2281" _null_ _null_ _null_	gin_ts_consistent - _null_ _null_ ));
+DATA(insert OID = 3658 (  gin_tsquery_consistent PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 21 3615" _null_ _null_ _null_	gin_tsquery_consistent - _null_ _null_ ));
 DESCR("GIN tsvector support");
 
 DATA(insert OID = 3662 (  tsquery_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_lt - _null_ _null_ ));
diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1998-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.10 2007/11/15 22:25:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.11 2007/11/28 19:33:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -148,8 +148,8 @@ extern Datum gtsvectorout(PG_FUNCTION_ARGS);
  */
 
 extern Datum gin_extract_tsvector(PG_FUNCTION_ARGS);
-extern Datum gin_extract_query(PG_FUNCTION_ARGS);
-extern Datum gin_ts_consistent(PG_FUNCTION_ARGS);
+extern Datum gin_extract_tsquery(PG_FUNCTION_ARGS);
+extern Datum gin_tsquery_consistent(PG_FUNCTION_ARGS);
 
 /*
  * Possible strategy numbers for indexes

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/tsginidx.c,v 1.7 2007/11/15 22:25:16 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.8 2007/11/28 19:33:04 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -51,7 +51,7 @@ gin_extract_tsvector(PG_FUNCTION_ARGS)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`Datum`
`54`		`-gin_extract_query(PG_FUNCTION_ARGS)`
	`54`	`+gin_extract_tsquery(PG_FUNCTION_ARGS)`
`55`	`55`	`{`
`56`	`56`	`TSQuery query = PG_GETARG_TSQUERY(0);`
`57`	`57`	`int32 nentries = (int32 ) PG_GETARG_POINTER(1);`
`@@ -124,10 +124,9 @@ checkcondition_gin(void checkval, QueryOperand val)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`Datum`
`127`		`-gin_ts_consistent(PG_FUNCTION_ARGS)`
	`127`	`+gin_tsquery_consistent(PG_FUNCTION_ARGS)`
`128`	`128`	`{`
`129`	`129`	`bool check = (bool ) PG_GETARG_POINTER(0);`
`130`		`-`
`131`	`130`	`/* StrategyNumber strategy = PG_GETARG_UINT16(1); */`
`132`	`131`	`TSQuery query = PG_GETARG_TSQUERY(2);`
`133`	`132`	`bool res = FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`38`	`38`	`* Portions Copyright (c) 1994, Regents of the University of California`
`39`	`39`	`*`
`40`		`- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.439 2007/11/27 18:29:11 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.440 2007/11/28 19:33:04 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -53,6 +53,6 @@`
`53`	`53`	`*/`
`54`	`54`
`55`	`55`	`/* yyyymmddN */`
`56`		`-#define CATALOG_VERSION_NO 200711272`
	`56`	`+#define CATALOG_VERSION_NO 200711281`
`57`	`57`
`58`	`58`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1998-2007, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`		`- * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.10 2007/11/15 22:25:17 momjian Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.11 2007/11/28 19:33:05 tgl Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -148,8 +148,8 @@ extern Datum gtsvectorout(PG_FUNCTION_ARGS);`
`148`	`148`	`*/`
`149`	`149`
`150`	`150`	`extern Datum gin_extract_tsvector(PG_FUNCTION_ARGS);`
`151`		`-extern Datum gin_extract_query(PG_FUNCTION_ARGS);`
`152`		`-extern Datum gin_ts_consistent(PG_FUNCTION_ARGS);`
	`151`	`+extern Datum gin_extract_tsquery(PG_FUNCTION_ARGS);`
	`152`	`+extern Datum gin_tsquery_consistent(PG_FUNCTION_ARGS);`
`153`	`153`
`154`	`154`	`/*`
`155`	`155`	`* Possible strategy numbers for indexes`