1 fix various comparing functions

feodor · feodor · commit fb13881f4231 · 2005-03-31T15:08:08.000Z
2 implement gtsvector_out for use with gevel module (debug GiST indexes, http://www.sai.msu.su/~megera/postgres/gist/gevel/)
diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c
@@ -92,7 +92,9 @@ reset_dict(void)
 static int
 comparedict(const void *a, const void *b)
 {
-	return ((DictInfo *) a)->dict_id - ((DictInfo *) b)->dict_id;
+	if ( ((DictInfo *) a)->dict_id == ((DictInfo *) b)->dict_id )
+		return 0;
+	return ( ((DictInfo *) a)->dict_id < ((DictInfo *) b)->dict_id ) ? -1 : 1;
 }
 
 DictInfo *
diff --git a/contrib/tsearch2/gistidx.c b/contrib/tsearch2/gistidx.c
@@ -54,6 +54,7 @@ Datum		gtsvector_picksplit(PG_FUNCTION_ARGS);
 	GETBITBYTE(val,7)	\
 )
 
+static int4 sizebitvec(BITVECP sign);
 
 Datum
 gtsvector_in(PG_FUNCTION_ARGS)
@@ -64,13 +65,31 @@ gtsvector_in(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(0);
 }
 
+#define	SINGOUTSTR	"%d true bits, %d false bits"
+#define	ARROUTSTR	"%d unique words"
+#define EXTRALEN	( 2*13 )
+
+static int outbuf_maxlen = 0;
+
 Datum
 gtsvector_out(PG_FUNCTION_ARGS)
 {
-	ereport(ERROR,
-			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("gtsvector_out not implemented")));
-	PG_RETURN_DATUM(0);
+	GISTTYPE   *key = (GISTTYPE *) DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_POINTER(0)));
+	char *outbuf;
+
+	if ( outbuf_maxlen==0 )
+		outbuf_maxlen = 2*EXTRALEN + Max( strlen(SINGOUTSTR), strlen(ARROUTSTR) ) + 1;
+	outbuf = palloc( outbuf_maxlen );
+
+	if ( ISARRKEY(key) ) 
+		sprintf( outbuf, ARROUTSTR, ARRNELEM(key) );  
+	else {
+		int cnttrue = ( ISALLTRUE(key) ) ? SIGLENBIT : sizebitvec(GETSIGN(key));
+		sprintf( outbuf, SINGOUTSTR, cnttrue, SIGLENBIT - cnttrue ); 
+	}	
+
+	PG_FREE_IF_COPY(key,0);
+	PG_RETURN_POINTER(outbuf);
 }
 
 static int
diff --git a/contrib/tsearch2/rank.c b/contrib/tsearch2/rank.c
@@ -386,7 +386,7 @@ static int
 compareDocR(const void *a, const void *b)
 {
 	if (((DocRepresentation *) a)->pos == ((DocRepresentation *) b)->pos)
-		return 1;
+		return 0;
 	return (((DocRepresentation *) a)->pos > ((DocRepresentation *) b)->pos) ? 1 : -1;
 }
 
@@ -654,7 +654,7 @@ static int
 compareDocWord(const void *a, const void *b)
 {
 	if (((DocWord *) a)->pos == ((DocWord *) b)->pos)
-		return 1;
+		return 0;
 	return (((DocWord *) a)->pos > ((DocWord *) b)->pos) ? 1 : -1;
 }
 
diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
@@ -186,7 +186,9 @@ reset_cfg(void)
 static int
 comparecfg(const void *a, const void *b)
 {
-	return ((TSCfgInfo *) a)->id - ((TSCfgInfo *) b)->id;
+	if ( ((TSCfgInfo *) a)->id == ((TSCfgInfo *) b)->id )
+		return 0;
+	return ( ((TSCfgInfo *) a)->id < ((TSCfgInfo *) b)->id ) ? -1 : 1;
 }
 
 TSCfgInfo *
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
@@ -51,7 +51,7 @@ static int
 comparePos(const void *a, const void *b)
 {
 	if (WEP_GETPOS(*(WordEntryPos *) a) == WEP_GETPOS(*(WordEntryPos *) b))
-		return 1;
+		return 0;
 	return (WEP_GETPOS(*(WordEntryPos *) a)> WEP_GETPOS(*(WordEntryPos *) b)) ? 1 : -1;
 }
 
