Skip to content

PS-10289 (8.0) Fix digest normalization for unary operators #5755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yakirgb wants to merge 1 commit into
base: 8.0
Choose a base branch
from
+151 −0
Open

PS-10289 (8.0) Fix digest normalization for unary operators #5755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions mysql-test/suite/perfschema/r/unary_digest.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,42 @@ ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
ERROR 42S02: Table 'test.expect_full_reduce' doesn't exist
ERROR 42S02: Table 'test.expect_unchanged' doesn't exist
ERROR 42S02: Table 'test.expect_where_eq' doesn't exist
ERROR 42S02: Table 'test.expect_where_eq' doesn't exist
ERROR 42S02: Table 'test.expect_where_eq' doesn't exist
ERROR 42S02: Table 'test.expect_where_ne' doesn't exist
ERROR 42S02: Table 'test.expect_where_ne' doesn't exist
ERROR 42S02: Table 'test.expect_where_ne' doesn't exist
ERROR 42S02: Table 'test.expect_where_lt' doesn't exist
ERROR 42S02: Table 'test.expect_where_lt' doesn't exist
ERROR 42S02: Table 'test.expect_where_lt' doesn't exist
ERROR 42S02: Table 'test.expect_where_gt' doesn't exist
ERROR 42S02: Table 'test.expect_where_gt' doesn't exist
ERROR 42S02: Table 'test.expect_where_gt' doesn't exist
ERROR 42S02: Table 'test.expect_where_le' doesn't exist
ERROR 42S02: Table 'test.expect_where_le' doesn't exist
ERROR 42S02: Table 'test.expect_where_le' doesn't exist
ERROR 42S02: Table 'test.expect_where_ge' doesn't exist
ERROR 42S02: Table 'test.expect_where_ge' doesn't exist
ERROR 42S02: Table 'test.expect_where_ge' doesn't exist
ERROR 42S02: Table 'test.expect_where_spaceship' doesn't exist
ERROR 42S02: Table 'test.expect_where_spaceship' doesn't exist
ERROR 42S02: Table 'test.expect_where_spaceship' doesn't exist
ERROR 42S02: Table 'test.expect_case_then' doesn't exist
ERROR 42S02: Table 'test.expect_case_then' doesn't exist
ERROR 42S02: Table 'test.expect_case_then' doesn't exist
ERROR 42S02: Table 'test.expect_case_then_else1' doesn't exist
ERROR 42S02: Table 'test.expect_case_then_else1' doesn't exist
ERROR 42S02: Table 'test.expect_case_then_else1' doesn't exist
ERROR 42S02: Table 'test.expect_case_else' doesn't exist
ERROR 42S02: Table 'test.expect_case_else' doesn't exist
ERROR 42S02: Table 'test.expect_case_else' doesn't exist
ERROR 42S02: Table 'test.expect_case_both' doesn't exist
ERROR 42S02: Table 'test.expect_case_both' doesn't exist
ERROR 42S02: Table 'test.expect_case_both' doesn't exist
ERROR 42S02: Table 'test.expect_nested_case' doesn't exist
ERROR 42S02: Table 'test.expect_nested_case' doesn't exist
ERROR 42S02: Table 'test.expect_nested_case' doesn't exist
SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
FROM performance_schema.events_statements_summary_by_digest;
SCHEMA_NAME DIGEST_TEXT COUNT_STAR
Expand All @@ -45,3 +81,15 @@ test SELECT ? + ? FROM `expect_binary` 2
test SELECT ? - ? FROM `expect_binary` 2
test INSERT INTO `expect_full_reduce` VALUES (...) 27
test SELECT `a` - `b` , `a` + `b` , - `a` , - `b` , + `a` , + `b` FROM `expect_unchanged` 1
test SELECT * FROM `expect_where_eq` WHERE `a` = ? 3
test SELECT * FROM `expect_where_ne` WHERE `a` != ? 3
test SELECT * FROM `expect_where_lt` WHERE `a` < ? 3
test SELECT * FROM `expect_where_gt` WHERE `a` > ? 3
test SELECT * FROM `expect_where_le` WHERE `a` <= ? 3
test SELECT * FROM `expect_where_ge` WHERE `a` >= ? 3
test SELECT * FROM `expect_where_spaceship` WHERE `a` <=> ? 3
test SELECT CASE WHEN `a` > ? THEN ? END FROM `expect_case_then` 3
test SELECT CASE WHEN `a` > ? THEN ? ELSE ? END FROM `expect_case_then_else1` 3
test SELECT CASE WHEN `a` > ? THEN ? ELSE ? END FROM `expect_case_else` 3
test SELECT CASE WHEN `a` > ? THEN ? ELSE ? END FROM `expect_case_both` 3
test SELECT CASE WHEN `a` > ? THEN CASE WHEN `b` > ? THEN ? ELSE ? END ELSE ? END FROM `expect_nested_case` 3
92 changes: 92 additions & 0 deletions mysql-test/suite/perfschema/t/unary_digest.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,98 @@ insert into expect_full_reduce values (+1, +1, +1);
--error ER_NO_SUCH_TABLE
select a-b, a+b, -a, -b, +a, +b from expect_unchanged;

