Change void* opaque argument to Datum type, add argument's

feodor · feodor · commit d982daae0bbb · 2007-09-10T12:36:41.000Z
name to PushFunction type definition.

Per suggestion by Tome Lane &lt;tgl@sss.pgh.pa.us&gt;
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.2 2007/09/07 15:09:55 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.3 2007/09/10 12:36:40 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -235,7 +235,7 @@ to_tsvector(PG_FUNCTION_ARGS)
  * and different variants are ORred together. 
  */
 static void
-pushval_morph(void *opaque, TSQueryParserState state, char *strval, int lenval, int2 weight)
+pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval, int2 weight)
 {
 	int4		count = 0;
 	ParsedText	prs;
@@ -244,7 +244,7 @@ pushval_morph(void *opaque, TSQueryParserState state, char *strval, int lenval,
 				cntvar = 0,
 				cntpos = 0,
 				cnt = 0;
-	Oid cfg_id = (Oid) opaque; /* the input is actually an Oid, not a pointer */
+	Oid cfg_id = DatumGetObjectId(opaque); /* the input is actually an Oid, not a pointer */
 
 	prs.lenwords = 4;
 	prs.curwords = 0;
@@ -303,7 +303,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
 	QueryItem  *res;
 	int4		len;
 
-	query = parse_tsquery(TextPGetCString(in), pushval_morph, (void *) cfgid, false);
+	query = parse_tsquery(TextPGetCString(in), pushval_morph, ObjectIdGetDatum(cfgid), false);
 
 	if (query->size == 0)
 		PG_RETURN_TSQUERY(query);
@@ -341,7 +341,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
 	QueryItem  *res;
 	int4		len;
 
-	query = parse_tsquery(TextPGetCString(in), pushval_morph, (void *)cfgid, true);
+	query = parse_tsquery(TextPGetCString(in), pushval_morph, ObjectIdGetDatum(cfgid), true);
 
 	if (query->size == 0)
 		PG_RETURN_TSQUERY(query);
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.5 2007/09/07 16:03:40 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.6 2007/09/10 12:36:40 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -314,7 +314,7 @@ pushStop(TSQueryParserState state)
 static void
 makepol(TSQueryParserState state, 
 		PushFunction pushval,
-		void *opaque)
+		Datum opaque)
 {
 	int8		operator = 0;
 	ts_tokentype type;
@@ -460,7 +460,7 @@ findoprnd(QueryItem *ptr, int size)
 TSQuery
 parse_tsquery(char *buf, 
 			  PushFunction pushval,
-			  void *opaque,
+			  Datum opaque,
 			  bool isplain)
 {
 	struct TSQueryParserStateData state;
@@ -543,7 +543,7 @@ parse_tsquery(char *buf,
 }
 
 static void
-pushval_asis(void *opaque, TSQueryParserState state, char *strval, int lenval,
+pushval_asis(Datum opaque, TSQueryParserState state, char *strval, int lenval,
 			 int16 weight)
 {
 	pushValue(state, strval, lenval, weight);
@@ -559,7 +559,7 @@ tsqueryin(PG_FUNCTION_ARGS)
 
 	pg_verifymbstr(in, strlen(in), false);
 
-	PG_RETURN_TSQUERY(parse_tsquery(in, pushval_asis, NULL, false));
+	PG_RETURN_TSQUERY(parse_tsquery(in, pushval_asis, PointerGetDatum(NULL), false));
 }
 
 /*
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.3 2007/09/07 15:09:56 teodor Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.4 2007/09/10 12:36:41 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,11 +38,13 @@ extern void close_tsvector_parser(TSVectorParseState state);
 struct TSQueryParserStateData;	/* private in backend/utils/adt/tsquery.c */
 typedef struct TSQueryParserStateData *TSQueryParserState;
 
-typedef void (*PushFunction)(void *opaque, TSQueryParserState state, char *, int, int2);
+typedef void (*PushFunction)(Datum opaque, TSQueryParserState state, 
+				char *token, int tokenlen, 
+				int2 tokenweights /* bitmap as described in QueryOperand struct */ );
 
 extern TSQuery parse_tsquery(char *buf,
 			  PushFunction pushval,
-			  void *opaque, bool isplain);
+			  Datum opaque, bool isplain);
 
 /* Functions for use by PushFunction implementations */
 extern void pushValue(TSQueryParserState state,

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.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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -314,7 +314,7 @@ pushStop(TSQueryParserState state)`
`314`	`314`	`static void`
`315`	`315`	`makepol(TSQueryParserState state,`
`316`	`316`	`PushFunction pushval,`
`317`		`- void *opaque)`
	`317`	`+ Datum opaque)`
`318`	`318`	`{`
`319`	`319`	`int8 operator = 0;`
`320`	`320`	`ts_tokentype type;`
`@@ -460,7 +460,7 @@ findoprnd(QueryItem *ptr, int size)`
`460`	`460`	`TSQuery`
`461`	`461`	`parse_tsquery(char *buf,`
`462`	`462`	`PushFunction pushval,`
`463`		`- void *opaque,`
	`463`	`+ Datum opaque,`
`464`	`464`	`bool isplain)`
`465`	`465`	`{`
`466`	`466`	`struct TSQueryParserStateData state;`
`@@ -543,7 +543,7 @@ parse_tsquery(char *buf,`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`static void`
`546`		`-pushval_asis(void opaque, TSQueryParserState state, char strval, int lenval,`
	`546`	`+pushval_asis(Datum opaque, TSQueryParserState state, char *strval, int lenval,`
`547`	`547`	`int16 weight)`
`548`	`548`	`{`
`549`	`549`	`pushValue(state, strval, lenval, weight);`
`@@ -559,7 +559,7 @@ tsqueryin(PG_FUNCTION_ARGS)`
`559`	`559`
`560`	`560`	`pg_verifymbstr(in, strlen(in), false);`
`561`	`561`
`562`		`- PG_RETURN_TSQUERY(parse_tsquery(in, pushval_asis, NULL, false));`
	`562`	`+ PG_RETURN_TSQUERY(parse_tsquery(in, pushval_asis, PointerGetDatum(NULL), false));`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`/*`