mirror of
https://github.com/MariaDB/server.git
synced 2025-10-27 05:56:07 +03:00
7517d7e112
"Process NATURAL and USING joins according to SQL:2003".
* Some of the main problems fixed by the patch:
- in "select *" queries the * expanded correctly according to
ANSI for arbitrary natural/using joins
- natural/using joins are correctly transformed into JOIN ... ON
for any number/nesting of the joins.
- column references are correctly resolved against natural joins
of any nesting and combined with arbitrary other joins.
* This patch also contains a fix for name resolution of items
inside the ON condition of JOIN ... ON - in this case items must
be resolved only against the JOIN operands. To support such
'local' name resolution, the patch introduces a stack of
name resolution contexts used at parse time.
NOTICE:
- This patch is not complete in the sense that
- there are 2 test cases that still do not pass -
one in join.test, one in select.test. Both are marked
with a comment "TODO: WL#2486".
- it does not include a new test specific for the task
mysql-test/include/ps_query.inc:
Adjusted according to standard NATURAL/USING join semantics.,
mysql-test/r/bdb.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/derived.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/errors.result:
The column as a whole cannot be resolved, so different error message.
mysql-test/r/fulltext.result:
Adjusted according to standard JOIN ... ON semantics =>
the ON condition can refer only to the join operands.
mysql-test/r/fulltext_order_by.result:
More detailed error message.
mysql-test/r/innodb.result:
Adjusted according to standard NATURAL/USING join semantics.
This test doesn't pass completetly yet!
mysql-test/r/insert_select.result:
More detailed error message.
mysql-test/r/join.result:
Adjusted according to standard NATURAL/USING join semantics.
NOTICE: there is one test case that still fails, and it is
commeted out and marked with WL#2486 in the test file.
mysql-test/r/join_crash.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/join_nested.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/join_outer.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/multi_update.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/null_key.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/order_by.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_2myisam.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_3innodb.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_4heap.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_5merge.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_6bdb.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_7ndb.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/select.result:
Adjusted according to standard NATURAL/USING join semantics.
NOTICE: there is one failing test case which is commented with
WL#2486 in the test file.
mysql-test/r/subselect.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/type_ranges.result:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/union.result:
More detailed error message.
mysql-test/t/bdb.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/errors.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/fulltext.test:
Adjusted according to standard JOIN ... ON semantics =>
the ON condition can refer only to the join operands.
mysql-test/t/fulltext_order_by.test:
More detailed error message.
mysql-test/t/innodb.test:
Adjusted according to standard NATURAL/USING join semantics.
This test doesn't pass completetly yet!
mysql-test/t/insert_select.test:
More detailed error message.
mysql-test/t/join.test:
Adjusted according to standard NATURAL/USING join semantics.
NOTICE: there is one test case that still fails, and it is
commeted out and marked with WL#2486 in the test file.
mysql-test/t/join_crash.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/join_nested.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/join_outer.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/null_key.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/order_by.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/select.test:
Adjusted according to standard NATURAL/USING join semantics.
NOTICE: there is one test case that still fails, and it is
commeted out and marked with WL#2486 in the test file.
mysql-test/t/subselect.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/type_ranges.test:
Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/union.test:
More detailed error message.
sql/item.cc:
- extra parameter to find_field_in_tables
- find_field_in_real_table renamed to find_field_in_table
- fixed comments/typos
sql/item.h:
- added [first | last]_name_resolution_table to class
Name_resolution_context
- commented old code
- standardized formatting
sql/mysql_priv.h:
- refactored the find_field_in_XXX procedures,
- added a new procedure for natural join table references,
- renamed the find_field_in_XXX procedures to clearer names
sql/sp.cc:
- pass the top-most list of the FROM clause to setup_tables
- extra parameter to find_field_in_tables
sql/sql_acl.cc:
- renamed find_field_in_table => find_field_in_table_ref
- extra parameter to find_field_in_table_ref
- commented old code
sql/sql_base.cc:
This file contains the core of the implementation of the processing
of NATURAL/USING joins (WL#2486).
- added many comments to old code
- refactored the group of find_field_in_XXX procedures, and added a
new procedure for natural joins. There is one find_field_in_XXX procedure
per each type of table reference (stored table, merge view, or natural
join); one meta-procedure that selects the correct one depeneding on the
table reference; and one procedure that goes over a list of table
referenes.
- NATURAL/USING joins are processed through the procedures:
mark_common_columns, store_natural_using_join_columns,
store_top_level_join_columns, setup_natural_join_row_types.
The entry point to processing NATURAL/USING joins is the
procedure 'setup_natural_join_row_types'.
- Replaced the specialized Field_iterator_XXX iterators with one
generic iterator over the fields of a table reference.
- Simplified 'insert_fields' and 'setup_conds' due to encapsulation of
the processing of natural joins in a separate set of procedures.
sql/sql_class.h:
- Commented old code.
sql/sql_delete.cc:
- Pass the FROM clause to setup_tables.
sql/sql_help.cc:
- pass the end name resolution table to find_field_in_tables
- adjust the list of tables for name resolution
sql/sql_insert.cc:
- Changed the code that saves and restores the current context to
support the list of tables for name resolution -
context->first_name_resolution_table, and
table_list->next_name_resolution_table.
Needed to support an ugly trick to resolve inserted columns only in
the first table.
- Added Name_resolution_context::[first | last]_name_resolution_table.
- Commented old code
sql/sql_lex.cc:
- set select_lex.parent_lex correctly
- set correct state of the current name resolution context
sql/sql_lex.h:
- Added a stack of name resolution contexts to support local
contexts for JOIN ... ON conditions.
- Commented old code.
sql/sql_load.cc:
- Pass the FROM clause to setup_tables.
sql/sql_olap.cc:
- Pass the FROM clause to setup_tables.
sql/sql_parse.cc:
- correctly set SELECT_LEX::parent_lex
- set the first table of the current name resoltion context
- added support for NATURAL/USING joins
- commented old code
sql/sql_select.cc:
- Pass the FROM clause to setup_tables.
- Pass the end table to find_field_in_tables
- Improved comments
sql/sql_show.cc:
- Set SELECT_LEX::parent_lex.
sql/sql_update.cc:
- Pass the FROM clause to setup_tables.
sql/sql_yacc.yy:
- Added support for a stack of name resolution contexts needed to
implement name resolution for JOIN ... ON. A context is pushed
for each new JOIN ... ON, and popped afterwards.
- Added support for NATURAL/USING joins.
sql/table.cc:
- Added new class Natural_join_column to hide the heterogeneous
representation of column references for stored tables and for
views.
- Added a new list TABLE_LIST::next_name_resolution_table to
support name resolution with NATURAL/USING joins. Also added
other members to TABLE_LIST to support NATURAL/USING joins.
- Added a generic iterator over the fields of table references
of various types - class Field_iterator_table_ref
sql/table.h:
- Added new class Natural_join_column to hide the heterogeneous
representation of column references for stored tables and for
views.
- Added a new list TABLE_LIST::next_name_resolution_table to
support name resolution with NATURAL/USING joins. Also added
other members to TABLE_LIST to support NATURAL/USING joins.
- Added a generic iterator over the fields of table references
of various types - class Field_iterator_table_ref
tests/mysql_client_test.c:
Adjusted according to standard NATURAL JOIN syntax.
249 lines
8.9 KiB
Plaintext
249 lines
8.9 KiB
Plaintext
#
|
|
# Check null keys
|
|
|
|
--disable_warnings
|
|
drop table if exists t1,t2;
|
|
--enable_warnings
|
|
|
|
create table t1 (a int, b int not null,unique key (a,b),index(b)) engine=myisam;
|
|
insert ignore into t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(null,7),(9,9),(8,8),(7,7),(null,9),(null,9),(6,6);
|
|
explain select * from t1 where a is null;
|
|
explain select * from t1 where a is null and b = 2;
|
|
explain select * from t1 where a is null and b = 7;
|
|
explain select * from t1 where a=2 and b = 2;
|
|
explain select * from t1 where a<=>b limit 2;
|
|
explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
|
|
explain select * from t1 where (a is null or a = 7) and b=7;
|
|
explain select * from t1 where (a is null or a = 7) and b=7 order by a;
|
|
explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;
|
|
explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
explain select * from t1 where a > 1 and a < 3 limit 1;
|
|
explain select * from t1 where a > 8 and a < 9;
|
|
select * from t1 where a is null;
|
|
select * from t1 where a is null and b = 7;
|
|
select * from t1 where a<=>b limit 2;
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3;
|
|
select * from t1 where (a is null or a = 7) and b=7;
|
|
select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
select * from t1 where a > 1 and a < 3 limit 1;
|
|
select * from t1 where a > 8 and a < 9;
|
|
create table t2 like t1;
|
|
insert into t2 select * from t1;
|
|
alter table t1 modify b blob not null, add c int not null, drop key a, add unique key (a,b(20),c), drop key b, add key (b(10));
|
|
explain select * from t1 where a is null and b = 2;
|
|
explain select * from t1 where a is null and b = 2 and c=0;
|
|
explain select * from t1 where a is null and b = 7 and c=0;
|
|
explain select * from t1 where a=2 and b = 2;
|
|
explain select * from t1 where a<=>b limit 2;
|
|
explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 and c=0 limit 3;
|
|
explain select * from t1 where (a is null or a = 7) and b=7 and c=0;
|
|
explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;
|
|
explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
explain select * from t1 where a > 1 and a < 3 limit 1;
|
|
explain select * from t1 where a is null and b=7 or a > 1 and a < 3 limit 1;
|
|
explain select * from t1 where a > 8 and a < 9;
|
|
explain select * from t1 where b like "6%";
|
|
select * from t1 where a is null;
|
|
select * from t1 where a is null and b = 7 and c=0;
|
|
select * from t1 where a<=>b limit 2;
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3;
|
|
select * from t1 where (a is null or a = 7) and b=7 and c=0;
|
|
select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
select * from t1 where b like "6%";
|
|
|
|
#
|
|
# Test ref_or_null optimization
|
|
#
|
|
drop table t1;
|
|
rename table t2 to t1;
|
|
alter table t1 modify b int null;
|
|
insert into t1 values (7,null), (8,null), (8,7);
|
|
explain select * from t1 where a = 7 and (b=7 or b is null);
|
|
select * from t1 where a = 7 and (b=7 or b is null);
|
|
explain select * from t1 where (a = 7 or a is null) and (b=7 or b is null);
|
|
select * from t1 where (a = 7 or a is null) and (b=7 or b is null);
|
|
explain select * from t1 where (a = 7 or a is null) and (a = 7 or a is null);
|
|
select * from t1 where (a = 7 or a is null) and (a = 7 or a is null);
|
|
create table t2 (a int);
|
|
insert into t2 values (7),(8);
|
|
explain select * from t2 straight_join t1 where t1.a=t2.a and b is null;
|
|
drop index b on t1;
|
|
explain select * from t2,t1 where t1.a=t2.a and b is null;
|
|
select * from t2,t1 where t1.a=t2.a and b is null;
|
|
explain select * from t2,t1 where t1.a=t2.a and (b= 7 or b is null);
|
|
select * from t2,t1 where t1.a=t2.a and (b= 7 or b is null);
|
|
explain select * from t2,t1 where (t1.a=t2.a or t1.a is null) and b= 7;
|
|
select * from t2,t1 where (t1.a=t2.a or t1.a is null) and b= 7;
|
|
explain select * from t2,t1 where (t1.a=t2.a or t1.a is null) and (b= 7 or b is null);
|
|
select * from t2,t1 where (t1.a=t2.a or t1.a is null) and (b= 7 or b is null);
|
|
insert into t2 values (null),(6);
|
|
delete from t1 where a=8;
|
|
explain select * from t2,t1 where t1.a=t2.a or t1.a is null;
|
|
explain select * from t2,t1 where t1.a<=>t2.a or (t1.a is null and t1.b <> 9);
|
|
select * from t2,t1 where t1.a<=>t2.a or (t1.a is null and t1.b <> 9);
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# The following failed for Matt Loschert
|
|
#
|
|
|
|
CREATE TABLE t1 (
|
|
id int(10) unsigned NOT NULL auto_increment,
|
|
uniq_id int(10) unsigned default NULL,
|
|
PRIMARY KEY (id),
|
|
UNIQUE KEY idx1 (uniq_id)
|
|
) ENGINE=MyISAM;
|
|
|
|
CREATE TABLE t2 (
|
|
id int(10) unsigned NOT NULL auto_increment,
|
|
uniq_id int(10) unsigned default NULL,
|
|
PRIMARY KEY (id)
|
|
) ENGINE=MyISAM;
|
|
|
|
INSERT INTO t1 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL);
|
|
INSERT INTO t2 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL);
|
|
|
|
#
|
|
# Check IS NULL optimization
|
|
#
|
|
explain select id from t1 where uniq_id is null;
|
|
explain select id from t1 where uniq_id =1;
|
|
#
|
|
# Check updates
|
|
#
|
|
UPDATE t1 SET id=id+100 where uniq_id is null;
|
|
UPDATE t2 SET id=id+100 where uniq_id is null;
|
|
select id from t1 where uniq_id is null;
|
|
select id from t2 where uniq_id is null;
|
|
#
|
|
# Delete all records from each table where the uniq_id field is null
|
|
#
|
|
DELETE FROM t1 WHERE uniq_id IS NULL;
|
|
DELETE FROM t2 WHERE uniq_id IS NULL;
|
|
#
|
|
# Select what is left -- notice the difference
|
|
#
|
|
SELECT * FROM t1 ORDER BY uniq_id, id;
|
|
SELECT * FROM t2 ORDER BY uniq_id, id;
|
|
DROP table t1,t2;
|
|
|
|
#
|
|
# This crashed MySQL 3.23.47
|
|
#
|
|
|
|
CREATE TABLE `t1` (
|
|
`order_id` char(32) NOT NULL default '',
|
|
`product_id` char(32) NOT NULL default '',
|
|
`product_type` int(11) NOT NULL default '0',
|
|
PRIMARY KEY (`order_id`,`product_id`,`product_type`)
|
|
) ENGINE=MyISAM;
|
|
CREATE TABLE `t2` (
|
|
`order_id` char(32) NOT NULL default '',
|
|
`product_id` char(32) NOT NULL default '',
|
|
`product_type` int(11) NOT NULL default '0',
|
|
PRIMARY KEY (`order_id`,`product_id`,`product_type`)
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t1 (order_id, product_id, product_type) VALUES
|
|
('3d7ce39b5d4b3e3d22aaafe9b633de51',1206029, 3),
|
|
('3d7ce39b5d4b3e3d22aaafe9b633de51',5880836, 3),
|
|
('9d9aad7764b5b2c53004348ef8d34500',2315652, 3);
|
|
INSERT INTO t2 (order_id, product_id, product_type) VALUES
|
|
('9d9aad7764b5b2c53004348ef8d34500',2315652, 3);
|
|
|
|
select t1.* from t1 left join t2
|
|
on (t1.order_id = t2.order_id and
|
|
t1.product_id = t2.product_id and
|
|
t1.product_type = t2.product_type)
|
|
where t2.order_id = NULL;
|
|
|
|
select t1.* from t1 left join t2
|
|
on (t1.order_id = t2.order_id and
|
|
t1.product_id = t2.product_id and
|
|
t1.product_type = t2.product_type)
|
|
where t2.order_id is NULL;
|
|
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# The last select returned wrong results in 3.23.52
|
|
#
|
|
|
|
create table t1 (id int);
|
|
insert into t1 values (null), (0);
|
|
create table t2 (id int);
|
|
insert into t2 values (null);
|
|
select * from t1, t2 where t1.id = t2.id;
|
|
alter table t1 add key id (id);
|
|
select * from t1, t2 where t1.id = t2.id;
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# Check bug when doing <=> NULL on an indexed null field
|
|
#
|
|
|
|
create table t1 (
|
|
id integer,
|
|
id2 integer not null,
|
|
index (id),
|
|
index (id2)
|
|
);
|
|
insert into t1 values(null,null),(1,1);
|
|
select * from t1;
|
|
select * from t1 where id <=> null;
|
|
select * from t1 where id <=> null or id > 0;
|
|
select * from t1 where id is null or id > 0;
|
|
select * from t1 where id2 <=> null or id2 > 0;
|
|
select * from t1 where id2 is null or id2 > 0;
|
|
delete from t1 where id <=> NULL;
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Test for bug #12144: optimizations for key access with null keys
|
|
# used for outer joins
|
|
#
|
|
|
|
CREATE TABLE t1 (a int);
|
|
CREATE TABLE t2 (a int, b int, INDEX idx(a));
|
|
CREATE TABLE t3 (b int, INDEX idx(b));
|
|
CREATE TABLE t4 (b int, INDEX idx(b));
|
|
INSERT INTO t1 VALUES (1), (2), (3), (4);
|
|
INSERT INTO t2 VALUES (1, 1), (3, 1);
|
|
INSERT INTO t3 VALUES
|
|
(NULL), (NULL), (NULL), (NULL), (NULL),
|
|
(NULL), (NULL), (NULL), (NULL), (NULL);
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t4 SELECT * FROM t3;
|
|
INSERT INTO t3 SELECT * FROM t4;
|
|
INSERT INTO t3 VALUES (2), (3);
|
|
|
|
ANALYZE table t1, t2, t3;
|
|
|
|
SELECT COUNT(*) FROM t3;
|
|
|
|
EXPLAIN SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
|
|
LEFT JOIN t3 ON t2.b=t3.b;
|
|
FLUSH STATUS ;
|
|
SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
|
|
LEFT JOIN t3 ON t2.b=t3.b;
|
|
SELECT FOUND_ROWS();
|
|
SHOW STATUS LIKE "handler_read%";
|
|
|
|
DROP TABLE t1,t2,t3,t4;
|
|
# End of 4.1 tests
|