From ef770cbb6913cc4c816bb09acd7cb13f996281bd Mon Sep 17 00:00:00 2001 From: Teodor Sigaev Date: Fri, 1 Jul 2005 13:44:56 +0000 Subject: Fixes from Janko Richter - Fix wrong index results on text, char, varchar for multibyte strings - Fix some SIGFPE signals - Add support for infinite timestamps - Because of locale settings, btree_gist can not be a prefix index anymore (for text). Each node holds now just the lower and upper boundary. --- contrib/btree_gist/btree_interval.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'contrib/btree_gist/btree_interval.c') diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c index 97374a40544..206b4c9488a 100644 --- a/contrib/btree_gist/btree_interval.c +++ b/contrib/btree_gist/btree_interval.c @@ -203,24 +203,14 @@ gbt_intv_penalty(PG_FUNCTION_ARGS) intvKEY *newentry = (intvKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key); float *result = (float *) PG_GETARG_POINTER(2); double iorg[2], - inew[2], - res; + inew[2]; iorg[0] = intr2num(&origentry->lower); iorg[1] = intr2num(&origentry->upper); inew[0] = intr2num(&newentry->lower); inew[1] = intr2num(&newentry->upper); - penalty_range_enlarge(iorg[0], iorg[1], inew[0], inew[1]); - - *result = 0.0; - - if (res > 0) - { - *result += FLT_MIN; - *result += (float) (res / (res + iorg[1] - iorg[0])); - *result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1)); - } + penalty_num(result,iorg[0],iorg[1],inew[0],inew[1]); PG_RETURN_POINTER(result); -- cgit v1.2.3