mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-34189 Unexpected error on WHERE inet6col
normalize_cond() translated `WHERE col` into `WHERE col<>0` But the opetator "not equal to 0" does not necessarily exists for all data types. For example, the query: SELECT * FROM t1 WHERE inet6col; was translated to: SELECT * FROM t1 WHERE inet6col<>0; which further failed with this error: ERROR : Illegal parameter data types inet6 and bigint for operation '<>' This patch changes the translation from `col<>0` to `col IS TRUE`. So now SELECT * FROM t1 WHERE inet6col; gets translated to: SELECT * FROM t1 WHERE inet6col IS TRUE; Details: 1. Implementing methods: - Field_longstr::val_bool() - Field_string::val_bool() - Item::val_int_from_val_str() If the input contains bad data, these methods raise a better error message: Truncated incorrect BOOLEAN value Before the change, the error was: Truncated incorrect DOUBLE value 2. Fixing normalize_cond() to generate Item_func_istrue/Item_func_isfalse instances instead of Item_func_ne/Item_func_eq 3. Making Item_func_truth sargable, so it uses the range optimizer. Implementing the following methods: - get_mm_tree(), get_mm_leaf(), add_key_fields() in Item_func_truth. - get_func_mm_tree(), for all Item_func_truth descendants. 4. Implementing the method negated_item() for all Item_func_truth descendants, so the negated item has a chance to be sargable: For example, WHERE NOT col IS NOT FALSE -- this notation is not sargable is now translated to: WHERE col IS FALSE -- this notation is sargable
This commit is contained in:
@@ -1983,8 +1983,13 @@ INSERT INTO t1 VALUES
|
||||
('00000000-0000-0000-0000-000000000000'),
|
||||
('00000000-0000-0000-0000-000000000001'),
|
||||
('00000000-0000-0000-0000-000000000002');
|
||||
SELECT * FROM t1 WHERE a;
|
||||
ERROR HY000: Illegal parameter data types uuid and bigint for operation '<>'
|
||||
SELECT * FROM t1 WHERE a ORDER BY a;
|
||||
a
|
||||
00000000-0000-0000-0000-000000000001
|
||||
00000000-0000-0000-0000-000000000002
|
||||
SELECT * FROM t1 WHERE NOT a;
|
||||
a
|
||||
00000000-0000-0000-0000-000000000000
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# GROUP BY
|
||||
@@ -3214,3 +3219,258 @@ Warnings:
|
||||
Warning 1292 Incorrect uuid value: ''
|
||||
Warning 1292 Incorrect uuid value: ''
|
||||
DROP TABLE t1;
|
||||
# End of 10.6 tests
|
||||
# Start of 11.8 tests
|
||||
#
|
||||
# MDEV-34189 Unexpected error on `WHERE inet6col`
|
||||
#
|
||||
CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a UUID, KEY(a));
|
||||
INSERT INTO t1 VALUES (-1,NULL);
|
||||
INSERT INTO t1 VALUES (0,'00000000-0000-0000-0000-000000000000');
|
||||
INSERT INTO t1 SELECT seq,concat('ba2f21be-d306-11ef-ab9e-', lpad(seq,12,'0')) FROM seq_1_to_31;
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE a;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 ALL a NULL NULL NULL 33 96.97 Using where
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is true
|
||||
SELECT id, a FROM t1 WHERE a;
|
||||
id a
|
||||
1 ba2f21be-d306-11ef-ab9e-000000000001
|
||||
2 ba2f21be-d306-11ef-ab9e-000000000002
|
||||
3 ba2f21be-d306-11ef-ab9e-000000000003
|
||||
4 ba2f21be-d306-11ef-ab9e-000000000004
|
||||
5 ba2f21be-d306-11ef-ab9e-000000000005
|
||||
6 ba2f21be-d306-11ef-ab9e-000000000006
|
||||
7 ba2f21be-d306-11ef-ab9e-000000000007
|
||||
8 ba2f21be-d306-11ef-ab9e-000000000008
|
||||
9 ba2f21be-d306-11ef-ab9e-000000000009
|
||||
10 ba2f21be-d306-11ef-ab9e-000000000010
|
||||
11 ba2f21be-d306-11ef-ab9e-000000000011
|
||||
12 ba2f21be-d306-11ef-ab9e-000000000012
|
||||
13 ba2f21be-d306-11ef-ab9e-000000000013
|
||||
14 ba2f21be-d306-11ef-ab9e-000000000014
|
||||
15 ba2f21be-d306-11ef-ab9e-000000000015
|
||||
16 ba2f21be-d306-11ef-ab9e-000000000016
|
||||
17 ba2f21be-d306-11ef-ab9e-000000000017
|
||||
18 ba2f21be-d306-11ef-ab9e-000000000018
|
||||
19 ba2f21be-d306-11ef-ab9e-000000000019
|
||||
20 ba2f21be-d306-11ef-ab9e-000000000020
|
||||
21 ba2f21be-d306-11ef-ab9e-000000000021
|
||||
22 ba2f21be-d306-11ef-ab9e-000000000022
|
||||
23 ba2f21be-d306-11ef-ab9e-000000000023
|
||||
24 ba2f21be-d306-11ef-ab9e-000000000024
|
||||
25 ba2f21be-d306-11ef-ab9e-000000000025
|
||||
26 ba2f21be-d306-11ef-ab9e-000000000026
|
||||
27 ba2f21be-d306-11ef-ab9e-000000000027
|
||||
28 ba2f21be-d306-11ef-ab9e-000000000028
|
||||
29 ba2f21be-d306-11ef-ab9e-000000000029
|
||||
30 ba2f21be-d306-11ef-ab9e-000000000030
|
||||
31 ba2f21be-d306-11ef-ab9e-000000000031
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE NOT a;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 range a a 17 NULL 1 100.00 Using index condition
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is false
|
||||
SELECT id, a FROM t1 WHERE NOT a;
|
||||
id a
|
||||
0 00000000-0000-0000-0000-000000000000
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE a IS TRUE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 ALL a NULL NULL NULL 33 96.97 Using where
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is true
|
||||
SELECT id, a FROM t1 WHERE a IS TRUE;
|
||||
id a
|
||||
1 ba2f21be-d306-11ef-ab9e-000000000001
|
||||
2 ba2f21be-d306-11ef-ab9e-000000000002
|
||||
3 ba2f21be-d306-11ef-ab9e-000000000003
|
||||
4 ba2f21be-d306-11ef-ab9e-000000000004
|
||||
5 ba2f21be-d306-11ef-ab9e-000000000005
|
||||
6 ba2f21be-d306-11ef-ab9e-000000000006
|
||||
7 ba2f21be-d306-11ef-ab9e-000000000007
|
||||
8 ba2f21be-d306-11ef-ab9e-000000000008
|
||||
9 ba2f21be-d306-11ef-ab9e-000000000009
|
||||
10 ba2f21be-d306-11ef-ab9e-000000000010
|
||||
11 ba2f21be-d306-11ef-ab9e-000000000011
|
||||
12 ba2f21be-d306-11ef-ab9e-000000000012
|
||||
13 ba2f21be-d306-11ef-ab9e-000000000013
|
||||
14 ba2f21be-d306-11ef-ab9e-000000000014
|
||||
15 ba2f21be-d306-11ef-ab9e-000000000015
|
||||
16 ba2f21be-d306-11ef-ab9e-000000000016
|
||||
17 ba2f21be-d306-11ef-ab9e-000000000017
|
||||
18 ba2f21be-d306-11ef-ab9e-000000000018
|
||||
19 ba2f21be-d306-11ef-ab9e-000000000019
|
||||
20 ba2f21be-d306-11ef-ab9e-000000000020
|
||||
21 ba2f21be-d306-11ef-ab9e-000000000021
|
||||
22 ba2f21be-d306-11ef-ab9e-000000000022
|
||||
23 ba2f21be-d306-11ef-ab9e-000000000023
|
||||
24 ba2f21be-d306-11ef-ab9e-000000000024
|
||||
25 ba2f21be-d306-11ef-ab9e-000000000025
|
||||
26 ba2f21be-d306-11ef-ab9e-000000000026
|
||||
27 ba2f21be-d306-11ef-ab9e-000000000027
|
||||
28 ba2f21be-d306-11ef-ab9e-000000000028
|
||||
29 ba2f21be-d306-11ef-ab9e-000000000029
|
||||
30 ba2f21be-d306-11ef-ab9e-000000000030
|
||||
31 ba2f21be-d306-11ef-ab9e-000000000031
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE NOT a IS TRUE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 range a a 17 NULL 2 100.00 Using index condition
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is not true
|
||||
SELECT id, a FROM t1 WHERE NOT a IS TRUE;
|
||||
id a
|
||||
-1 NULL
|
||||
0 00000000-0000-0000-0000-000000000000
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE a IS NOT TRUE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 range a a 17 NULL 2 100.00 Using index condition
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is not true
|
||||
SELECT id, a FROM t1 WHERE a IS NOT TRUE;
|
||||
id a
|
||||
-1 NULL
|
||||
0 00000000-0000-0000-0000-000000000000
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE NOT a IS NOT TRUE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 ALL a NULL NULL NULL 33 96.97 Using where
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is true
|
||||
SELECT id, a FROM t1 WHERE NOT a IS NOT TRUE;
|
||||
id a
|
||||
1 ba2f21be-d306-11ef-ab9e-000000000001
|
||||
2 ba2f21be-d306-11ef-ab9e-000000000002
|
||||
3 ba2f21be-d306-11ef-ab9e-000000000003
|
||||
4 ba2f21be-d306-11ef-ab9e-000000000004
|
||||
5 ba2f21be-d306-11ef-ab9e-000000000005
|
||||
6 ba2f21be-d306-11ef-ab9e-000000000006
|
||||
7 ba2f21be-d306-11ef-ab9e-000000000007
|
||||
8 ba2f21be-d306-11ef-ab9e-000000000008
|
||||
9 ba2f21be-d306-11ef-ab9e-000000000009
|
||||
10 ba2f21be-d306-11ef-ab9e-000000000010
|
||||
11 ba2f21be-d306-11ef-ab9e-000000000011
|
||||
12 ba2f21be-d306-11ef-ab9e-000000000012
|
||||
13 ba2f21be-d306-11ef-ab9e-000000000013
|
||||
14 ba2f21be-d306-11ef-ab9e-000000000014
|
||||
15 ba2f21be-d306-11ef-ab9e-000000000015
|
||||
16 ba2f21be-d306-11ef-ab9e-000000000016
|
||||
17 ba2f21be-d306-11ef-ab9e-000000000017
|
||||
18 ba2f21be-d306-11ef-ab9e-000000000018
|
||||
19 ba2f21be-d306-11ef-ab9e-000000000019
|
||||
20 ba2f21be-d306-11ef-ab9e-000000000020
|
||||
21 ba2f21be-d306-11ef-ab9e-000000000021
|
||||
22 ba2f21be-d306-11ef-ab9e-000000000022
|
||||
23 ba2f21be-d306-11ef-ab9e-000000000023
|
||||
24 ba2f21be-d306-11ef-ab9e-000000000024
|
||||
25 ba2f21be-d306-11ef-ab9e-000000000025
|
||||
26 ba2f21be-d306-11ef-ab9e-000000000026
|
||||
27 ba2f21be-d306-11ef-ab9e-000000000027
|
||||
28 ba2f21be-d306-11ef-ab9e-000000000028
|
||||
29 ba2f21be-d306-11ef-ab9e-000000000029
|
||||
30 ba2f21be-d306-11ef-ab9e-000000000030
|
||||
31 ba2f21be-d306-11ef-ab9e-000000000031
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE a IS FALSE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 range a a 17 NULL 1 100.00 Using index condition
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is false
|
||||
SELECT id, a FROM t1 WHERE a IS FALSE;
|
||||
id a
|
||||
0 00000000-0000-0000-0000-000000000000
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE NOT a IS FALSE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 ALL a NULL NULL NULL 33 96.97 Using where
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is not false
|
||||
SELECT id, a FROM t1 WHERE NOT a IS FALSE;
|
||||
id a
|
||||
-1 NULL
|
||||
1 ba2f21be-d306-11ef-ab9e-000000000001
|
||||
2 ba2f21be-d306-11ef-ab9e-000000000002
|
||||
3 ba2f21be-d306-11ef-ab9e-000000000003
|
||||
4 ba2f21be-d306-11ef-ab9e-000000000004
|
||||
5 ba2f21be-d306-11ef-ab9e-000000000005
|
||||
6 ba2f21be-d306-11ef-ab9e-000000000006
|
||||
7 ba2f21be-d306-11ef-ab9e-000000000007
|
||||
8 ba2f21be-d306-11ef-ab9e-000000000008
|
||||
9 ba2f21be-d306-11ef-ab9e-000000000009
|
||||
10 ba2f21be-d306-11ef-ab9e-000000000010
|
||||
11 ba2f21be-d306-11ef-ab9e-000000000011
|
||||
12 ba2f21be-d306-11ef-ab9e-000000000012
|
||||
13 ba2f21be-d306-11ef-ab9e-000000000013
|
||||
14 ba2f21be-d306-11ef-ab9e-000000000014
|
||||
15 ba2f21be-d306-11ef-ab9e-000000000015
|
||||
16 ba2f21be-d306-11ef-ab9e-000000000016
|
||||
17 ba2f21be-d306-11ef-ab9e-000000000017
|
||||
18 ba2f21be-d306-11ef-ab9e-000000000018
|
||||
19 ba2f21be-d306-11ef-ab9e-000000000019
|
||||
20 ba2f21be-d306-11ef-ab9e-000000000020
|
||||
21 ba2f21be-d306-11ef-ab9e-000000000021
|
||||
22 ba2f21be-d306-11ef-ab9e-000000000022
|
||||
23 ba2f21be-d306-11ef-ab9e-000000000023
|
||||
24 ba2f21be-d306-11ef-ab9e-000000000024
|
||||
25 ba2f21be-d306-11ef-ab9e-000000000025
|
||||
26 ba2f21be-d306-11ef-ab9e-000000000026
|
||||
27 ba2f21be-d306-11ef-ab9e-000000000027
|
||||
28 ba2f21be-d306-11ef-ab9e-000000000028
|
||||
29 ba2f21be-d306-11ef-ab9e-000000000029
|
||||
30 ba2f21be-d306-11ef-ab9e-000000000030
|
||||
31 ba2f21be-d306-11ef-ab9e-000000000031
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE a IS NOT FALSE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 ALL a NULL NULL NULL 33 96.97 Using where
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is not false
|
||||
SELECT id, a FROM t1 WHERE a IS NOT FALSE;
|
||||
id a
|
||||
-1 NULL
|
||||
1 ba2f21be-d306-11ef-ab9e-000000000001
|
||||
2 ba2f21be-d306-11ef-ab9e-000000000002
|
||||
3 ba2f21be-d306-11ef-ab9e-000000000003
|
||||
4 ba2f21be-d306-11ef-ab9e-000000000004
|
||||
5 ba2f21be-d306-11ef-ab9e-000000000005
|
||||
6 ba2f21be-d306-11ef-ab9e-000000000006
|
||||
7 ba2f21be-d306-11ef-ab9e-000000000007
|
||||
8 ba2f21be-d306-11ef-ab9e-000000000008
|
||||
9 ba2f21be-d306-11ef-ab9e-000000000009
|
||||
10 ba2f21be-d306-11ef-ab9e-000000000010
|
||||
11 ba2f21be-d306-11ef-ab9e-000000000011
|
||||
12 ba2f21be-d306-11ef-ab9e-000000000012
|
||||
13 ba2f21be-d306-11ef-ab9e-000000000013
|
||||
14 ba2f21be-d306-11ef-ab9e-000000000014
|
||||
15 ba2f21be-d306-11ef-ab9e-000000000015
|
||||
16 ba2f21be-d306-11ef-ab9e-000000000016
|
||||
17 ba2f21be-d306-11ef-ab9e-000000000017
|
||||
18 ba2f21be-d306-11ef-ab9e-000000000018
|
||||
19 ba2f21be-d306-11ef-ab9e-000000000019
|
||||
20 ba2f21be-d306-11ef-ab9e-000000000020
|
||||
21 ba2f21be-d306-11ef-ab9e-000000000021
|
||||
22 ba2f21be-d306-11ef-ab9e-000000000022
|
||||
23 ba2f21be-d306-11ef-ab9e-000000000023
|
||||
24 ba2f21be-d306-11ef-ab9e-000000000024
|
||||
25 ba2f21be-d306-11ef-ab9e-000000000025
|
||||
26 ba2f21be-d306-11ef-ab9e-000000000026
|
||||
27 ba2f21be-d306-11ef-ab9e-000000000027
|
||||
28 ba2f21be-d306-11ef-ab9e-000000000028
|
||||
29 ba2f21be-d306-11ef-ab9e-000000000029
|
||||
30 ba2f21be-d306-11ef-ab9e-000000000030
|
||||
31 ba2f21be-d306-11ef-ab9e-000000000031
|
||||
EXPLAIN EXTENDED
|
||||
SELECT id, a FROM t1 WHERE NOT a IS NOT FALSE;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE t1 range a a 17 NULL 1 100.00 Using index condition
|
||||
Warnings:
|
||||
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` is false
|
||||
SELECT id, a FROM t1 WHERE NOT a IS NOT FALSE;
|
||||
id a
|
||||
0 00000000-0000-0000-0000-000000000000
|
||||
DROP TABLE t1;
|
||||
# End of 11.8 tests
|
||||
|
@@ -1,3 +1,5 @@
|
||||
--source include/have_sequence.inc
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-4958 Adding datatype UUID
|
||||
--echo #
|
||||
@@ -585,17 +587,13 @@ INSERT INTO t1 VALUES
|
||||
SELECT a, a IS TRUE, a IS FALSE FROM t1 ORDER BY a;
|
||||
DROP TABLE t1;
|
||||
|
||||
#
|
||||
# TODO: Error looks like a bug. This should return rows where a<>'00000000-0000-0000-0000-000000000000'.
|
||||
# The same problem is repeatable with GEOMETRY.
|
||||
#
|
||||
CREATE TABLE t1 (a UUID);
|
||||
INSERT INTO t1 VALUES
|
||||
('00000000-0000-0000-0000-000000000000'),
|
||||
('00000000-0000-0000-0000-000000000001'),
|
||||
('00000000-0000-0000-0000-000000000002');
|
||||
--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
|
||||
SELECT * FROM t1 WHERE a;
|
||||
SELECT * FROM t1 WHERE a ORDER BY a;
|
||||
SELECT * FROM t1 WHERE NOT a;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
@@ -1697,3 +1695,20 @@ INSERT INTO t1 VALUES ('00000000-0000-0000-0000-000000000000');
|
||||
SELECT * FROM t1 WHERE a IN ('','00000000-0000-0000-0000-000000000001');
|
||||
SELECT * FROM t1 WHERE a='';
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo # End of 10.6 tests
|
||||
|
||||
--echo # Start of 11.8 tests
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-34189 Unexpected error on `WHERE inet6col`
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a UUID, KEY(a));
|
||||
INSERT INTO t1 VALUES (-1,NULL);
|
||||
INSERT INTO t1 VALUES (0,'00000000-0000-0000-0000-000000000000');
|
||||
INSERT INTO t1 SELECT seq,concat('ba2f21be-d306-11ef-ab9e-', lpad(seq,12,'0')) FROM seq_1_to_31;
|
||||
--source include/boolean_factor.inc
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo # End of 11.8 tests
|
||||
|
Reference in New Issue
Block a user