diff options
| author | Monty <monty@mariadb.org> | 2020-02-26 14:52:23 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-03-24 21:00:04 +0200 |
| commit | 37393bea23d10741cf99b59ddcaffd58e9652bb9 (patch) | |
| tree | 4f3e0c06407386dfe101a0fb3a21dc0f037d6b60 /sql/rowid_filter.cc | |
| parent | 8eba777c2bbad7721c818936a3a0ced3b2fcd59c (diff) | |
| download | mariadb-git-37393bea23d10741cf99b59ddcaffd58e9652bb9.tar.gz | |
Replace handler::primary_key_is_clustered() with handler::pk_is_clustering_key()
This was done to both simplify the code and also to be easier to handle
storage engines that are clustered on some other index than the primary
key.
As pk_is_clustering_key() and is_clustering_key now are using only
index_flags, these where removed from all storage engines.
Diffstat (limited to 'sql/rowid_filter.cc')
| -rw-r--r-- | sql/rowid_filter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rowid_filter.cc b/sql/rowid_filter.cc index 865f22b431a..d6c633aa3e2 100644 --- a/sql/rowid_filter.cc +++ b/sql/rowid_filter.cc @@ -356,7 +356,7 @@ void TABLE::init_cost_info_for_usable_range_rowid_filters(THD *thd) { if (!(file->index_flags(key_no, 0, 1) & HA_DO_RANGE_FILTER_PUSHDOWN)) // !1 continue; - if (key_no == s->primary_key && file->primary_key_is_clustered()) // !2 + if (file->is_clustering_key(key_no)) // !2 continue; if (quick_rows[key_no] > get_max_range_rowid_filter_elems_for_table(thd, this, @@ -447,7 +447,7 @@ TABLE::best_range_rowid_filter_for_partial_join(uint access_key_no, clustered primary key it would, but the current InnoDB code does not allow it. Later this limitation will be lifted */ - if (access_key_no == s->primary_key && file->primary_key_is_clustered()) + if (file->is_clustering_key(access_key_no)) return 0; Range_rowid_filter_cost_info *best_filter= 0; |