database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 03:21:24 +03:00
Code

Fix recent cpluspluscheck issue in selfuncs.h.

Browse Source 
Fix selfuncs.h cpluspluscheck complaint, without reintroducing a
parameter name inconsistency (restore the original declaration names,
and then make corresponding function definitions consistent with that).

Oversight in commit a601366a.

Author: Peter Geoghegan <pg@bowt.ie>
Reported-By: Andres Freund <andres@anarazel.de>
This commit is contained in:
Peter Geoghegan 2022-09-20 14:08:57 -07:00
parent a601366a46
commit eccb607e19
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/adt/selfuncs.c
View File

@ -290,7 +290,7 @@ eqsel_internal(PG_FUNCTION_ARGS, bool negate)
* This is exported so that some other estimation functions can use it. * This is exported so that some other estimation functions can use it.
*/ */
double double
var_eq_const(VariableStatData *vardata, Oid operator, Oid collation, var_eq_const(VariableStatData *vardata, Oid oproid, Oid collation,
Datum constval, bool constisnull, Datum constval, bool constisnull,
bool varonleft, bool negate) bool varonleft, bool negate)
{ {
@ -331,7 +331,7 @@ var_eq_const(VariableStatData *vardata, Oid operator, Oid collation,
} }
else if (HeapTupleIsValid(vardata->statsTuple) && else if (HeapTupleIsValid(vardata->statsTuple) &&
statistic_proc_security_check(vardata, statistic_proc_security_check(vardata,
(opfuncoid = get_opcode(operator)))) (opfuncoid = get_opcode(oproid))))
{ {
AttStatsSlot sslot; AttStatsSlot sslot;
bool match = false; bool match = false;
@ -461,7 +461,7 @@ var_eq_const(VariableStatData *vardata, Oid operator, Oid collation,
* This is exported so that some other estimation functions can use it. * This is exported so that some other estimation functions can use it.
*/ */
double double
var_eq_non_const(VariableStatData *vardata, Oid operator, Oid collation, var_eq_non_const(VariableStatData *vardata, Oid oproid, Oid collation,
Node *other, Node *other,
bool varonleft, bool negate) bool varonleft, bool negate)
{ {

4
src/include/utils/selfuncs.h
View File

@ -181,11 +181,11 @@ extern double ineq_histogram_selectivity(PlannerInfo *root,
Oid collation, Oid collation,
Datum constval, Oid consttype); Datum constval, Oid consttype);
extern double var_eq_const(VariableStatData *vardata, extern double var_eq_const(VariableStatData *vardata,
Oid operator, Oid collation, Oid oproid, Oid collation,
Datum constval, bool constisnull, Datum constval, bool constisnull,
bool varonleft, bool negate); bool varonleft, bool negate);
extern double var_eq_non_const(VariableStatData *vardata, extern double var_eq_non_const(VariableStatData *vardata,
Oid operator, Oid collation, Oid oproid, Oid collation,
Node *other, Node *other,
bool varonleft, bool negate); bool varonleft, bool negate);