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

Post-second-review fixes for the patch that added the code allowing to use

Browse Source 
hash join over equi-join conditions without supporting indexes.
This commit is contained in:
Igor Babaev
2011-01-24 14:54:50 -08:00
parent b251d8a4c8
commit edeeb023bc
3 changed files with 172 additions and 2333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_select.cc
View File

@ -6445,6 +6445,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab,
} while (keyuse->table == table && keyuse->is_for_hash_join());
if (!key_parts)
DBUG_RETURN(TRUE);
/* This memory is allocated only once for the joined table join_tab */
if (!(keyinfo= (KEY *) thd->alloc(sizeof(KEY))) ||
!(key_part_info = (KEY_PART_INFO *) thd->alloc(sizeof(KEY_PART_INFO)*
key_parts)))
@ -6525,19 +6526,15 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j,
{
if (!(~used_tables & keyuse->used_tables))
{
if (is_hash_join_key_no(key) &&
(keyparts == 0 || keyuse->keypart != (keyuse-1)->keypart))
{
length+= keyinfo->key_part[keyparts].store_length;
keyparts++;
}
else if (!is_hash_join_key_no(key) && keyparts == keyuse->keypart &&
!(found_part_ref_or_null & keyuse->optimize))
{
length+= keyinfo->key_part[keyuse->keypart].store_length;
found_part_ref_or_null|= keyuse->optimize;
keyparts++;
}
if ((is_hash_join_key_no(key) &&
(keyparts == 0 || keyuse->keypart != (keyuse-1)->keypart)) ||
(!is_hash_join_key_no(key) && keyparts == keyuse->keypart &&
!(found_part_ref_or_null & keyuse->optimize)))
{
length+= keyinfo->key_part[keyparts].store_length;
keyparts++;
found_part_ref_or_null|= keyuse->optimize & ~KEY_OPTIMIZE_EQ;
}
}
keyuse++;
} while (keyuse->table == table && keyuse->key == key);