mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
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
This commit is contained in:
@ -26,33 +26,33 @@ PG_FUNCTION_INFO_V1(gbt_float8_same);
|
||||
|
||||
|
||||
static bool
|
||||
gbt_float8gt(const void *a, const void *b)
|
||||
gbt_float8gt(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
return (*((const float8 *) a) > *((const float8 *) b));
|
||||
}
|
||||
static bool
|
||||
gbt_float8ge(const void *a, const void *b)
|
||||
gbt_float8ge(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
return (*((const float8 *) a) >= *((const float8 *) b));
|
||||
}
|
||||
static bool
|
||||
gbt_float8eq(const void *a, const void *b)
|
||||
gbt_float8eq(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
return (*((const float8 *) a) == *((const float8 *) b));
|
||||
}
|
||||
static bool
|
||||
gbt_float8le(const void *a, const void *b)
|
||||
gbt_float8le(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
return (*((const float8 *) a) <= *((const float8 *) b));
|
||||
}
|
||||
static bool
|
||||
gbt_float8lt(const void *a, const void *b)
|
||||
gbt_float8lt(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
return (*((const float8 *) a) < *((const float8 *) b));
|
||||
}
|
||||
|
||||
static int
|
||||
gbt_float8key_cmp(const void *a, const void *b)
|
||||
gbt_float8key_cmp(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
float8KEY *ia = (float8KEY *) (((const Nsrt *) a)->t);
|
||||
float8KEY *ib = (float8KEY *) (((const Nsrt *) b)->t);
|
||||
@ -69,7 +69,7 @@ gbt_float8key_cmp(const void *a, const void *b)
|
||||
}
|
||||
|
||||
static float8
|
||||
gbt_float8_dist(const void *a, const void *b)
|
||||
gbt_float8_dist(const void *a, const void *b, FmgrInfo *flinfo)
|
||||
{
|
||||
float8 arg1 = *(const float8 *) a;
|
||||
float8 arg2 = *(const float8 *) b;
|
||||
@ -151,7 +151,7 @@ gbt_float8_consistent(PG_FUNCTION_ARGS)
|
||||
key.upper = (GBT_NUMKEY *) &kkk->upper;
|
||||
|
||||
PG_RETURN_BOOL(
|
||||
gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo)
|
||||
gbt_num_consistent(&key, (void *) &query, &strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
|
||||
);
|
||||
}
|
||||
|
||||
@ -170,7 +170,7 @@ gbt_float8_distance(PG_FUNCTION_ARGS)
|
||||
key.upper = (GBT_NUMKEY *) &kkk->upper;
|
||||
|
||||
PG_RETURN_FLOAT8(
|
||||
gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo)
|
||||
gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo, fcinfo->flinfo)
|
||||
);
|
||||
}
|
||||
|
||||
@ -182,7 +182,7 @@ gbt_float8_union(PG_FUNCTION_ARGS)
|
||||
void *out = palloc(sizeof(float8KEY));
|
||||
|
||||
*(int *) PG_GETARG_POINTER(1) = sizeof(float8KEY);
|
||||
PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));
|
||||
PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo, fcinfo->flinfo));
|
||||
}
|
||||
|
||||
|
||||
@ -205,7 +205,7 @@ gbt_float8_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
|
||||
));
|
||||
}
|
||||
|
||||
@ -216,6 +216,6 @@ gbt_float8_same(PG_FUNCTION_ARGS)
|
||||
float8KEY *b2 = (float8KEY *) 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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user