summaryrefslogtreecommitdiff
path: root/contrib/btree_gist/btree_inet.c
diff options
context:
space:
mode:
authorTeodor Sigaev2005-07-01 13:44:56 +0000
committerTeodor Sigaev2005-07-01 13:44:56 +0000
commit1e59760934c992b8e4ada0f3aaff374d7114dfce (patch)
tree86757507a4cda98b8e9128c64463c2fc9cbf8a6f /contrib/btree_gist/btree_inet.c
parentca782ddf9ccad46eece430542ce79a4233673b45 (diff)
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_inet.c')
-rw-r--r--contrib/btree_gist/btree_inet.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index fad053a36f..3719d3bb1a 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -194,19 +194,8 @@ gbt_inet_penalty(PG_FUNCTION_ARGS)
inetKEY *newentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
float *result = (float *) PG_GETARG_POINTER(2);
- double 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));
- }
-
+ penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
+
PG_RETURN_POINTER(result);
}