diff --git a/contrib/tsearch2/wparser.c b/contrib/tsearch2/wparser.c
@@ -93,7 +93,9 @@ reset_prs(void)
 static int
 compareprs(const void *a, const void *b)
 {
-	return ((WParserInfo *) a)->prs_id - ((WParserInfo *) b)->prs_id;
+	if ( ((WParserInfo *) a)->prs_id == ((WParserInfo *) b)->prs_id )
+		return 0;
+	return ( ((WParserInfo *) a)->prs_id < ((WParserInfo *) b)->prs_id ) ? -1 : 1;
 }
 
 WParserInfo *

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ reset_dict(void)`
`92`	`92`	`static int`
`93`	`93`	`comparedict(const void a, const void b)`
`94`	`94`	`{`
`95`		`- return ((DictInfo ) a)->dict_id - ((DictInfo ) b)->dict_id;`
	`95`	`+ if ( ((DictInfo ) a)->dict_id == ((DictInfo ) b)->dict_id )`
	`96`	`+ return 0;`
	`97`	`+ return ( ((DictInfo ) a)->dict_id < ((DictInfo ) b)->dict_id ) ? -1 : 1;`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`DictInfo *`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ static int`
`386`	`386`	`compareDocR(const void a, const void b)`
`387`	`387`	`{`
`388`	`388`	`if (((DocRepresentation ) a)->pos == ((DocRepresentation ) b)->pos)`
`389`		`- return 1;`
	`389`	`+ return 0;`
`390`	`390`	`return (((DocRepresentation ) a)->pos > ((DocRepresentation ) b)->pos) ? 1 : -1;`
`391`	`391`	`}`
`392`	`392`
`@@ -654,7 +654,7 @@ static int`
`654`	`654`	`compareDocWord(const void a, const void b)`
`655`	`655`	`{`
`656`	`656`	`if (((DocWord ) a)->pos == ((DocWord ) b)->pos)`
`657`		`- return 1;`
	`657`	`+ return 0;`
`658`	`658`	`return (((DocWord ) a)->pos > ((DocWord ) b)->pos) ? 1 : -1;`
`659`	`659`	`}`
`660`	`660`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,9 @@ reset_cfg(void)`
`186`	`186`	`static int`
`187`	`187`	`comparecfg(const void a, const void b)`
`188`	`188`	`{`
`189`		`- return ((TSCfgInfo ) a)->id - ((TSCfgInfo ) b)->id;`
	`189`	`+ if ( ((TSCfgInfo ) a)->id == ((TSCfgInfo ) b)->id )`
	`190`	`+ return 0;`
	`191`	`+ return ( ((TSCfgInfo ) a)->id < ((TSCfgInfo ) b)->id ) ? -1 : 1;`
`190`	`192`	`}`
`191`	`193`
`192`	`194`	`TSCfgInfo *`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ static int`
`51`	`51`	`comparePos(const void a, const void b)`
`52`	`52`	`{`
`53`	`53`	`if (WEP_GETPOS((WordEntryPos ) a) == WEP_GETPOS((WordEntryPos ) b))`
`54`		`- return 1;`
	`54`	`+ return 0;`
`55`	`55`	`return (WEP_GETPOS((WordEntryPos ) a)> WEP_GETPOS((WordEntryPos ) b)) ? 1 : -1;`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,9 @@ reset_prs(void)`
`93`	`93`	`static int`
`94`	`94`	`compareprs(const void a, const void b)`
`95`	`95`	`{`
`96`		`- return ((WParserInfo ) a)->prs_id - ((WParserInfo ) b)->prs_id;`
	`96`	`+ if ( ((WParserInfo ) a)->prs_id == ((WParserInfo ) b)->prs_id )`
	`97`	`+ return 0;`
	`98`	`+ return ( ((WParserInfo ) a)->prs_id < ((WParserInfo ) b)->prs_id ) ? -1 : 1;`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`WParserInfo *`