diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2017-03-21 09:12:46 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2017-03-21 10:43:27 -0400 |
| commit | 4b1c68d63e8651094cfe0631682acd999652ea70 (patch) | |
| tree | 472468b746c1b701c81635c56a05e25789d44d2b /contrib/btree_gist/btree_inet.c | |
| parent | eb2a6131beccaad2b39629191508062b70d3a1c6 (diff) | |
| download | postgresql-4b1c68d63e8651094cfe0631682acd999652ea70.tar.gz postgresql-4b1c68d63e8651094cfe0631682acd999652ea70.zip | |
Use CallerFInfoFunctionCall with btree_gist for numeric types
None of the existing types actually need to use this mechanism, but this
will allow support for enum types which will need it. A separate patch
will adjust the varlena types support for consistency.
Reviewed by Tom Lane and Anastasia Lubennikova
Discussion: http://postgr.es/m/27220.1478360811@sss.pgh.pa.us
Diffstat (limited to 'contrib/btree_gist/btree_inet.c')
| -rw-r--r-- | contrib/btree_gist/btree_inet.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c index 822786125d9..7c95ee68145 100644 --- a/contrib/btree_gist/btree_inet.c +++ b/contrib/btree_gist/btree_inet.c @@ -27,33 +27,33 @@ PG_FUNCTION_INFO_V1(gbt_inet_same); static bool -gbt_inetgt(const void *a, const void *b) +gbt_inetgt(const void *a, const void *b, FmgrInfo *flinfo) { return (*((const double *) a) > *((const double *) b)); } static bool -gbt_inetge(const void *a, const void *b) +gbt_inetge(const void *a, const void *b, FmgrInfo *flinfo) { return (*((const double *) a) >= *((const double *) b)); } static bool -gbt_ineteq(const void *a, const void *b) +gbt_ineteq(const void *a, const void *b, FmgrInfo *flinfo) { return (*((const double *) a) == *((const double *) b)); } static bool -gbt_inetle(const void *a, const void *b) +gbt_inetle(const void *a, const void *b, FmgrInfo *flinfo) { return (*((const double *) a) <= *((const double *) b)); } static bool -gbt_inetlt(const void *a, const void *b) +gbt_inetlt(const void *a, const void *b, FmgrInfo *flinfo) { return (*((const double *) a) < *((const double *) b)); } static int -gbt_inetkey_cmp(const void *a, const void *b) +gbt_inetkey_cmp(const void *a, const void *b, FmgrInfo *flinfo) { inetKEY *ia = (inetKEY *) (((const Nsrt *) a)->t); inetKEY *ib = (inetKEY *) (((const Nsrt *) b)->t); @@ -133,7 +133,7 @@ gbt_inet_consistent(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query, - &strategy, GIST_LEAF(entry), &tinfo)); + &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)); } @@ -144,7 +144,7 @@ gbt_inet_union(PG_FUNCTION_ARGS) void *out = palloc(sizeof(inetKEY)); *(int *) PG_GETARG_POINTER(1) = sizeof(inetKEY); - PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo)); + PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo, fcinfo->flinfo)); } @@ -167,7 +167,7 @@ gbt_inet_picksplit(PG_FUNCTION_ARGS) PG_RETURN_POINTER(gbt_num_picksplit( (GistEntryVector *) PG_GETARG_POINTER(0), (GIST_SPLITVEC *) PG_GETARG_POINTER(1), - &tinfo + &tinfo, fcinfo->flinfo )); } @@ -178,6 +178,6 @@ gbt_inet_same(PG_FUNCTION_ARGS) inetKEY *b2 = (inetKEY *) PG_GETARG_POINTER(1); bool *result = (bool *) PG_GETARG_POINTER(2); - *result = gbt_num_same((void *) b1, (void *) b2, &tinfo); + *result = gbt_num_same((void *) b1, (void *) b2, &tinfo, fcinfo->flinfo); PG_RETURN_POINTER(result); } |