Commit af2ba777 authored by unknown's avatar unknown
Browse files

Fixed bug #22753. 

After the patch for big 21698 equality propagation stopped
working for BETWEEN and IN predicates with STRING arguments.
This changeset completes the solution of the above patch.


mysql-test/r/select.result:
  Added a test case for bug #22735.
mysql-test/t/select.test:
  Added a test case for bug #22735.
sql/item_cmpfunc.h:
  Fixed bug #22753.
  After the patch for big 21698 equality propagation stopped
  working for BETWEEN and IN predicates with STRING arguments.
  This changeset completes the solution of the above patch.
  
  Added an implementation of the subst_argument_checker method
  for Item_func_opt_neg (the direct ancestor of Item_func_between
  and Item_func_in) which allows equality propagation for
  BETWEEN and IN predicates.
parent 78bf0287

mysql-test/r/select.result

+29 −0
Original line number Diff line number Diff line
@@ -3517,3 +3517,32 @@ id a b c d e 
2	NULL	NULL	NULL	2	40

2	NULL	NULL	NULL	2	50

DROP TABLE t1,t2,t3;

CREATE TABLE t1 (pk varchar(10) PRIMARY KEY, fk varchar(16));

CREATE TABLE t2 (pk varchar(16) PRIMARY KEY, fk varchar(10));

INSERT INTO t1 VALUES

('d','dddd'), ('i','iii'), ('a','aa'), ('b','bb'), ('g','gg'), 

('e','eee'), ('c','cccc'), ('h','hhh'), ('j','jjj'), ('f','fff');

INSERT INTO t2 VALUES

('jjj', 'j'), ('cc','c'), ('ccc','c'), ('aaa', 'a'), ('jjjj','j'),

('hhh','h'), ('gg','g'), ('fff','f'), ('ee','e'), ('ffff','f'),

('bbb','b'), ('ff','f'), ('cccc','c'), ('dddd','d'), ('jj','j'),

('aaaa','a'), ('bb','b'), ('eeee','e'), ('aa','a'), ('hh','h');

EXPLAIN SELECT t2.* 

FROM t1 JOIN t2 ON t2.fk=t1.pk

WHERE t2.fk < 'c' AND t2.pk=t1.fk;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	12	NULL	3	Using where

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	18	test.t1.fk	1	Using where

EXPLAIN SELECT t2.* 

FROM t1 JOIN t2 ON t2.fk=t1.pk 

WHERE t2.fk BETWEEN 'a' AND 'b' AND t2.pk=t1.fk;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	12	NULL	2	Using where

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	18	test.t1.fk	1	Using where

EXPLAIN SELECT t2.* 

FROM t1 JOIN t2 ON t2.fk=t1.pk 

WHERE t2.fk IN ('a','b') AND t2.pk=t1.fk;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	12	NULL	2	Using where

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	18	test.t1.fk	1	Using where

DROP TABLE t1,t2;

mysql-test/t/select.test

+28 −1
Original line number Diff line number Diff line
@@ -2996,5 +2996,32 @@ SELECT * FROM t1 LEFT JOIN t2 ON t2.b=t1.a INNER JOIN t3 ON t3.d=t1.id 
SELECT * FROM t1 LEFT JOIN t2 ON t2.b=t1.a INNER JOIN t3 ON t3.d=t1.id

  WHERE t1.id=2;





DROP TABLE t1,t2,t3;



#

# Bug #22735: no equality propagation for BETWEEN and IN with STRING arguments

#



CREATE TABLE t1 (pk varchar(10) PRIMARY KEY, fk varchar(16));

CREATE TABLE t2 (pk varchar(16) PRIMARY KEY, fk varchar(10));



INSERT INTO t1 VALUES

  ('d','dddd'), ('i','iii'), ('a','aa'), ('b','bb'), ('g','gg'), 

  ('e','eee'), ('c','cccc'), ('h','hhh'), ('j','jjj'), ('f','fff');

INSERT INTO t2 VALUES

  ('jjj', 'j'), ('cc','c'), ('ccc','c'), ('aaa', 'a'), ('jjjj','j'),

  ('hhh','h'), ('gg','g'), ('fff','f'), ('ee','e'), ('ffff','f'),

  ('bbb','b'), ('ff','f'), ('cccc','c'), ('dddd','d'), ('jj','j'),

  ('aaaa','a'), ('bb','b'), ('eeee','e'), ('aa','a'), ('hh','h');



EXPLAIN SELECT t2.* 

  FROM t1 JOIN t2 ON t2.fk=t1.pk

    WHERE t2.fk < 'c' AND t2.pk=t1.fk;

EXPLAIN SELECT t2.* 

  FROM t1 JOIN t2 ON t2.fk=t1.pk 

    WHERE t2.fk BETWEEN 'a' AND 'b' AND t2.pk=t1.fk;

EXPLAIN SELECT t2.* 

  FROM t1 JOIN t2 ON t2.fk=t1.pk 

    WHERE t2.fk IN ('a','b') AND t2.pk=t1.fk;



DROP TABLE t1,t2;

sql/item_cmpfunc.h

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ class Item_func_opt_neg :public Item_int_func 
    negated= !negated;

    return this;

  }

  bool subst_argument_checker(byte **arg) { return TRUE; }

};