Skip to content

M
MariaDB
Commit 3d71f1cc authored by Sergey Petrunya's avatar Sergey Petrunya
Browse files
Options

MWL#17: Table elimination: fixes for windows 

include/my_global.h:
  MWL#17: Table elimination: fixes for windows
  - Add ALIGN_MAX_UNIT (assume malloc returns data aligned to this much)
mysql-test/r/table_elim.result:
  MWL#17: Table elimination: fixes for windows
  - Use only lower-case as EXPLAIN [EXTENDED] changes case of table names
    on windows
mysql-test/t/table_elim.test:
  MWL#17: Table elimination: fixes for windows
  - Use only lower-case as EXPLAIN [EXTENDED] changes case of table names
    on windows
sql/opt_table_elimination.cc:
  MWL#17: Table elimination: fixes for windows
  - Add extra alignment-padding-space for stack-allocated buffers.
parent 3cdddae6
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 60 deletions
include/my_global.h
View file @ 3d71f1cc
...@@ -925,6 +925,7 @@ typedef long long my_ptrdiff_t; ...@@ -925,6 +925,7 @@ typedef long long my_ptrdiff_t;
#define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1)) #define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1))
#define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double))
#define ALIGN_MAX_UNIT (sizeof(double))
/* Size to make adressable obj. */ /* Size to make adressable obj. */
#define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A), sizeof(double))) #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A), sizeof(double)))
#define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f) #define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f)
......
mysql-test/r/table_elim.result
View file @ 3d71f1cc
...@@ -98,78 +98,78 @@ insert into t2 select id, id, date_add('2009-06-22', interval id day) from t0; ...@@ -98,78 +98,78 @@ insert into t2 select id, id, date_add('2009-06-22', interval id day) from t0;
insert into t2 select id, id+1, date_add('2008-06-22', interval id day) from t0; insert into t2 select id, id+1, date_add('2008-06-22', interval id day) from t0;
create view v1 as create view v1 as
select select
F.id, A1.attr1, A2.attr2 f.id, a1.attr1, a2.attr2
from from
t0 F t0 f
left join t1 A1 on A1.id=F.id left join t1 a1 on a1.id=f.id
left join t2 A2 on A2.id=F.id and left join t2 a2 on a2.id=f.id and
A2.fromdate=(select MAX(fromdate) from a2.fromdate=(select MAX(fromdate) from
t2 where id=A2.id); t2 where id=a2.id);
create view v2 as create view v2 as
select select
F.id, A1.attr1, A2.attr2 f.id, a1.attr1, a2.attr2
from from
t0 F t0 f
left join t1 A1 on A1.id=F.id left join t1 a1 on a1.id=f.id
left join t2 A2 on A2.id=F.id and left join t2 a2 on a2.id=f.id and
A2.fromdate=(select MAX(fromdate) from a2.fromdate=(select MAX(fromdate) from
t2 where id=F.id); t2 where id=f.id);
This should use one table: This should use one table:
explain select id from v1 where id=2; explain select id from v1 where id=2;
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 PRIMARY F const PRIMARY PRIMARY 4 const 1 Using index 1 PRIMARY f const PRIMARY PRIMARY 4 const 1 Using index
This should use one table: This should use one table:
explain extended select id from v1 where id in (1,2,3,4); explain extended select id from v1 where id in (1,2,3,4);
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY F range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index 1 PRIMARY f range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index
Warnings: Warnings:
Note 1276 Field or reference 'test.A2.id' of SELECT #3 was resolved in SELECT #1 Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #1
Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` where (`F`.`id` in (1,2,3,4)) Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` where (`f`.`id` in (1,2,3,4))
This should use facts and A1 tables: This should use facts and a1 tables:
explain extended select id from v1 where attr1 between 12 and 14; explain extended select id from v1 where attr1 between 12 and 14;
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY A1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where 1 PRIMARY a1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where
1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A1.id 1 100.00 Using index 1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a1.id 1 100.00 Using index
Warnings: Warnings:
Note 1276 Field or reference 'test.A2.id' of SELECT #3 was resolved in SELECT #1 Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #1
Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t1` `A1` where ((`F`.`id` = `A1`.`id`) and (`A1`.`attr1` between 12 and 14)) Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t1` `a1` where ((`f`.`id` = `a1`.`id`) and (`a1`.`attr1` between 12 and 14))
This should use facts, A2 and its subquery: This should use facts, a2 and its subquery:
explain extended select id from v1 where attr2 between 12 and 14; explain extended select id from v1 where attr2 between 12 and 14;
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY A2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where 1 PRIMARY a2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where
1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A2.id 1 100.00 Using index 1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a2.id 1 100.00 Using index
3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.A2.id 2 100.00 Using index 3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.a2.id 2 100.00 Using index
Warnings: Warnings:
Note 1276 Field or reference 'test.A2.id' of SELECT #3 was resolved in SELECT #1 Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #1
Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t2` `A2` where ((`F`.`id` = `A2`.`id`) and (`A2`.`attr2` between 12 and 14) and (`A2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `A2`.`id`)))) Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where ((`f`.`id` = `a2`.`id`) and (`a2`.`attr2` between 12 and 14) and (`a2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `a2`.`id`))))
This should use one table: This should use one table:
explain select id from v2 where id=2; explain select id from v2 where id=2;
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 PRIMARY F const PRIMARY PRIMARY 4 const 1 Using index 1 PRIMARY f const PRIMARY PRIMARY 4 const 1 Using index
This should use one table: This should use one table:
explain extended select id from v2 where id in (1,2,3,4); explain extended select id from v2 where id in (1,2,3,4);
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY F range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index 1 PRIMARY f range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index
Warnings: Warnings:
Note 1276 Field or reference 'test.F.id' of SELECT #3 was resolved in SELECT #1 Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #1
Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` where (`F`.`id` in (1,2,3,4)) Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` where (`f`.`id` in (1,2,3,4))
This should use facts and A1 tables: This should use facts and a1 tables:
explain extended select id from v2 where attr1 between 12 and 14; explain extended select id from v2 where attr1 between 12 and 14;
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY A1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where 1 PRIMARY a1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where
1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A1.id 1 100.00 Using index 1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a1.id 1 100.00 Using index
Warnings: Warnings:
Note 1276 Field or reference 'test.F.id' of SELECT #3 was resolved in SELECT #1 Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #1
Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t1` `A1` where ((`F`.`id` = `A1`.`id`) and (`A1`.`attr1` between 12 and 14)) Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t1` `a1` where ((`f`.`id` = `a1`.`id`) and (`a1`.`attr1` between 12 and 14))
This should use facts, A2 and its subquery: This should use facts, a2 and its subquery:
explain extended select id from v2 where attr2 between 12 and 14; explain extended select id from v2 where attr2 between 12 and 14;
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY A2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where 1 PRIMARY a2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where
1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A2.id 1 100.00 Using where; Using index 1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a2.id 1 100.00 Using where; Using index
3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.F.id 2 100.00 Using index 3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.f.id 2 100.00 Using index
Warnings: Warnings:
Note 1276 Field or reference 'test.F.id' of SELECT #3 was resolved in SELECT #1 Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #1
Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t2` `A2` where ((`F`.`id` = `A2`.`id`) and (`A2`.`attr2` between 12 and 14) and (`A2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `F`.`id`)))) Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where ((`f`.`id` = `a2`.`id`) and (`a2`.`attr2` between 12 and 14) and (`a2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `f`.`id`))))
drop view v1, v2; drop view v1, v2;
drop table t0, t1, t2; drop table t0, t1, t2;
create table t1 (a int); create table t1 (a int);
......
mysql-test/t/table_elim.test
View file @ 3d71f1cc
...@@ -86,30 +86,30 @@ insert into t2 select id, id+1, date_add('2008-06-22', interval id day) from t0; ...@@ -86,30 +86,30 @@ insert into t2 select id, id+1, date_add('2008-06-22', interval id day) from t0;
create view v1 as create view v1 as
select select
F.id, A1.attr1, A2.attr2 f.id, a1.attr1, a2.attr2
from from
t0 F t0 f
left join t1 A1 on A1.id=F.id left join t1 a1 on a1.id=f.id
left join t2 A2 on A2.id=F.id and left join t2 a2 on a2.id=f.id and
A2.fromdate=(select MAX(fromdate) from a2.fromdate=(select MAX(fromdate) from
t2 where id=A2.id); t2 where id=a2.id);
create view v2 as create view v2 as
select select
F.id, A1.attr1, A2.attr2 f.id, a1.attr1, a2.attr2
from from
t0 F t0 f
left join t1 A1 on A1.id=F.id left join t1 a1 on a1.id=f.id
left join t2 A2 on A2.id=F.id and left join t2 a2 on a2.id=f.id and
A2.fromdate=(select MAX(fromdate) from a2.fromdate=(select MAX(fromdate) from
t2 where id=F.id); t2 where id=f.id);
--echo This should use one table: --echo This should use one table:
explain select id from v1 where id=2; explain select id from v1 where id=2;
--echo This should use one table: --echo This should use one table:
explain extended select id from v1 where id in (1,2,3,4); explain extended select id from v1 where id in (1,2,3,4);
--echo This should use facts and A1 tables: --echo This should use facts and a1 tables:
explain extended select id from v1 where attr1 between 12 and 14; explain extended select id from v1 where attr1 between 12 and 14;
--echo This should use facts, A2 and its subquery: --echo This should use facts, a2 and its subquery:
explain extended select id from v1 where attr2 between 12 and 14; explain extended select id from v1 where attr2 between 12 and 14;
# Repeat for v2: # Repeat for v2:
...@@ -118,9 +118,9 @@ explain extended select id from v1 where attr2 between 12 and 14; ...@@ -118,9 +118,9 @@ explain extended select id from v1 where attr2 between 12 and 14;
explain select id from v2 where id=2; explain select id from v2 where id=2;
--echo This should use one table: --echo This should use one table:
explain extended select id from v2 where id in (1,2,3,4); explain extended select id from v2 where id in (1,2,3,4);
--echo This should use facts and A1 tables: --echo This should use facts and a1 tables:
explain extended select id from v2 where attr1 between 12 and 14; explain extended select id from v2 where attr1 between 12 and 14;
--echo This should use facts, A2 and its subquery: --echo This should use facts, a2 and its subquery:
explain extended select id from v2 where attr2 between 12 and 14; explain extended select id from v2 where attr2 between 12 and 14;
drop view v1, v2; drop view v1, v2;
......
sql/opt_table_elimination.cc
View file @ 3d71f1cc
...@@ -868,7 +868,7 @@ bool Dep_analysis_context::run_wave(List<Dep_module> *new_bound_modules) ...@@ -868,7 +868,7 @@ bool Dep_analysis_context::run_wave(List<Dep_module> *new_bound_modules)
List_iterator<Dep_module> modules_it(*new_bound_modules); List_iterator<Dep_module> modules_it(*new_bound_modules);
while ((module= modules_it++)) while ((module= modules_it++))
{ {
char iter_buf[Dep_module::iterator_size]; char iter_buf[Dep_module::iterator_size + ALIGN_MAX_UNIT];
Dep_module::Iterator iter; Dep_module::Iterator iter;
iter= module->init_unbound_values_iter(iter_buf); iter= module->init_unbound_values_iter(iter_buf);
while ((value= module->get_next_unbound_value(this, iter))) while ((value= module->get_next_unbound_value(this, iter)))
...@@ -887,7 +887,7 @@ bool Dep_analysis_context::run_wave(List<Dep_module> *new_bound_modules) ...@@ -887,7 +887,7 @@ bool Dep_analysis_context::run_wave(List<Dep_module> *new_bound_modules)
List_iterator<Dep_value> value_it(new_bound_values); List_iterator<Dep_value> value_it(new_bound_values);
while ((value= value_it++)) while ((value= value_it++))
{ {
char iter_buf[Dep_value::iterator_size]; char iter_buf[Dep_value::iterator_size + ALIGN_MAX_UNIT];
Dep_value::Iterator iter; Dep_value::Iterator iter;
iter= value->init_unbound_modules_iter(iter_buf); iter= value->init_unbound_modules_iter(iter_buf);
while ((module= value->get_next_unbound_module(this, iter))) while ((module= value->get_next_unbound_module(this, iter)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7