Fixes from Janko Richter <[email protected]>

- 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.

1 files changed, 4 insertions, 15 deletions

diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index 0741193c6f0..7de02dbca77 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -125,23 +125,12 @@ Datum
 gbt_int8_penalty(PG_FUNCTION_ARGS)
 {
 	int64KEY   *origentry = (int64KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
-	int64KEY   *newentry = (int64KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
-	float	   *result = (float *) PG_GETARG_POINTER(2);
-	int64		res;
-
-	*result = 0.0;
-
-	penalty_range_enlarge(origentry->lower, origentry->upper, newentry->lower, newentry->upper);
-
-	if (res > 0)
-	{
-		*result += FLT_MIN;
-		*result += (float) (res / ((double) (res + origentry->upper - origentry->lower)));
-		*result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1));
-	}
+	int64KEY    *newentry = (int64KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
+	float	      *result = (float *) PG_GETARG_POINTER(2);
 
+	penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
+	
 	PG_RETURN_POINTER(result);
-
 }
 
 Datum