Commit 8f7bca3a authored by unknown's avatar unknown
Browse files

range.result, range.test: 

  Added test cases for optimization request #10561.
opt_range.cc, sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.


sql/sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.
sql/opt_range.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.
mysql-test/t/range.test:
  Added test cases for optimization request #10561.
mysql-test/r/range.result:
  Added test cases for optimization request #10561.
parent c273526d

mysql-test/r/range.result

+76 −0
Original line number Diff line number Diff line
@@ -584,3 +584,79 @@ SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 2' OR ARG1 != ' 1'); 
count(*)

4

drop table t1;

CREATE TABLE t1 (

id int(11) NOT NULL auto_increment,

status varchar(20),

PRIMARY KEY  (id),

KEY (status)

);

INSERT INTO t1 VALUES

(1,'B'), (2,'B'), (3,'B'), (4,'B'), (5,'B'), (6,'B'),

(7,'B'), (8,'B'), (9,'B'), (10,'B'), (11,'B'), (12,'B'),

(13,'B'), (14,'B'), (15,'B'), (16,'B'), (17,'B'), (18,'B'),

(19,'B'), (20,'B'), (21,'B'), (22,'B'), (23,'B'), (24,'B'), 

(25,'A'), (26,'A'), (27,'A'), (28,'A'), (29,'A'), (30,'A'),

(31,'A'), (32,'A'), (33,'A'), (34,'A'), (35,'A'), (36,'A'),

(37,'A'), (38,'A'), (39,'A'), (40,'A'), (41,'A'), (42,'A'),

(43,'A'), (44,'A'), (45,'A'), (46,'A'), (47,'A'), (48,'A'),

(49,'A'), (50,'A'), (51,'A'), (52,'A'), (53,'C'), (54,'C'),

(55,'C'), (56,'C'), (57,'C'), (58,'C'), (59,'C'), (60,'C');

EXPLAIN SELECT * FROM t1 WHERE status <> 'A' AND status <> 'B';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	status	status	23	NULL	11	Using where

EXPLAIN SELECT * FROM t1 WHERE status NOT IN ('A','B');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	status	status	23	NULL	11	Using where

SELECT * FROM t1 WHERE status <> 'A' AND status <> 'B';

id	status

53	C

54	C

55	C

56	C

57	C

58	C

59	C

60	C

SELECT * FROM t1 WHERE status NOT IN ('A','B');

id	status

53	C

54	C

55	C

56	C

57	C

58	C

59	C

60	C

EXPLAIN SELECT status FROM t1 WHERE status <> 'A' AND status <> 'B';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	status	status	23	NULL	11	Using where; Using index

EXPLAIN SELECT status FROM t1 WHERE status NOT IN ('A','B');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	status	status	23	NULL	11	Using where; Using index

EXPLAIN SELECT * FROM t1 WHERE status NOT BETWEEN 'A' AND 'B';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	status	status	23	NULL	10	Using where

EXPLAIN SELECT * FROM t1 WHERE status < 'A' OR status > 'B';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	status	status	23	NULL	10	Using where

SELECT * FROM t1 WHERE status NOT BETWEEN 'A' AND 'B';

id	status

53	C

54	C

55	C

56	C

57	C

58	C

59	C

60	C

SELECT * FROM t1 WHERE status < 'A' OR status > 'B';

id	status

53	C

54	C

55	C

56	C

57	C

58	C

59	C

60	C

DROP TABLE t1;

mysql-test/t/range.test

+40 −0
Original line number Diff line number Diff line
@@ -455,3 +455,43 @@ SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 1' OR ARG1 != ' 2'); 
SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 2' OR ARG1 != ' 1');

drop table t1;



#

# Test for optimization request #10561: to use keys for

# NOT IN (c1,...,cn) and NOT BETWEEN c1 AND c2

#



CREATE TABLE t1 (

  id int(11) NOT NULL auto_increment,

  status varchar(20),

  PRIMARY KEY  (id),

  KEY (status)

);



INSERT INTO t1 VALUES

