database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

join_outer.result, opt_range.cc, item_cmpfunc.cc:

Browse Source 
Post merge changes
sql_yacc.yy:
  Post merge changes
sql_select.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions (post merge changes).
   The function add_key_fields() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.


sql/item_cmpfunc.cc:
  Post merge changes
sql/opt_range.cc:
  Post merge changes
sql/sql_select.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions (post merge changes).
   The function add_key_fields() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.
sql/sql_yacc.yy:
  Post merge changes.
mysql-test/r/join_outer.result:
  Post merge changes
This commit is contained in:
unknown
2005-09-07 17:42:47 +04:00
parent 2e883d19cf
commit 0a61c3abda
5 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/join_outer.result
View File

@ -1123,14 +1123,14 @@ a b a b
7 8 7 5 7 8 7 5
EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a = t2.a OR t1.a = t2.b; EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a = t2.a OR t1.a = t2.b;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 4 1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 4 Using where
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1
EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a IN(t2.a, t2.b); EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a IN(t2.a, t2.b);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 4 1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 4 Using where
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1
EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a > IF(t1.a = t2.b-2, t2.b, t2.b-1); EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a > IF(t1.a = t2.b-2, t2.b, t2.b-1);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 4 1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 4 Using where
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1
DROP TABLE t1,t2; DROP TABLE t1,t2;

16
sql/item_cmpfunc.cc
View File

