database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed the bug mdev-13710.

Browse Source 
This patch corrects the code of the patch for mdev-13369 that
introduced the splitting technique when using materialized
derived tables / views with GROUP BY. The second actual parameters
of the call of the method JOIN::reoptimize() in the function
JOIN::push_splitting_cond_into_derived() was calculated incorrectly.
This could cause different failures for queries using derived tables
or views with GROUP BY when their FROM lists contained empty or
single-row tables.
This commit is contained in:
Igor Babaev
2017-09-09 20:35:05 -07:00
parent 5e4aa1a2f8
commit 61074d0426
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/derived_cond_pushdown.result
View File

@ -10149,3 +10149,19 @@ EXPLAIN
} }
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1,t2,t3,t4; DROP TABLE t1,t2,t3,t4;
#
# MDEV-13710: Optimization for equi-joins of grouping derived tables
# (Splitting derived tables / views with GROUP BY) :
# FROM list of the derived table contains constant tables
#
CREATE TABLE t1 (a int, INDEX(a)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (9),(5),(1);
CREATE TABLE t2 (b int) ENGINE=MyISAM;
CREATE TABLE t3 (c varchar(8), d int) ENGINE=MyISAM;
INSERT INTO t3 VALUES ('foo',2),('bar',6);
CREATE VIEW v1 AS SELECT a FROM t1, t2 GROUP BY a;
SELECT * FROM t3
WHERE d IN ( SELECT * FROM v1 ) AND c LIKE 'z%' OR c IS NULL;
c d
DROP VIEW v1;
DROP TABLE t1,t2,t3;

22
mysql-test/t/derived_cond_pushdown.test
View File

@ -1794,3 +1794,25 @@ eval explain format=json $q1;
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1,t2,t3,t4; DROP TABLE t1,t2,t3,t4;
--echo #
--echo # MDEV-13710: Optimization for equi-joins of grouping derived tables
--echo # (Splitting derived tables / views with GROUP BY) :
--echo # FROM list of the derived table contains constant tables
--echo #
CREATE TABLE t1 (a int, INDEX(a)) ENGINE=MyISAM;
INSERT INTO t1 VALUES (9),(5),(1);
CREATE TABLE t2 (b int) ENGINE=MyISAM;
CREATE TABLE t3 (c varchar(8), d int) ENGINE=MyISAM;
INSERT INTO t3 VALUES ('foo',2),('bar',6);
CREATE VIEW v1 AS SELECT a FROM t1, t2 GROUP BY a;
SELECT * FROM t3
WHERE d IN ( SELECT * FROM v1 ) AND c LIKE 'z%' OR c IS NULL;
DROP VIEW v1;
DROP TABLE t1,t2,t3;

6
sql/sql_select.cc
View File

@ -9073,12 +9073,10 @@ bool JOIN::push_splitting_cond_into_derived(THD *thd, Item *cond)
{ {
enum_reopt_result reopt_result= REOPT_NONE; enum_reopt_result reopt_result= REOPT_NONE;
table_map all_table_map= 0; table_map all_table_map= 0;
for (JOIN_TAB *tab= join_tab + const_tables; for (JOIN_TAB *tab= join_tab;
tab < join_tab + top_join_tab_count; tab++) tab < join_tab + top_join_tab_count; tab++)
{
all_table_map|= tab->table->map; all_table_map|= tab->table->map;
} reopt_result= reoptimize(cond, all_table_map & ~const_table_map, NULL);
reopt_result= reoptimize(cond, all_table_map, NULL);
if (reopt_result == REOPT_ERROR) if (reopt_result == REOPT_ERROR)
return true; return true;
if (inject_cond_into_where(cond)) if (inject_cond_into_where(cond))