database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Avoid using HA_POS_ERROR constant when passing around values of type double.

Browse Source 
This is error-prone and causes warnings on Windows
This commit is contained in:
Sergei Petrunia
2017-10-03 16:05:24 +03:00
parent 325e071c11
commit ebc2f0dad3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/opt_range.cc
View File

@ -2827,7 +2827,7 @@ double records_in_column_ranges(PARAM *param, uint idx,
/* Handle cases when we don't have a valid non-empty list of range */ /* Handle cases when we don't have a valid non-empty list of range */
if (!tree) if (!tree)
return HA_POS_ERROR; return DBL_MAX;
if (tree->type == SEL_ARG::IMPOSSIBLE) if (tree->type == SEL_ARG::IMPOSSIBLE)
return (0L); return (0L);
@ -2847,9 +2847,9 @@ double records_in_column_ranges(PARAM *param, uint idx,
max_endp= range.end_key.length? &range.end_key : NULL; max_endp= range.end_key.length? &range.end_key : NULL;
rows= get_column_range_cardinality(field, min_endp, max_endp, rows= get_column_range_cardinality(field, min_endp, max_endp,
range.range_flag); range.range_flag);
if (HA_POS_ERROR == rows) if (DBL_MAX == rows)
{ {
total_rows= HA_POS_ERROR; total_rows= DBL_MAX;
break; break;
} }
total_rows += rows; total_rows += rows;
@ -3083,7 +3083,7 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond)
else else
{ {
rows= records_in_column_ranges(&param, idx, key); rows= records_in_column_ranges(&param, idx, key);
if (rows != HA_POS_ERROR) if (rows != DBL_MAX)
key->field->cond_selectivity= rows/table_records; key->field->cond_selectivity= rows/table_records;
} }
} }

5
sql/sql_statistics.cc
View File

@ -3752,7 +3752,10 @@ double get_column_avg_frequency(Field * field)
using the statistical data from the table column_stats. using the statistical data from the table column_stats.
@retval @retval
The required estimate of the rows in the column range - The required estimate of the rows in the column range
- If there is some kind of error, this function should return DBL_MAX (and
not HA_POS_ERROR as that is an integer constant).
*/ */
double get_column_range_cardinality(Field *field, double get_column_range_cardinality(Field *field,