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

Change class variable names in rowid_filter to longer, more clear names

No code logic changes was done

a     -> gain
b     -> cost_of_building_range_filter
a_adj -> gain_adj
r     -> row_combinations

Other things:
- Optimized the layout of class Range_rowid_filter_cost_info.
  One effect was that I moved key_no to the private section to get
  better alignment and had to introduce a get_key_no() function.
- Indentation changes in rowid_filter.cc to avoid long rows.
This commit is contained in:
Monty
2021-10-19 18:08:12 +03:00
committed by Sergei Petrunia
parent 2cc5750c79
commit bcd5454beb
4 changed files with 46 additions and 42 deletions

View File

@@ -1917,9 +1917,9 @@ bool JOIN::make_range_rowid_filters()
continue;
DBUG_ASSERT(!(tab->ref.key >= 0 &&
tab->ref.key == (int) tab->range_rowid_filter_info->key_no));
tab->ref.key == (int) tab->range_rowid_filter_info->get_key_no()));
DBUG_ASSERT(!(tab->ref.key == -1 && tab->quick &&
tab->quick->index == tab->range_rowid_filter_info->key_no));
tab->quick->index == tab->range_rowid_filter_info->get_key_no()));
int err;
SQL_SELECT *sel= NULL;
@@ -1932,7 +1932,7 @@ bool JOIN::make_range_rowid_filters()
key_map filter_map;
filter_map.clear_all();
filter_map.set_bit(tab->range_rowid_filter_info->key_no);
filter_map.set_bit(tab->range_rowid_filter_info->get_key_no());
filter_map.merge(tab->table->with_impossible_ranges);
bool force_index_save= tab->table->force_index;
tab->table->force_index= true;
@@ -8429,7 +8429,7 @@ best_access_path(JOIN *join,
tmp-= filter->get_adjusted_gain(rows) - filter->get_cmp_gain(rows);
DBUG_ASSERT(tmp >= 0);
trace_access_idx.add("rowid_filter_key",
table->key_info[filter->key_no].name);
table->key_info[filter->get_key_no()].name);
}
}
}