(1,'B'), (2,'B'), (3,'B'), (4,'B'), (5,'B'), (6,'B'),

(7,'B'), (8,'B'), (9,'B'), (10,'B'), (11,'B'), (12,'B'),

(13,'B'), (14,'B'), (15,'B'), (16,'B'), (17,'B'), (18,'B'),

(19,'B'), (20,'B'), (21,'B'), (22,'B'), (23,'B'), (24,'B'), 

(25,'A'), (26,'A'), (27,'A'), (28,'A'), (29,'A'), (30,'A'),

(31,'A'), (32,'A'), (33,'A'), (34,'A'), (35,'A'), (36,'A'),

(37,'A'), (38,'A'), (39,'A'), (40,'A'), (41,'A'), (42,'A'),

(43,'A'), (44,'A'), (45,'A'), (46,'A'), (47,'A'), (48,'A'),

(49,'A'), (50,'A'), (51,'A'), (52,'A'), (53,'C'), (54,'C'),

(55,'C'), (56,'C'), (57,'C'), (58,'C'), (59,'C'), (60,'C');



EXPLAIN SELECT * FROM t1 WHERE status <> 'A' AND status <> 'B';

EXPLAIN SELECT * FROM t1 WHERE status NOT IN ('A','B');



SELECT * FROM t1 WHERE status <> 'A' AND status <> 'B';

SELECT * FROM t1 WHERE status NOT IN ('A','B');



EXPLAIN SELECT status FROM t1 WHERE status <> 'A' AND status <> 'B';

EXPLAIN SELECT status FROM t1 WHERE status NOT IN ('A','B');



EXPLAIN SELECT * FROM t1 WHERE status NOT BETWEEN 'A' AND 'B';

EXPLAIN SELECT * FROM t1 WHERE status < 'A' OR status > 'B';



SELECT * FROM t1 WHERE status NOT BETWEEN 'A' AND 'B';

SELECT * FROM t1 WHERE status < 'A' OR status > 'B';



DROP TABLE t1;

sql/opt_range.cc

+108 −32
Original line number Diff line number Diff line
@@ -3306,6 +3306,38 @@ QUICK_SELECT_I *TRP_ROR_UNION::make_quick(PARAM *param, 
}





/*

  Build a SEL_TREE for <> predicate

 

  SYNOPSIS

    get_ne_mm_tree()

      param       PARAM from SQL_SELECT::test_quick_select

      cond_func   item for the predicate

      field       field in the predicate

      value       constant in the predicate

      cmp_type    compare type for the field



  RETURN 

    Pointer to tree built tree

*/



static SEL_TREE *get_ne_mm_tree(PARAM *param, Item_func *cond_func, 

                                Field *field, Item *value,

                                Item_result cmp_type)

{

  SEL_TREE *tree= 0;

  tree= get_mm_parts(param, cond_func, field, Item_func::LT_FUNC,

		       value, cmp_type);

  if (tree)

  {

    tree= tree_or(param, tree, get_mm_parts(param, cond_func, field,

					    Item_func::GT_FUNC,

					    value, cmp_type));

  }

  return tree;

}

   



/*

  Build a SEL_TREE for a simple predicate
@@ -3316,30 +3348,40 @@ QUICK_SELECT_I *TRP_ROR_UNION::make_quick(PARAM *param, 
      field       field in the predicate

      value       constant in the predicate

      cmp_type    compare type for the field

      inv         TRUE <> NOT cond_func is considered



  RETURN 

    Pointer to thre built tree

    Pointer to tree built tree

*/



static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, 

                                  Field *field, Item *value,

                                  Item_result cmp_type)

                                  Item_result cmp_type, bool inv)