# Test WHERE clauses with comparison operators and negative numbers
# All of these should produce the same digest per comparison operator
--error ER_NO_SUCH_TABLE
select * from expect_where_eq where a = 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_eq where a = -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_eq where a = +1;

--error ER_NO_SUCH_TABLE
select * from expect_where_ne where a != 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_ne where a != -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_ne where a <> +1;

--error ER_NO_SUCH_TABLE
select * from expect_where_lt where a < 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_lt where a < -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_lt where a < +1;

--error ER_NO_SUCH_TABLE
select * from expect_where_gt where a > 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_gt where a > -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_gt where a > +1;

--error ER_NO_SUCH_TABLE
select * from expect_where_le where a <= 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_le where a <= -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_le where a <= +1;

--error ER_NO_SUCH_TABLE
select * from expect_where_ge where a >= 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_ge where a >= -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_ge where a >= +1;

--error ER_NO_SUCH_TABLE
select * from expect_where_spaceship where a <=> 1;
--error ER_NO_SUCH_TABLE
select * from expect_where_spaceship where a <=> -1;
--error ER_NO_SUCH_TABLE
select * from expect_where_spaceship where a <=> +1;

# Test CASE WHEN THEN with unary operators
# All three should produce the same digest
--error ER_NO_SUCH_TABLE
select case when a > 0 then 1 end from expect_case_then;
--error ER_NO_SUCH_TABLE
select case when a > 0 then -1 end from expect_case_then;
--error ER_NO_SUCH_TABLE
select case when a > 0 then +1 end from expect_case_then;

# Test CASE WHEN THEN ELSE with unary operators in THEN clause
--error ER_NO_SUCH_TABLE
select case when a > 0 then 1 else 0 end from expect_case_then_else1;
--error ER_NO_SUCH_TABLE
select case when a > 0 then -1 else 0 end from expect_case_then_else1;
--error ER_NO_SUCH_TABLE
select case when a > 0 then +1 else 0 end from expect_case_then_else1;

# Test CASE WHEN THEN ELSE with unary operators in ELSE clause
--error ER_NO_SUCH_TABLE
select case when a > 0 then 0 else 1 end from expect_case_else;
--error ER_NO_SUCH_TABLE
select case when a > 0 then 0 else -1 end from expect_case_else;
--error ER_NO_SUCH_TABLE
select case when a > 0 then 0 else +1 end from expect_case_else;

# Test CASE WHEN THEN ELSE with unary operators in both clauses
--error ER_NO_SUCH_TABLE
select case when a > 0 then 1 else 2 end from expect_case_both;
--error ER_NO_SUCH_TABLE
select case when a > 0 then -1 else -2 end from expect_case_both;
--error ER_NO_SUCH_TABLE
select case when a > 0 then +1 else +2 end from expect_case_both;

# Test nested CASE statements
--error ER_NO_SUCH_TABLE
select case when a > 0 then case when b > 0 then 1 else 2 end else 3 end from expect_nested_case;
--error ER_NO_SUCH_TABLE
select case when a > 0 then case when b > 0 then -1 else -2 end else -3 end from expect_nested_case;
--error ER_NO_SUCH_TABLE
select case when a > 0 then case when b > 0 then +1 else +2 end else +3 end from expect_nested_case;

--enable_query_log

SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
Expand Down
11 changes: 11 additions & 0 deletions sql/gen_lex_token.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,17 @@ static void compute_tokens() {
set_start_expr_token(LIKE);
set_start_expr_token(REGEXP);

set_start_expr_token(EQ); // =
set_start_expr_token(EQUAL_SYM); // <=>
set_start_expr_token(NE); // != and <>
set_start_expr_token(LT); // <
set_start_expr_token(GT_SYM); // >
set_start_expr_token(LE); // <=
set_start_expr_token(GE); // >=

set_start_expr_token(THEN_SYM); // CASE WHEN ... THEN expr
set_start_expr_token(ELSE); // CASE ... ELSE expr

set_start_expr_token('|');
set_start_expr_token('&');
set_start_expr_token(SHIFT_LEFT);
Expand Down