1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make join->key_dependent up to date for derived tables

Browse Source 
Main-author: Sergei Petrunia
This commit is contained in:
Michael Widenius 2022-05-22 20:46:03 +03:00 committed by Sergei Petrunia
parent 432a4ebe5c
commit 31811cf81d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -7641,7 +7641,7 @@ double cost_for_index_read(const THD *thd, const TABLE *table, uint key,
Adjust cost from table->quick_costs calculated by Adjust cost from table->quick_costs calculated by
multi_range_read_info_const() to be comparable with cost_for_index_read() multi_range_read_info_const() to be comparable with cost_for_index_read()
This functions is needed because best_access_patch doesn't add This functions is needed because best_access_path() doesn't add
TIME_FOR_COMPARE to it's costs until very late. TIME_FOR_COMPARE to it's costs until very late.
Preferably we should fix so that all costs are comparably. Preferably we should fix so that all costs are comparably.
(All compared costs should include TIME_FOR_COMPARE for all found (All compared costs should include TIME_FOR_COMPARE for all found
@ -8251,6 +8251,9 @@ best_access_path(JOIN *join,
if (s->key_start_dependent) if (s->key_start_dependent)
key_dependent= s->key_dependent; key_dependent= s->key_dependent;
} }
/* Check that s->key_dependent contains all used_tables found in s->keyuse */
key_dependent&= ~PSEUDO_TABLE_BITS;
DBUG_ASSERT((key_dependent & s->key_dependent) == key_dependent);
/* /*
If there is no key to access the table, but there is an equi-join If there is no key to access the table, but there is an equi-join
@ -12600,6 +12603,7 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys)
(uchar *) &first_keyuse)) (uchar *) &first_keyuse))
{ {
JOIN_TAB *tab;
first_keyuse= save_first_keyuse; first_keyuse= save_first_keyuse;
if (table->add_tmp_key(table->s->keys, parts, if (table->add_tmp_key(table->s->keys, parts,
get_next_field_for_derived_key, get_next_field_for_derived_key,
@ -12607,6 +12611,9 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys)
FALSE)) FALSE))
return TRUE; return TRUE;
table->reginfo.join_tab->keys.set_bit(table->s->keys); table->reginfo.join_tab->keys.set_bit(table->s->keys);
tab= table->reginfo.join_tab;
for (uint i=0; i < parts; i++)
tab->key_dependent|= save_first_keyuse[i].used_tables;
} }
else else
{ {