@ -1018,9 +1018,9 @@ longlong Item_func_interval::val_int()
*/ */
bool bool
Item_func_between::fix_fields(THD *thd, struct st_table_list *tables, Item **ref) Item_func_between::fix_fields(THD *thd, Item **ref)
{ {
if (Item_func_opt_neg::fix_fields(thd, tables, ref)) if (Item_func_opt_neg::fix_fields(thd, ref))
return 1; return 1;
/* not_null_tables_cache == union(T1(e),T1(e1),T1(e2)) */ /* not_null_tables_cache == union(T1(e),T1(e1),T1(e2)) */
@ -1132,8 +1132,8 @@ longlong Item_func_between::val_int()
a_dec= args[1]->val_decimal(&a_buf); a_dec= args[1]->val_decimal(&a_buf);
b_dec= args[2]->val_decimal(&b_buf); b_dec= args[2]->val_decimal(&b_buf);
if (!args[1]->null_value && !args[2]->null_value) if (!args[1]->null_value && !args[2]->null_value)
return (my_decimal_cmp(dec, a_dec)>=0) && (my_decimal_cmp(dec, b_dec)<=0); return (longlong) ((my_decimal_cmp(dec, a_dec) >= 0 &&
my_decimal_cmp(dec, b_dec) <= 0) != negated);
if (args[1]->null_value && args[2]->null_value) if (args[1]->null_value && args[2]->null_value)
null_value=1; null_value=1;
else if (args[1]->null_value) else if (args[1]->null_value)
@ -1320,12 +1320,12 @@ Item_func_ifnull::str_op(String *str)
*/ */
bool bool
Item_func_if::fix_fields(THD *thd, struct st_table_list *tlist, Item **ref) Item_func_if::fix_fields(THD *thd, Item **ref)
{ {
DBUG_ASSERT(fixed == 0); DBUG_ASSERT(fixed == 0);
args[0]->top_level_item(); args[0]->top_level_item();
if (Item_func::fix_fields(thd, tlist, ref)) if (Item_func::fix_fields(thd, ref))
return 1; return 1;
not_null_tables_cache= (args[1]->not_null_tables() not_null_tables_cache= (args[1]->not_null_tables()
@ -2305,11 +2305,11 @@ bool Item_func_in::nulls_in_row()
*/ */
bool bool
Item_func_in::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) Item_func_in::fix_fields(THD *thd, Item **ref)
{ {
Item **arg, **arg_end; Item **arg, **arg_end;
if (Item_func_opt_neg::fix_fields(thd, tables, ref)) if (Item_func_opt_neg::fix_fields(thd, ref))
return 1; return 1;
/* not_null_tables_cache == union(T1(e),union(T1(ei))) */ /* not_null_tables_cache == union(T1(e),union(T1(ei))) */

16
sql/opt_range.cc
View File

@ -3524,20 +3524,12 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond)
} }
Item_func *cond_func= (Item_func*) cond; Item_func *cond_func= (Item_func*) cond;
if (cond_func->functype() == Item_func::NOT_FUNC) if (cond_func->functype() == Item_func::BETWEEN ||
{ cond_func->functype() == Item_func::IN_FUNC)
/* Optimize NOT BETWEEN and NOT IN */ inv= ((Item_func_opt_neg *) cond_func)->negated;
Item *arg= cond_func->arguments()[0];
if (arg->type() != Item::FUNC_ITEM)
DBUG_RETURN(0);
cond_func= (Item_func*) arg;
if (cond_func->functype() != Item_func::BETWEEN &&
cond_func->functype() != Item_func::IN_FUNC)
DBUG_RETURN(0);
inv= TRUE;
}
else if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE) else if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE)
DBUG_RETURN(0); DBUG_RETURN(0);
param->cond= cond; param->cond= cond;
switch (cond_func->functype()) { switch (cond_func->functype()) {

13
sql/sql_select.cc
View File

@ -2862,19 +2862,6 @@ add_key_fields(KEY_FIELD **key_fields,uint *and_level,
if (cond->type() != Item::FUNC_ITEM) if (cond->type() != Item::FUNC_ITEM)
return; return;
Item_func *cond_func= (Item_func*) cond; Item_func *cond_func= (Item_func*) cond;
if (cond_func->functype() == Item_func::NOT_FUNC)
{
Item *item= cond_func->arguments()[0];
/*
At this moment all NOT before simple comparison predicates
are eliminated. NOT IN and NOT BETWEEN are treated similar
IN and BETWEEN respectively.
*/
if (item->type() == Item::FUNC_ITEM &&
((Item_func *) item)->select_optimize() == Item_func::OPTIMIZE_KEY)
add_key_fields(key_fields,and_level,item,usable_tables);
return;
}
switch (cond_func->select_optimize()) { switch (cond_func->select_optimize()) {
case Item_func::OPTIMIZE_NONE: case Item_func::OPTIMIZE_NONE:
break; break;

16
sql/sql_yacc.yy
View File

@ -4274,7 +4274,9 @@ predicate:
else else
{ {
$5->push_front($1); $5->push_front($1);
$$= negate_expression(YYTHD, new Item_func_in(*$5)); Item_func_in *item = new Item_func_in(*$5);
item->negate();
$$= item;
} }
} }
| bit_expr IN_SYM in_subselect | bit_expr IN_SYM in_subselect
@ -4284,7 +4286,11 @@ predicate:
| bit_expr BETWEEN_SYM bit_expr AND_SYM predicate | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
{ $$= new Item_func_between($1,$3,$5); } { $$= new Item_func_between($1,$3,$5); }
| bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate
{ $$= negate_expression(YYTHD, new Item_func_between($1,$4,$6)); } {
Item_func_between *item= new Item_func_between($1,$4,$6);
item->negate();
$$= item;
}
| bit_expr SOUNDS_SYM LIKE bit_expr | bit_expr SOUNDS_SYM LIKE bit_expr
{ $$= new Item_func_eq(new Item_func_soundex($1), { $$= new Item_func_eq(new Item_func_soundex($1),
new Item_func_soundex($4)); } new Item_func_soundex($4)); }
@ -4350,12 +4356,6 @@ all_or_any: ALL { $$ = 1; }
| ANY_SYM { $$ = 0; } | ANY_SYM { $$ = 0; }
; ;
interval_expr: interval_expr:
INTERVAL_SYM expr { $$=$2; } INTERVAL_SYM expr { $$=$2; }
; ;