Sync signatures of gbt_var_consistent() and gbt_num_consistent().

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

diff --git a/contrib/btree_gist/btree_bool.c b/contrib/btree_gist/btree_bool.c
index 8e59523f474b5ee12c2574af13ca8f6a6a2c2a40..8a79c7a0db75524d6fc71fbce52f7717569ddf9c 100644 (file)
--- a/contrib/btree_gist/btree_bool.c
+++ b/contrib/btree_gist/btree_bool.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index a347b1320e487f5442b0ca8a51ef08388f3deb50..e5427e53180eb34e2e9221eb7fdf1e969e60b105 100644 (file)
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -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));
 }

diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c
index 5e41f4574c5ad38005bc8de6f197131b97f3590d..92c725664ddf9873c4f30509a379f56fe91b8da0 100644 (file)
--- a/contrib/btree_gist/btree_date.c
+++ b/contrib/btree_gist/btree_date.c
@@ -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));
 }

diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0dd91002c956fad04ec5ce450a5b0f7e4661611e..e95ac926c936393ecb74807e970bec57baeee805 100644 (file)
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -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));
 }

diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index 04868e81a0e591cec3443a981021e329b8cffeab..df0a1908db6706cac98cdc97c99a3583fcf91c4c 100644 (file)
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -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));
 }

diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index 2771e8e0f7eb86ba41bb19a671e4aa74a0b57a1b..41db58e260267d4e4f3319d942aa7e7c88f90272 100644 (file)
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -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));
 }

diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 9d04b92d3b8d9da936a2ce01f5ff5af51a002012..146f3cb64942160bfe7d17fa9c6f35b41b5cc875 100644 (file)
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -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

diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index cc4b33177e34396baa5becac5e290c9f2841b150..4d03fb2aa369dcce1b3b0c866a86a2489dc650af 100644 (file)
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index 47790578e6bcd1ea1a3d4cad4a6a94490d178e89..2db4baa0926d04b7f0b7445a94aebeaf7908fc1e 100644 (file)
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index f48122c8d84b68ff42a131cfcc30fe83e022d840..4b2333cb315e35457b0bfe77d57cc26d5d426883 100644 (file)
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index 6b81fa2b39bdd3c946c1a800a921a87af343135c..831662d3b9db4bbffc75773a5a063e1e0504a81f 100644 (file)
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index df7c0040011a8825c1f29ad014b8a5682e1ba8ce..97f088d7795a5ccb1fd97deca254e77b9b9daa71 100644 (file)
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_macaddr8.c b/contrib/btree_gist/btree_macaddr8.c
index 3b0c9b81e854ce70ebb5e43d8c1f832a24826322..53d10612018dc58915fa6682788b6dd09df146ce 100644 (file)
--- a/contrib/btree_gist/btree_macaddr8.c
+++ b/contrib/btree_gist/btree_macaddr8.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c
index 3ddf2a993d416187fff93b782625caa6504e235b..a33ceb3288341ca1997a11925c6fe275198f87b3 100644 (file)
--- a/contrib/btree_gist/btree_oid.c
+++ b/contrib/btree_gist/btree_oid.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index 9d23fb4b867eb4d0594356744d7a5fd593c58fe5..9496112889d1ed10885555651d92fbb9df1f4a47 100644 (file)
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 0f88d5d72f4b38d9189113f5226bac2e17ea434f..9f3a51ad728e1ed68ef74f706d2e15148f94c200 100644 (file)
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -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));
 }
 

diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
index b0e41de00e1bb62157b9472de5ee8b6ac740d9ac..79c6223f99cd4f261a355040ecdddee592152737 100644 (file)
--- a/contrib/btree_gist/btree_utils_num.c
+++ b/contrib/btree_gist/btree_utils_num.c
@@ -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);

diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index d42d1e615856c487fc73f14c29b8059943675f89..52f531f70e4d252b1c2cbf89babf9692eaecd02f 100644 (file)
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -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,

diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 945fa67de3e1eb8a093c669c74327fbb564de4ca..6ab2ca263efabb88aaacc24e0b54f4655ebaec75 100644 (file)
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -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,

diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index c0ac77cb9ec6cc3276cdaf9961e76cb5b46664f9..d746186544b078e43c4e9e6f8556e1700d64a1e5 100644 (file)
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -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);
 

diff --git a/contrib/btree_gist/btree_uuid.c b/contrib/btree_gist/btree_uuid.c
index c891840fb254185cec5aa64254afc56bc36406db..36aaa85933c47550194599e74437fa4dabc8777c 100644 (file)
--- a/contrib/btree_gist/btree_uuid.c
+++ b/contrib/btree_gist/btree_uuid.c
@@ -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));
 }