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

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
index 187aed886a1ecdea6c6c06a25b14e7b2bbc8a95b..e8bac906688df5eaa5c36a00de5ad48c55ab0497 100644 (file)
--- a/contrib/tsearch2/tsearch2.sql.in
+++ b/contrib/tsearch2/tsearch2.sql.in
@@ -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
index 8825029091541214d28dc9711d3dee51150836dc..dcb753a42c8b31e3626a46ac22252b26d8ae9a77 100644 (file)
--- a/src/backend/utils/adt/tsginidx.c
+++ b/src/backend/utils/adt/tsginidx.c
@@ -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
index c571a315f5ba6444f4caf1362ebee4b634bdbb9a..022e6fa04221338122dba687710aa1d0fe653f92 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -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
index 5985cd5b3191b178604633d4eb16fd179ec011d4..aa8fc7179d8e6d190f557003303680eadce861fd 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -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
index 8a11f039082daa5133676cb40564429511000f03..4c5068f2719c2a0b0d1543cf0e215e084ced9898 100644 (file)
--- a/src/include/tsearch/ts_utils.h
+++ b/src/include/tsearch/ts_utils.h
@@ -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