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

Commitd982daa

Browse files
committed
Change void* opaque argument to Datum type, add argument's
name to PushFunction type definition.Per suggestion by Tome Lane <tgl@sss.pgh.pa.us>
1 parent83d0b9f commitd982daa

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

‎src/backend/tsearch/to_tsany.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.2 2007/09/07 15:09:55 teodor Exp $
10+
* $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.3 2007/09/10 12:36:40 teodor Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -235,7 +235,7 @@ to_tsvector(PG_FUNCTION_ARGS)
235235
* and different variants are ORred together.
236236
*/
237237
staticvoid
238-
pushval_morph(void*opaque,TSQueryParserStatestate,char*strval,intlenval,int2weight)
238+
pushval_morph(Datumopaque,TSQueryParserStatestate,char*strval,intlenval,int2weight)
239239
{
240240
int4count=0;
241241
ParsedTextprs;
@@ -244,7 +244,7 @@ pushval_morph(void *opaque, TSQueryParserState state, char *strval, int lenval,
244244
cntvar=0,
245245
cntpos=0,
246246
cnt=0;
247-
Oidcfg_id=(Oid)opaque;/* the input is actually an Oid, not a pointer */
247+
Oidcfg_id=DatumGetObjectId(opaque);/* the input is actually an Oid, not a pointer */
248248

249249
prs.lenwords=4;
250250
prs.curwords=0;
@@ -303,7 +303,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
303303
QueryItem*res;
304304
int4len;
305305

306-
query=parse_tsquery(TextPGetCString(in),pushval_morph,(void*)cfgid, false);
306+
query=parse_tsquery(TextPGetCString(in),pushval_morph,ObjectIdGetDatum(cfgid), false);
307307

308308
if (query->size==0)
309309
PG_RETURN_TSQUERY(query);
@@ -341,7 +341,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
341341
QueryItem*res;
342342
int4len;
343343

344-
query=parse_tsquery(TextPGetCString(in),pushval_morph,(void*)cfgid, true);
344+
query=parse_tsquery(TextPGetCString(in),pushval_morph,ObjectIdGetDatum(cfgid), true);
345345

346346
if (query->size==0)
347347
PG_RETURN_TSQUERY(query);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.5 2007/09/07 16:03:40 teodor Exp $
10+
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.6 2007/09/10 12:36:40 teodor Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -314,7 +314,7 @@ pushStop(TSQueryParserState state)
314314
staticvoid
315315
makepol(TSQueryParserStatestate,
316316
PushFunctionpushval,
317-
void*opaque)
317+
Datumopaque)
318318
{
319319
int8operator=0;
320320
ts_tokentypetype;
@@ -460,7 +460,7 @@ findoprnd(QueryItem *ptr, int size)
460460
TSQuery
461461
parse_tsquery(char*buf,
462462
PushFunctionpushval,
463-
void*opaque,
463+
Datumopaque,
464464
boolisplain)
465465
{
466466
structTSQueryParserStateDatastate;
@@ -543,7 +543,7 @@ parse_tsquery(char *buf,
543543
}
544544

545545
staticvoid
546-
pushval_asis(void*opaque,TSQueryParserStatestate,char*strval,intlenval,
546+
pushval_asis(Datumopaque,TSQueryParserStatestate,char*strval,intlenval,
547547
int16weight)
548548
{
549549
pushValue(state,strval,lenval,weight);
@@ -559,7 +559,7 @@ tsqueryin(PG_FUNCTION_ARGS)
559559

560560
pg_verifymbstr(in,strlen(in), false);
561561

562-
PG_RETURN_TSQUERY(parse_tsquery(in,pushval_asis,NULL, false));
562+
PG_RETURN_TSQUERY(parse_tsquery(in,pushval_asis,PointerGetDatum(NULL), false));
563563
}
564564

565565
/*

‎src/include/tsearch/ts_utils.h

Lines changed: 5 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.3 2007/09/07 15:09:56 teodor Exp $
8+
* $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.4 2007/09/10 12:36:41 teodor Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -38,11 +38,13 @@ extern void close_tsvector_parser(TSVectorParseState state);
3838
structTSQueryParserStateData;/* private in backend/utils/adt/tsquery.c */
3939
typedefstructTSQueryParserStateData*TSQueryParserState;
4040

41-
typedefvoid (*PushFunction)(void*opaque,TSQueryParserStatestate,char*,int,int2);
41+
typedefvoid (*PushFunction)(Datumopaque,TSQueryParserStatestate,
42+
char*token,inttokenlen,
43+
int2tokenweights/* bitmap as described in QueryOperand struct */ );
4244

4345
externTSQueryparse_tsquery(char*buf,
4446
PushFunctionpushval,
45-
void*opaque,boolisplain);
47+
Datumopaque,boolisplain);
4648

4749
/* Functions for use by PushFunction implementations */
4850
externvoidpushValue(TSQueryParserStatestate,

0 commit comments

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