diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2005-07-01 13:44:56 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2005-07-01 13:44:56 +0000 |
| commit | ef770cbb6913cc4c816bb09acd7cb13f996281bd (patch) | |
| tree | fe973e6aeb9c018d54ea6267f49d5d1b2d5d2f95 /contrib/btree_gist/btree_interval.c | |
| parent | 8f6e8e8fed372a592f645d8900b6f456db82cc59 (diff) | |
| download | postgresql-ef770cbb6913cc4c816bb09acd7cb13f996281bd.tar.gz postgresql-ef770cbb6913cc4c816bb09acd7cb13f996281bd.zip | |
Fixes from Janko Richter <jankorichter@yahoo.de>
- 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.
Diffstat (limited to 'contrib/btree_gist/btree_interval.c')
| -rw-r--r-- | contrib/btree_gist/btree_interval.c | 14 |
1 files changed, 2 insertions, 12 deletions
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); |