Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
83817644
Commit
83817644
authored
Feb 01, 2011
by
Ole John Aske
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
5599fef0
c8de3bba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
228 additions
and
38 deletions
+228
-38
mysql-test/r/range.result
mysql-test/r/range.result
+101
-0
mysql-test/t/range.test
mysql-test/t/range.test
+67
-0
sql/sql_select.cc
sql/sql_select.cc
+60
-38
No files found.
mysql-test/r/range.result
View file @
83817644
...
...
@@ -1666,4 +1666,105 @@ c_key c_notkey
1 1
3 3
DROP TABLE t1;
#
# Bug #57030: 'BETWEEN' evaluation is incorrect
#
CREATE TABLE t1(pk INT PRIMARY KEY, i4 INT);
CREATE UNIQUE INDEX i4_uq ON t1(i4);
INSERT INTO t1 VALUES (1,10), (2,20), (3,30);
EXPLAIN
SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 const i4_uq i4_uq 5 const 1
SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 10;
pk i4
1 10
EXPLAIN
SELECT * FROM t1 WHERE 10 BETWEEN i4 AND i4;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 const i4_uq i4_uq 5 const 1
SELECT * FROM t1 WHERE 10 BETWEEN i4 AND i4;
pk i4
1 10
EXPLAIN
SELECT * FROM t1 WHERE 10 BETWEEN 10 AND i4;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range i4_uq i4_uq 5 NULL 3 Using where
SELECT * FROM t1 WHERE 10 BETWEEN 10 AND i4;
pk i4
1 10
2 20
3 30
EXPLAIN
SELECT * FROM t1 WHERE 10 BETWEEN i4 AND 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range i4_uq i4_uq 5 NULL 1 Using where
SELECT * FROM t1 WHERE 10 BETWEEN i4 AND 10;
pk i4
1 10
EXPLAIN
SELECT * FROM t1 WHERE 10 BETWEEN 10 AND 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3
SELECT * FROM t1 WHERE 10 BETWEEN 10 AND 10;
pk i4
1 10
2 20
3 30
EXPLAIN
SELECT * FROM t1 WHERE 10 BETWEEN 11 AND 11;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE 10 BETWEEN 11 AND 11;
pk i4
EXPLAIN
SELECT * FROM t1 WHERE 10 BETWEEN 100 AND 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE 10 BETWEEN 100 AND 0;
pk i4
EXPLAIN
SELECT * FROM t1 WHERE i4 BETWEEN 100 AND 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
SELECT * FROM t1 WHERE i4 BETWEEN 100 AND 0;
pk i4
EXPLAIN
SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 99999999999999999;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range i4_uq i4_uq 5 NULL 2 Using where
SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 99999999999999999;
pk i4
1 10
2 20
3 30
EXPLAIN
SELECT * FROM t1 WHERE i4 BETWEEN 999999999999999 AND 30;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
SELECT * FROM t1 WHERE i4 BETWEEN 999999999999999 AND 30;
pk i4
EXPLAIN
SELECT * FROM t1 WHERE i4 BETWEEN 10 AND '20';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range i4_uq i4_uq 5 NULL 1 Using where
SELECT * FROM t1 WHERE i4 BETWEEN 10 AND '20';
pk i4
1 10
2 20
EXPLAIN
SELECT * FROM t1, t1 as t2 WHERE t2.pk BETWEEN t1.i4 AND t1.i4;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL i4_uq NULL NULL NULL 3
1 SIMPLE t2 eq_ref PRIMARY PRIMARY 4 test.t1.i4 1 Using where
SELECT * FROM t1, t1 as t2 WHERE t2.pk BETWEEN t1.i4 AND t1.i4;
pk i4 pk i4
EXPLAIN
SELECT * FROM t1, t1 as t2 WHERE t1.i4 BETWEEN t2.pk AND t2.pk;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL i4_uq NULL NULL NULL 3
1 SIMPLE t2 eq_ref PRIMARY PRIMARY 4 test.t1.i4 1 Using where
SELECT * FROM t1, t1 as t2 WHERE t1.i4 BETWEEN t2.pk AND t2.pk;
pk i4 pk i4
DROP TABLE t1;
End of 5.1 tests
mysql-test/t/range.test
View file @
83817644
...
...
@@ -1325,4 +1325,71 @@ SELECT * FROM t1 WHERE 2 NOT BETWEEN c_notkey AND c_key;
DROP
TABLE
t1
;
--
echo
#
--
echo
# Bug #57030: 'BETWEEN' evaluation is incorrect
--
echo
#
# Test some BETWEEN predicates which does *not* follow the
# 'normal' pattern of <field> BETWEEN <low const> AND <high const>
CREATE
TABLE
t1
(
pk
INT
PRIMARY
KEY
,
i4
INT
);
CREATE
UNIQUE
INDEX
i4_uq
ON
t1
(
i4
);
INSERT
INTO
t1
VALUES
(
1
,
10
),
(
2
,
20
),
(
3
,
30
);
EXPLAIN
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
10
AND
10
;
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
10
AND
10
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
10
BETWEEN
i4
AND
i4
;
SELECT
*
FROM
t1
WHERE
10
BETWEEN
i4
AND
i4
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
10
BETWEEN
10
AND
i4
;
SELECT
*
FROM
t1
WHERE
10
BETWEEN
10
AND
i4
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
10
BETWEEN
i4
AND
10
;
SELECT
*
FROM
t1
WHERE
10
BETWEEN
i4
AND
10
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
10
BETWEEN
10
AND
10
;
SELECT
*
FROM
t1
WHERE
10
BETWEEN
10
AND
10
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
10
BETWEEN
11
AND
11
;
SELECT
*
FROM
t1
WHERE
10
BETWEEN
11
AND
11
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
10
BETWEEN
100
AND
0
;
SELECT
*
FROM
t1
WHERE
10
BETWEEN
100
AND
0
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
100
AND
0
;
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
100
AND
0
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
10
AND
99999999999999999
;
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
10
AND
99999999999999999
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
999999999999999
AND
30
;
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
999999999999999
AND
30
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
10
AND
'20'
;
SELECT
*
FROM
t1
WHERE
i4
BETWEEN
10
AND
'20'
;
#Should detect the EQ_REF 't2.pk=t1.i4'
EXPLAIN
SELECT
*
FROM
t1
,
t1
as
t2
WHERE
t2
.
pk
BETWEEN
t1
.
i4
AND
t1
.
i4
;
SELECT
*
FROM
t1
,
t1
as
t2
WHERE
t2
.
pk
BETWEEN
t1
.
i4
AND
t1
.
i4
;
EXPLAIN
SELECT
*
FROM
t1
,
t1
as
t2
WHERE
t1
.
i4
BETWEEN
t2
.
pk
AND
t2
.
pk
;
SELECT
*
FROM
t1
,
t1
as
t2
WHERE
t1
.
i4
BETWEEN
t2
.
pk
AND
t2
.
pk
;
DROP
TABLE
t1
;
--
echo
End
of
5.1
tests
sql/sql_select.cc
View file @
83817644
...
...
@@ -3365,26 +3365,7 @@ add_key_field(KEY_FIELD **key_fields,uint and_level, Item_func *cond,
eq_func is NEVER true when num_values > 1
*/
if
(
!
eq_func
)
{
/*
Additional optimization: if we're processing
"t.key BETWEEN c1 AND c1" then proceed as if we were processing
"t.key = c1".
TODO: This is a very limited fix. A more generic fix is possible.
There are 2 options:
A) Make equality propagation code be able to handle BETWEEN
(including cases like t1.key BETWEEN t2.key AND t3.key)
B) Make range optimizer to infer additional "t.key = c" equalities
and use them in equality propagation process (see details in
OptimizerKBAndTodo)
*/
if
((
cond
->
functype
()
!=
Item_func
::
BETWEEN
)
||
((
Item_func_between
*
)
cond
)
->
negated
||
!
value
[
0
]
->
eq
(
value
[
1
],
field
->
binary
()))
return
;
eq_func
=
TRUE
;
}
return
;
if
(
field
->
result_type
()
==
STRING_RESULT
)
{
if
((
*
value
)
->
result_type
()
!=
STRING_RESULT
)
...
...
@@ -3580,9 +3561,65 @@ add_key_fields(JOIN *join, KEY_FIELD **key_fields, uint *and_level,
case
Item_func
:
:
OPTIMIZE_KEY
:
{
Item
**
values
;
// BETWEEN, IN, NE
if
(
is_local_field
(
cond_func
->
key_item
())
&&
!
(
cond_func
->
used_tables
()
&
OUTER_REF_TABLE_BIT
))
/*
Build list of possible keys for 'a BETWEEN low AND high'.
It is handled similar to the equivalent condition
'a >= low AND a <= high':
*/
if
(
cond_func
->
functype
()
==
Item_func
::
BETWEEN
)
{
Item_field
*
field_item
;
bool
equal_func
=
FALSE
;
uint
num_values
=
2
;
values
=
cond_func
->
arguments
();
bool
binary_cmp
=
(
values
[
0
]
->
real_item
()
->
type
()
==
Item
::
FIELD_ITEM
)
?
((
Item_field
*
)
values
[
0
]
->
real_item
())
->
field
->
binary
()
:
TRUE
;
/*
Additional optimization: If 'low = high':
Handle as if the condition was "t.key = low".
*/
if
(
!
((
Item_func_between
*
)
cond_func
)
->
negated
&&
values
[
1
]
->
eq
(
values
[
2
],
binary_cmp
))
{
equal_func
=
TRUE
;
num_values
=
1
;
}
/*
Append keys for 'field <cmp> value[]' if the
condition is of the form::
'<field> BETWEEN value[1] AND value[2]'
*/
if
(
is_local_field
(
values
[
0
]))
{
field_item
=
(
Item_field
*
)
(
values
[
0
]
->
real_item
());
add_key_equal_fields
(
key_fields
,
*
and_level
,
cond_func
,
field_item
,
equal_func
,
&
values
[
1
],
num_values
,
usable_tables
,
sargables
);
}
/*
Append keys for 'value[0] <cmp> field' if the
condition is of the form:
'value[0] BETWEEN field1 AND field2'
*/
for
(
uint
i
=
1
;
i
<=
num_values
;
i
++
)
{
if
(
is_local_field
(
values
[
i
]))
{
field_item
=
(
Item_field
*
)
(
values
[
i
]
->
real_item
());
add_key_equal_fields
(
key_fields
,
*
and_level
,
cond_func
,
field_item
,
equal_func
,
values
,
1
,
usable_tables
,
sargables
);
}
}
}
// if ( ... Item_func::BETWEEN)
// IN, NE
else
if
(
is_local_field
(
cond_func
->
key_item
())
&&
!
(
cond_func
->
used_tables
()
&
OUTER_REF_TABLE_BIT
))
{
values
=
cond_func
->
arguments
()
+
1
;
if
(
cond_func
->
functype
()
==
Item_func
::
NE_FUNC
&&
...
...
@@ -3596,21 +3633,6 @@ add_key_fields(JOIN *join, KEY_FIELD **key_fields, uint *and_level,
cond_func
->
argument_count
()
-
1
,
usable_tables
,
sargables
);
}
if
(
cond_func
->
functype
()
==
Item_func
::
BETWEEN
)
{
values
=
cond_func
->
arguments
();
for
(
uint
i
=
1
;
i
<
cond_func
->
argument_count
()
;
i
++
)
{
Item_field
*
field_item
;
if
(
is_local_field
(
cond_func
->
arguments
()[
i
]))
{
field_item
=
(
Item_field
*
)
(
cond_func
->
arguments
()[
i
]
->
real_item
());
add_key_equal_fields
(
key_fields
,
*
and_level
,
cond_func
,
field_item
,
0
,
values
,
1
,
usable_tables
,
sargables
);
}
}
}
break
;
}
case
Item_func
:
:
OPTIMIZE_OP
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment