mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge.

Browse source
This commit is contained in:
Igor Babaev 2011-07-06 17:26:01 -07:00
commit 801a4ebca9
3 changed files with 69 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mysql-test/r/derived_view.result
View file

@ -794,3 +794,30 @@ WHERE t4.f2 = t3.f2 AND t4.f2 = t.f1 ORDER BY f;
f f
x x
DROP TABLE t1,t2,t3,t4; DROP TABLE t1,t2,t3,t4;
#
# LP bug #806431: join over materialized derived with key
#
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES (0,0),(3,0),(1,0);
CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT a,b FROM t1 ;
SET SESSION optimizer_switch='derived_with_keys=off';
SELECT * FROM t1 AS t JOIN v1 AS v WHERE t.a = v.b AND t.b = v.b;
a b a b
0 0 0 0
0 0 3 0
0 0 1 0
SET SESSION optimizer_switch='derived_with_keys=on';
EXPLAIN
SELECT * FROM t1 AS t JOIN v1 AS v WHERE t.a = v.b AND t.b = v.b;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t ALL NULL NULL NULL NULL 3 Using where
1 PRIMARY <derived2> ref key0 key0 5 test.t.a 2
2 DERIVED t1 ALL NULL NULL NULL NULL 3
SELECT * FROM t1 AS t JOIN v1 AS v WHERE t.a = v.b AND t.b = v.b;
a b a b
0 0 1 0
0 0 3 0
0 0 0 0
SET SESSION optimizer_switch=default;
DROP VIEW v1;
DROP TABLE t1;

21
mysql-test/t/derived_view.test
View file

@ -414,3 +414,24 @@ SELECT t.f1 AS f
DROP TABLE t1,t2,t3,t4; DROP TABLE t1,t2,t3,t4;
--echo #
--echo # LP bug #806431: join over materialized derived with key
--echo #
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES (0,0),(3,0),(1,0);
CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT a,b FROM t1 ;
SET SESSION optimizer_switch='derived_with_keys=off';
SELECT * FROM t1 AS t JOIN v1 AS v WHERE t.a = v.b AND t.b = v.b;
SET SESSION optimizer_switch='derived_with_keys=on';
EXPLAIN
SELECT * FROM t1 AS t JOIN v1 AS v WHERE t.a = v.b AND t.b = v.b;
SELECT * FROM t1 AS t JOIN v1 AS v WHERE t.a = v.b AND t.b = v.b;
SET SESSION optimizer_switch=default;
DROP VIEW v1;
DROP TABLE t1;

34
sql/sql_select.cc
View file

@ -8342,17 +8342,29 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys)
return TRUE; return TRUE;
uint keyno= 0; uint keyno= 0;
KEYUSE *first_keyuse= keyuse; KEYUSE *first_keyuse= keyuse;
uint prev_part= (uint) (-1); uint prev_part= keyuse->keypart;
uint parts= 0; uint parts= 0;
uint i= 0; uint i= 0;
do
for ( ; i < count && keyno < keys; )
{ {
keyuse->key= keyno; do
keyuse->keypart_map= (key_part_map) (1 << parts);
keyuse++;
if (++i == count || keyuse->used_tables != first_keyuse->used_tables)
{ {
if (table->add_tmp_key(keyno, ++parts, keyuse->key= keyno;
keyuse->keypart_map= (key_part_map) (1 << parts);
keyuse++;
i++;
}
while (i < count && keyuse->used_tables == first_keyuse->used_tables &&
keyuse->keypart == prev_part);
parts++;
if (i < count && keyuse->used_tables == first_keyuse->used_tables)
{
prev_part= keyuse->keypart;
}
else
{
if (table->add_tmp_key(keyno, parts,
get_next_field_for_derived_key, get_next_field_for_derived_key,
(uchar *) &first_keyuse, (uchar *) &first_keyuse,
FALSE)) FALSE))
@ -8361,14 +8373,10 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys)
first_keyuse= keyuse; first_keyuse= keyuse;
keyno++; keyno++;
parts= 0; parts= 0;
prev_part= (uint) (-1);
}
else if (keyuse->keypart != prev_part)
{
parts++;
prev_part= keyuse->keypart; prev_part= keyuse->keypart;
} }
} while (keyno < keys); }
return FALSE; return FALSE;
} }