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

In MariaDB, KEY::actual_key_parts is named ext_key_parts

Browse Source
This commit is contained in:
Sergei Petrunia
2016-10-09 16:03:39 +00:00
parent 84dd64702a
commit d3cd64fda9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/rocksdb/ha_rocksdb.cc
View File

@@ -5047,7 +5047,7 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg,
!is_hidden_pk(i, table_arg, tbl_def_arg) && !is_hidden_pk(i, table_arg, tbl_def_arg) &&
tbl_def_arg->base_tablename().find(tmp_file_prefix) != 0) tbl_def_arg->base_tablename().find(tmp_file_prefix) != 0)
{ {
for (uint part= 0; part < table_arg->key_info[i].actual_key_parts; part++) for (uint part= 0; part < table_arg->key_info[i].ext_key_parts; part++)
{ {
if (!rdb_is_index_collation_supported( if (!rdb_is_index_collation_supported(
table_arg->key_info[i].key_part[part].field) && table_arg->key_info[i].key_part[part].field) &&
@@ -7124,7 +7124,7 @@ bool ha_rocksdb::can_use_single_delete(uint index)
{ {
return (index != pk_index(table, m_tbl_def) || return (index != pk_index(table, m_tbl_def) ||
(!has_hidden_pk(table) && (!has_hidden_pk(table) &&
table->key_info[index].actual_key_parts == table->s->fields)); table->key_info[index].ext_key_parts == table->s->fields));
} }
bool ha_rocksdb::skip_unique_check() bool ha_rocksdb::skip_unique_check()
@@ -8351,7 +8351,7 @@ int ha_rocksdb::info(uint flag)
continue; continue;
} }
KEY* k= &table->key_info[i]; KEY* k= &table->key_info[i];
for (uint j = 0; j < k->actual_key_parts; j++) for (uint j = 0; j < k->ext_key_parts; j++)
{ {
const Rdb_index_stats& k_stats= m_key_descr_arr[i]->m_stats; const Rdb_index_stats& k_stats= m_key_descr_arr[i]->m_stats;
uint x = k_stats.m_distinct_keys_per_prefix.size() > j && uint x = k_stats.m_distinct_keys_per_prefix.size() > j &&
@@ -8367,7 +8367,7 @@ int ha_rocksdb::info(uint flag)
// will have rec_per_key for (idx1)=4, (idx1,2)=2, and (idx1,2,3)=1. // will have rec_per_key for (idx1)=4, (idx1,2)=2, and (idx1,2,3)=1.
// rec_per_key for the whole index is 1, and multiplied by 2^n if // rec_per_key for the whole index is 1, and multiplied by 2^n if
// n suffix columns of the index are not used. // n suffix columns of the index are not used.
x = 1 << (k->actual_key_parts-j-1); x = 1 << (k->ext_key_parts-j-1);
} }
k->rec_per_key[j]= x; k->rec_per_key[j]= x;
} }

8
storage/rocksdb/rdb_datadic.cc
View File

@@ -160,7 +160,7 @@ void Rdb_key_def::setup(const TABLE *tbl, const Rdb_tbl_def *tbl_def)
} }
if (secondary_key) if (secondary_key)
m_pk_key_parts= hidden_pk_exists ? 1 : pk_info->actual_key_parts; m_pk_key_parts= hidden_pk_exists ? 1 : pk_info->ext_key_parts;
else else
{ {
pk_info= nullptr; pk_info= nullptr;
@@ -168,7 +168,7 @@ void Rdb_key_def::setup(const TABLE *tbl, const Rdb_tbl_def *tbl_def)
} }
// "unique" secondary keys support: // "unique" secondary keys support:
m_key_parts= is_hidden_pk ? 1 : key_info->actual_key_parts; m_key_parts= is_hidden_pk ? 1 : key_info->ext_key_parts;
if (secondary_key) if (secondary_key)
{ {
@@ -229,7 +229,7 @@ void Rdb_key_def::setup(const TABLE *tbl, const Rdb_tbl_def *tbl_def)
{ {
/* Check if this field is already present in the key definition */ /* Check if this field is already present in the key definition */
bool found= false; bool found= false;
for (uint j= 0; j < key_info->actual_key_parts; j++) for (uint j= 0; j < key_info->ext_key_parts; j++)
{ {
if (field->field_index == key_info->key_part[j].field->field_index) if (field->field_index == key_info->key_part[j].field->field_index)
{ {
@@ -285,7 +285,7 @@ void Rdb_key_def::setup(const TABLE *tbl, const Rdb_tbl_def *tbl_def)
For "unique" secondary indexes, pretend they have For "unique" secondary indexes, pretend they have
"index extensions" "index extensions"
*/ */
if (secondary_key && src_i+1 == key_info->actual_key_parts) if (secondary_key && src_i+1 == key_info->ext_key_parts)
{ {
simulating_extkey= true; simulating_extkey= true;
if (!hidden_pk_exists) if (!hidden_pk_exists)