{

  SEL_TREE *tree= 0;

  DBUG_ENTER("get_func_mm_tree");



  switch (cond_func->functype()) {



  case Item_func::NE_FUNC:

    tree= get_ne_mm_tree(param, cond_func, field, value, cmp_type);

    break;



  case Item_func::BETWEEN:

    if (inv)

    {

      tree= get_mm_parts(param, cond_func, field, Item_func::LT_FUNC,

		       value, cmp_type);

		         cond_func->arguments()[1],cmp_type);

      if (tree)

      {

        tree= tree_or(param, tree, get_mm_parts(param, cond_func, field,

					        Item_func::GT_FUNC,

					      value, cmp_type));

					        cond_func->arguments()[2],

                                                cmp_type));

      }

    break;

  case Item_func::BETWEEN:

    }

    else

    {

      tree= get_mm_parts(param, cond_func, field, Item_func::GE_FUNC,

		         cond_func->arguments()[1],cmp_type);

      if (tree)
@@ -3349,10 +3391,30 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, 
					         cond_func->arguments()[2],

                                                 cmp_type));

      }

    }

    break;



  case Item_func::IN_FUNC:

  {

    Item_func_in *func=(Item_func_in*) cond_func;



    if (inv)

    {

      tree= get_ne_mm_tree(param, cond_func, field,

                           func->arguments()[1], cmp_type);

      if (tree)

      {

        Item **arg, **end;

        for (arg= func->arguments()+2, end= arg+func->argument_count()-2;

             arg < end ; arg++)

        {

          tree=  tree_and(param, tree, get_ne_mm_tree(param, cond_func, field, 

                                                      *arg, cmp_type));

        }

      }

    }

    else

    {    

      tree= get_mm_parts(param, cond_func, field, Item_func::EQ_FUNC,

                         func->arguments()[1], cmp_type);

      if (tree)
@@ -3363,8 +3425,8 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, 
        {

          tree= tree_or(param, tree, get_mm_parts(param, cond_func, field, 

                                                  Item_func::EQ_FUNC,

                                                 *arg,

                                                 cmp_type));

                                                  *arg, cmp_type));

        }

      }

    }

    break;
@@ -3396,6 +3458,7 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) 
  SEL_TREE *tree=0;

  SEL_TREE *ftree= 0;

  Item_field *field_item= 0;

  bool inv= FALSE;

  Item *value;

  DBUG_ENTER("get_mm_tree");
@@ -3457,8 +3520,21 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) 
  }



  Item_func *cond_func= (Item_func*) cond;

  if (cond_func->functype() == Item_func::NOT_FUNC)

  {

    Item *arg= cond_func->arguments()[0];

    if (arg->type() == Item::FUNC_ITEM)

    {

      cond_func= (Item_func*) arg;

      if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE)

    DBUG_RETURN(0);				// Can't be calculated

        DBUG_RETURN(0);

      inv= TRUE;	

    }

    else

      DBUG_RETURN(0);

  }    

  else if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE)

      DBUG_RETURN(0);			       



  param->cond= cond;
@@ -3536,7 +3612,7 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) 
  Field *field= field_item->field;

  Item_result cmp_type= field->cmp_type();

  if (!((ref_tables | field->table->map) & param_comp))

    ftree= get_func_mm_tree(param, cond_func, field, value, cmp_type);

    ftree= get_func_mm_tree(param, cond_func, field, value, cmp_type, inv);

  Item_equal *item_equal= field_item->item_equal;

  if (item_equal)

  {
@@ -3549,7 +3625,7 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) 
        continue;

      if (!((ref_tables | f->table->map) & param_comp))

      {

        tree= get_func_mm_tree(param, cond_func, f, value, cmp_type);

        tree= get_func_mm_tree(param, cond_func, f, value, cmp_type, inv);

        ftree= !ftree ? tree : tree_and(param, ftree, tree);

      }

    }

sql/sql_select.cc

+11 −0
Original line number Diff line number Diff line
@@ -2822,6 +2822,17 @@ add_key_fields(KEY_FIELD **key_fields,uint *and_level, 
  if (cond->type() != Item::FUNC_ITEM)

    return;

  Item_func *cond_func= (Item_func*) cond;

  if (cond_func->functype() == Item_func::NOT_FUNC)

  {

    Item *item= cond_func->arguments()[0];

    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;

    }

    return;

  }

  switch (cond_func->select_optimize()) {

  case Item_func::OPTIMIZE_NONE:

    break;