database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix compile on Windows: use explicit casts between double and ha_rows.

Browse Source
This commit is contained in:
Sergei Petrunia
2022-09-28 17:34:22 +03:00
parent 5e651c9aea
commit 373f7ea72f
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/opt_range.cc
View File

@@ -7374,7 +7374,7 @@ TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree,
TRP_ROR_INTERSECT *trp= NULL;
if (min_cost + cmp_cost < read_time && (cpk_scan || best_num > 1))
{
double best_rows= double2rows(intersect_best->out_rows);
double best_rows= intersect_best->out_rows;
set_if_bigger(best_rows, 1);
if (!(trp= new (param->mem_root) TRP_ROR_INTERSECT))
DBUG_RETURN(NULL);
@@ -7386,8 +7386,8 @@ TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree,
trp->last_scan= trp->first_scan + best_num;
trp->is_covering= intersect_best->is_covering;
trp->read_cost= min_cost + cmp_cost;
param->table->set_opt_range_condition_rows(best_rows);
trp->records= best_rows;
param->table->set_opt_range_condition_rows((ha_rows)best_rows);
trp->records= (ha_rows)best_rows;
trp->index_scan_costs= intersect_best->index_scan_costs;
trp->cpk_scan= cpk_scan;
DBUG_PRINT("info", ("Returning non-covering ROR-intersect plan:"

20
sql/sql_select.cc
View File

@@ -7837,13 +7837,13 @@ INDEX_READ_COST cost_for_index_read(const THD *thd, const TABLE *table,
double rows_adjusted;
DBUG_ENTER("cost_for_index_read");
rows_adjusted= MY_MIN(records, (ha_rows) thd->variables.max_seeks_for_key);
rows_adjusted= MY_MIN(rows2double(records), (double) thd->variables.max_seeks_for_key);
#ifdef OLD_CODE_LIMITED_SEEKS
set_if_smaller(rows_adjusted, worst_seeks);
#endif
if (file->is_clustering_key(key))
{
cost.index_only_cost= file->ha_read_time(key, 1, rows_adjusted);
cost.index_only_cost= file->ha_read_time(key, 1, (ha_rows)rows_adjusted);
/*
Same computation as in ha_read_and_copy_time()
We do it explicitely here as we want to use the original value of
@@ -7854,20 +7854,20 @@ INDEX_READ_COST cost_for_index_read(const THD *thd, const TABLE *table,
}
else if (table->covering_keys.is_set(key) && !table->no_keyread)
{
cost.index_only_cost= file->ha_keyread_time(key, 1, rows_adjusted);
cost.index_only_cost= file->ha_keyread_time(key, 1, (ha_rows)rows_adjusted);
/* Same computation as in ha_keyread_and_copy_time() */
cost.read_cost= (cost.index_only_cost +
rows2double(records) * KEY_COPY_COST_THD(thd));
}
else
{
cost.index_only_cost= file->ha_keyread_time(key, 1, rows_adjusted);
cost.index_only_cost= file->ha_keyread_time(key, 1, (ha_rows) rows_adjusted);
/*
Note that ha_read_time() + ..ROW_COPY_COST should be same
as ha_rnd_pos_time().
*/
cost.read_cost= (cost.index_only_cost +
file->ha_read_time(key, 0, rows_adjusted) +
file->ha_read_time(key, 0, (ha_rows)rows_adjusted) +
rows2double(records) * ROW_COPY_COST_THD(thd));
}
DBUG_PRINT("statistics", ("index_cost: %.3f full_cost: %.3f",
@@ -8855,7 +8855,7 @@ best_access_path(JOIN *join,
This is done to make records found comparable to what we get with
'ref' access.
*/
org_records= records_after_filter= rnd_records= s->found_records;
org_records= records_after_filter= rnd_records= rows2double(s->found_records);
if (s->quick->get_type() == QUICK_SELECT_I::QS_TYPE_RANGE)
{
@@ -8873,7 +8873,7 @@ best_access_path(JOIN *join,
range->cost / s->quick->read_time >= 0.9999999));
filter=
table->best_range_rowid_filter_for_partial_join(key_no, range->rows,
table->best_range_rowid_filter_for_partial_join(key_no, rows2double(range->rows),
range->find_cost,
range->index_only_cost,
record_count);
@@ -8913,7 +8913,7 @@ best_access_path(JOIN *join,
rnd_records= matching_candidates_in_table(s, found_constraint,
use_cond_selectivity);
records_after_filter= rnd_records;
org_records= s->records;
org_records= rows2double(s->records);
DBUG_ASSERT(rnd_records <= s->records);
/* Estimate cost of reading table. */
@@ -8921,7 +8921,7 @@ best_access_path(JOIN *join,
{
INDEX_READ_COST cost= cost_for_index_read(thd, table, s->ref.key,
s->records,
s->worst_seeks);
(ha_rows)s->worst_seeks);
/*
The query is using 'force_index' and we did not find a usable key.
Caclulcate cost of a table scan with the forced index.
@@ -29923,7 +29923,7 @@ static bool get_range_limit_read_cost(const JOIN_TAB *tab,
{
INDEX_READ_COST cost= cost_for_index_read(tab->join->thd, table,
keynr,
ref_rows,
(ha_rows)ref_rows,
(ha_rows) tab->worst_seeks);
if (cost.read_cost < best_cost)
{