Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit11fccbe

Browse files
committed
Adjust the names of a couple of tsearch index support functions that had
inappropriately generic-sounding names. This is more or less free sincewe already forced initdb for the next beta, and it may prevent confusion orname conflicts (particularly at the C-global-symbol level) down the road.Per my proposal yesterday.
1 parentd54ca56 commit11fccbe

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

‎contrib/tsearch2/tsearch2.sql.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.3 2007/11/16 00:34:54 tgl Exp $ */
1+
/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.4 2007/11/28 19:33:04 tgl Exp $ */
22

33
-- Adjust this setting to control where the objects get created.
44
SET search_path = public;
@@ -552,8 +552,8 @@ AS
552552
OPERATOR 2 @@@ (tsvector, tsquery) RECHECK,
553553
FUNCTION 1 bttextcmp(text, text),
554554
FUNCTION 2 gin_extract_tsvector(tsvector,internal),
555-
FUNCTION 3gin_extract_query(internal,internal,smallint),
556-
FUNCTION 4gin_ts_consistent(internal,smallint,internal),
555+
FUNCTION 3gin_extract_tsquery(tsquery,internal,smallint),
556+
FUNCTION 4gin_tsquery_consistent(internal,smallint,tsquery),
557557
STORAGE text;
558558

559559
CREATE OPERATOR CLASS tsvector_ops

‎src/backend/utils/adt/tsginidx.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* 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 $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -51,7 +51,7 @@ gin_extract_tsvector(PG_FUNCTION_ARGS)
5151
}
5252

5353
Datum
54-
gin_extract_query(PG_FUNCTION_ARGS)
54+
gin_extract_tsquery(PG_FUNCTION_ARGS)
5555
{
5656
TSQueryquery=PG_GETARG_TSQUERY(0);
5757
int32*nentries= (int32*)PG_GETARG_POINTER(1);
@@ -124,10 +124,9 @@ checkcondition_gin(void *checkval, QueryOperand *val)
124124
}
125125

126126
Datum
127-
gin_ts_consistent(PG_FUNCTION_ARGS)
127+
gin_tsquery_consistent(PG_FUNCTION_ARGS)
128128
{
129129
bool*check= (bool*)PG_GETARG_POINTER(0);
130-
131130
/* StrategyNumber strategy = PG_GETARG_UINT16(1); */
132131
TSQueryquery=PG_GETARG_TSQUERY(2);
133132
boolres= FALSE;

‎src/include/catalog/catversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
3838
* Portions Copyright (c) 1994, Regents of the University of California
3939
*
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 $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO200711272
56+
#defineCATALOG_VERSION_NO200711281
5757

5858
#endif

‎src/include/catalog/pg_proc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.480 2007/11/27 18:29:11 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.481 2007/11/28 19:33:04 tgl Exp $
1111
*
1212
* NOTES
1313
* The script catalog/genbki.sh reads this file and generates .bki
@@ -4223,9 +4223,9 @@ DESCR("GiST tsvector support");
42234223

42244224
DATA(insertOID=3656 (gin_extract_tsvectorPGNSPPGUID1210fftfi22281"3614 2281"_null__null__null_gin_extract_tsvector-_null__null_ ));
42254225
DESCR("GIN tsvector support");
4226-
DATA(insertOID=3657 (gin_extract_queryPGNSPPGUID1210fftfi32281"2281 2281 21"_null__null__null_gin_extract_query-_null__null_ ));
4226+
DATA(insertOID=3657 (gin_extract_tsqueryPGNSPPGUID1210fftfi32281"3615 2281 21"_null__null__null_gin_extract_tsquery-_null__null_ ));
42274227
DESCR("GIN tsvector support");
4228-
DATA(insertOID=3658 (gin_ts_consistentPGNSPPGUID1210fftfi316"2281 212281"_null__null__null_gin_ts_consistent-_null__null_ ));
4228+
DATA(insertOID=3658 (gin_tsquery_consistentPGNSPPGUID1210fftfi316"2281 213615"_null__null__null_gin_tsquery_consistent-_null__null_ ));
42294229
DESCR("GIN tsvector support");
42304230

42314231
DATA(insertOID=3662 (tsquery_ltPGNSPPGUID1210fftfi216"3615 3615"_null__null__null_tsquery_lt-_null__null_ ));

‎src/include/tsearch/ts_utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1998-2007, PostgreSQL Global Development Group
77
*
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 $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -148,8 +148,8 @@ extern Datum gtsvectorout(PG_FUNCTION_ARGS);
148148
*/
149149

150150
externDatumgin_extract_tsvector(PG_FUNCTION_ARGS);
151-
externDatumgin_extract_query(PG_FUNCTION_ARGS);
152-
externDatumgin_ts_consistent(PG_FUNCTION_ARGS);
151+
externDatumgin_extract_tsquery(PG_FUNCTION_ARGS);
152+
externDatumgin_tsquery_consistent(PG_FUNCTION_ARGS);
153153

154154
/*
155155
* Possible strategy numbers for indexes

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp