upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-07-07 00:30:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync signatures of gbt_var_consistent() and gbt_num_consistent().

Browse source 
For some odd reason we pass the strategy number to gbt_num_consistent
as "const StrategyNumber *strategy".  There's no reason for that:
it almost certainly costs more at both callers and callee to pass a
pointer than to pass a small integer value.  And it's inconsistent
with gbt_var_consistent(), so fix it.

gbt_var_consistent() had its own infelicity, which was not marking
the input "key" value const.  Fix that too while we're here.

This is primarily cosmetic, so I see no need to backpatch.

Author: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/AH*AvQCYKhQGVvPWi1GiU4oY.8.1781609375063.Hmail.3020001251@tju.edu.cn
This commit is contained in:
Tom Lane 2026-07-03 14:23:22 -04:00
parent 5ee9d7c299
commit 4b808ed77c
21 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/btree_gist/btree_bool.c
View file

@ -121,7 +121,7 @@ gbt_bool_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_cash.c
View file

@ -152,7 +152,7 @@ gbt_cash_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo,
fcinfo->flinfo));
}

2
contrib/btree_gist/btree_date.c
View file

@ -167,7 +167,7 @@ gbt_date_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo,
fcinfo->flinfo));
}

2
contrib/btree_gist/btree_enum.c
View file

@ -139,7 +139,7 @@ gbt_enum_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo,
fcinfo->flinfo));
}

2
contrib/btree_gist/btree_float4.c
View file

@ -171,7 +171,7 @@ gbt_float4_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo,
fcinfo->flinfo));
}

2
contrib/btree_gist/btree_float8.c
View file

@ -173,7 +173,7 @@ gbt_float8_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo,
fcinfo->flinfo));
}

4
contrib/btree_gist/btree_inet.c
View file

@ -138,8 +138,8 @@ gbt_inet_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query,
&strategy, GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}
Datum

2
contrib/btree_gist/btree_int2.c
View file

@ -152,7 +152,7 @@ gbt_int2_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_int4.c
View file

@ -150,7 +150,7 @@ gbt_int4_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_int8.c
View file

@ -152,7 +152,7 @@ gbt_int8_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_interval.c
View file

@ -224,7 +224,7 @@ gbt_intv_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_macaddr.c
View file

@ -139,7 +139,7 @@ gbt_macad_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_macaddr8.c
View file

@ -138,7 +138,7 @@ gbt_macad8_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

2
contrib/btree_gist/btree_oid.c
View file

@ -152,7 +152,7 @@ gbt_oid_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

4
contrib/btree_gist/btree_time.c
View file

@ -207,7 +207,7 @@ gbt_time_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}
@ -251,7 +251,7 @@ gbt_timetz_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &qqq, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &qqq, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

4
contrib/btree_gist/btree_ts.c
View file

@ -257,7 +257,7 @@ gbt_ts_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &query, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}
@ -300,7 +300,7 @@ gbt_tstz_consistent(PG_FUNCTION_ARGS)
key.upper = (GBT_NUMKEY *) &kkk[MAXALIGN(tinfo.size)];
qqq = tstz_to_ts_gmt(query);
PG_RETURN_BOOL(gbt_num_consistent(&key, &qqq, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, &qqq, strategy,
GIST_LEAF(entry), &tinfo, fcinfo->flinfo));
}

4
contrib/btree_gist/btree_utils_num.c
View file

@ -262,14 +262,14 @@ gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo, FmgrInfo *
bool
gbt_num_consistent(const GBT_NUMKEY_R *key,
const void *query,
const StrategyNumber *strategy,
StrategyNumber strategy,
bool is_leaf,
const gbtree_ninfo *tinfo,
FmgrInfo *flinfo)
{
bool retval;
switch (*strategy)
switch (strategy)
{
case BTLessEqualStrategyNumber:
retval = tinfo->f_ge(query, key->lower, flinfo);

2
contrib/btree_gist/btree_utils_num.h
View file

@ -197,7 +197,7 @@ float_penalty_num_impl(double olower, double oupper,
extern Interval *abs_interval(Interval *a);
extern bool gbt_num_consistent(const GBT_NUMKEY_R *key, const void *query,
const StrategyNumber *strategy, bool is_leaf,
StrategyNumber strategy, bool is_leaf,
const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
extern float8 gbt_num_distance(const GBT_NUMKEY_R *key, const void *query,

2
contrib/btree_gist/btree_utils_var.c
View file

@ -584,7 +584,7 @@ gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v,
* The GiST consistent method
*/
bool
gbt_var_consistent(GBT_VARKEY_R *key,
gbt_var_consistent(const GBT_VARKEY_R *key,
const void *query,
StrategyNumber strategy,
Oid collation,

2
contrib/btree_gist/btree_utils_var.h
View file

@ -102,7 +102,7 @@ extern bool gbt_var_same(Datum d1, Datum d2, Oid collation,
extern float *gbt_var_penalty(float *res, const GISTENTRY *o, const GISTENTRY *n,
Oid collation, const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
extern bool gbt_var_consistent(GBT_VARKEY_R *key, const void *query,
extern bool gbt_var_consistent(const GBT_VARKEY_R *key, const void *query,
StrategyNumber strategy, Oid collation, bool is_leaf,
const gbtree_vinfo *tinfo, FmgrInfo *flinfo);

2
contrib/btree_gist/btree_uuid.c
View file

@ -149,7 +149,7 @@ gbt_uuid_consistent(PG_FUNCTION_ARGS)
key.lower = (GBT_NUMKEY *) &kkk->lower;
key.upper = (GBT_NUMKEY *) &kkk->upper;
PG_RETURN_BOOL(gbt_num_consistent(&key, query, &strategy,
PG_RETURN_BOOL(gbt_num_consistent(&key, query, strategy,
GIST_LEAF(entry), &tinfo,
fcinfo->flinfo));
}