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

MDEV-9764: MariaDB does not limit memory used for range optimization

Browse Source 
Part #2: make tree_or(tree1, tree2) to reuse tree1 for the result object
for simple cases. These include key IN (c1, ... cN).

The reuse was happening in old MySQL versions, but we stopped doing it
in the "fair choice between range and index_merge" patch.
This commit is contained in:
Sergei Petrunia
2016-06-02 19:00:26 +03:00
parent 66dd9fa397
commit 7d3d75895d
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/opt_range.cc
View File

@@ -8566,14 +8566,30 @@ tree_or(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
imerge[0]= new SEL_IMERGE(tree1->merges.head(), 0, param); imerge[0]= new SEL_IMERGE(tree1->merges.head(), 0, param);
} }
bool no_imerge_from_ranges= FALSE; bool no_imerge_from_ranges= FALSE;
if (!(result= new (param->mem_root) SEL_TREE(param->mem_root, param->keys)))
DBUG_RETURN(result);
/* Build the range part of the tree for the formula (1) */ /* Build the range part of the tree for the formula (1) */
if (sel_trees_can_be_ored(param, tree1, tree2, &ored_keys)) if (sel_trees_can_be_ored(param, tree1, tree2, &ored_keys))
{ {
bool must_be_ored= sel_trees_must_be_ored(param, tree1, tree2, ored_keys); bool must_be_ored= sel_trees_must_be_ored(param, tree1, tree2, ored_keys);
no_imerge_from_ranges= must_be_ored; no_imerge_from_ranges= must_be_ored;
if (no_imerge_from_ranges && no_merges1 && no_merges2)
{
/*
Reuse tree1 as the result in simple cases. This reduces memory usage
for e.g. "key IN (c1, ..., cN)" which produces a lot of ranges.
*/
result= tree1;
}
else
{
if (!(result= new (param->mem_root) SEL_TREE(param->mem_root,
param->keys)))
{
DBUG_RETURN(result);
}
}
key_map::Iterator it(ored_keys); key_map::Iterator it(ored_keys);
int key_no; int key_no;
while ((key_no= it++) != key_map::Iterator::BITMAP_END) while ((key_no= it++) != key_map::Iterator::BITMAP_END)
@@ -8590,6 +8606,12 @@ tree_or(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
} }
result->type= tree1->type; result->type= tree1->type;
} }
else
{
if (!result && !(result= new (param->mem_root) SEL_TREE(param->mem_root,
param->keys)))
DBUG_RETURN(result);
}
if (no_imerge_from_ranges && no_merges1 && no_merges2) if (no_imerge_from_ranges && no_merges1 && no_merges2)
{ {