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

Item::print(): remove redundant parentheses

Browse Source 
by introducing new Item::precedence() method and using it
to decide whether parentheses are required
This commit is contained in:
Sergei Golubchik
2016-11-27 19:50:10 +01:00
parent 1db438c833
commit 180065ebb0
188 changed files with 2684 additions and 2553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
mysql-test/r/sp-code.result
View File

@@ -51,10 +51,10 @@ Pos Instruction
9 set err@1 1
10 hreturn 5
11 cfetch c@0 n@4
12 jump_if_not 15(17) isnull(n@4)
13 set nulls@2 (nulls@2 + 1)
12 jump_if_not 15(17) n@4 is null
13 set nulls@2 nulls@2 + 1
14 jump 17
15 set count@3 (count@3 + 1)
15 set count@3 count@3 + 1
16 stmt 4 "update t2 set idx = count where name=n"
17 hpop 1
18 jump 7
@@ -167,35 +167,35 @@ Pos Instruction
12 set v_schedmax@5 NULL
13 stmt 0 "select count(*) into v_schedmax from ..."
14 set v_tcounter@6 0
15 jump_if_not 39(39) (v_i@3 <= v_schedmax@5)
15 jump_if_not 39(39) v_i@3 <= v_schedmax@5
16 set v_row@7 NULL
17 set v_col@8 NULL
18 stmt 0 "select row,col into v_row,v_col from ..."
19 stmt 0 "select dig into v_dig from sudoku_wor..."
20 set_case_expr (34) 0 v_dig@4
21 jump_if_not 25(34) (case_expr@0 = 0)
21 jump_if_not 25(34) case_expr@0 = 0
22 set v_dig@4 1
23 stmt 4 "update sudoku_work set dig = 1 where ..."
24 jump 34
25 jump_if_not 32(34) (case_expr@0 = 9)
26 jump_if_not 30(34) (v_i@3 > 0)
25 jump_if_not 32(34) case_expr@0 = 9
26 jump_if_not 30(34) v_i@3 > 0
27 stmt 4 "update sudoku_work set dig = 0 where ..."
28 set v_i@3 (v_i@3 - 1)
28 set v_i@3 v_i@3 - 1
29 jump 15
30 stmt 0 "select v_scounter as 'Solutions'"
31 jump 45
32 set v_dig@4 (v_dig@4 + 1)
32 set v_dig@4 v_dig@4 + 1
33 stmt 4 "update sudoku_work set dig = v_dig wh..."
34 set v_tcounter@6 (v_tcounter@6 + 1)
35 jump_if_not 37(37) (not(`sudoku_digit_ok`(v_row@7,v_col@8,v_dig@4)))
34 set v_tcounter@6 v_tcounter@6 + 1
35 jump_if_not 37(37) !`sudoku_digit_ok`(v_row@7,v_col@8,v_dig@4)
36 jump 15
37 set v_i@3 (v_i@3 + 1)
37 set v_i@3 v_i@3 + 1
38 jump 15
39 stmt 0 "select dig from sudoku_work"
40 stmt 0 "select v_tcounter as 'Tests'"
41 set v_scounter@2 (v_scounter@2 + 1)
42 jump_if_not 45(14) (p_all@1 and (v_i@3 > 0))
43 set v_i@3 (v_i@3 - 1)
41 set v_scounter@2 v_scounter@2 + 1
42 jump_if_not 45(14) p_all@1 and v_i@3 > 0
43 set v_i@3 v_i@3 - 1
44 jump 14
45 stmt 9 "drop temporary table sudoku_work, sud..."
drop procedure sudoku_solve;
@@ -323,13 +323,13 @@ SHOW PROCEDURE CODE proc_19194_simple;
Pos Instruction
0 set str@1 NULL
1 set_case_expr (12) 0 i@0
2 jump_if_not 5(12) (case_expr@0 = 1)
2 jump_if_not 5(12) case_expr@0 = 1
3 set str@1 '1'
4 jump 12
5 jump_if_not 8(12) (case_expr@0 = 2)
5 jump_if_not 8(12) case_expr@0 = 2
6 set str@1 '2'
7 jump 12
8 jump_if_not 11(12) (case_expr@0 = 3)
8 jump_if_not 11(12) case_expr@0 = 3
9 set str@1 '3'
10 jump 12
11 set str@1 'unknown'
@@ -337,13 +337,13 @@ Pos Instruction
SHOW PROCEDURE CODE proc_19194_searched;
Pos Instruction
0 set str@1 NULL
1 jump_if_not 4(11) (i@0 = 1)
1 jump_if_not 4(11) i@0 = 1
2 set str@1 '1'
3 jump 11
4 jump_if_not 7(11) (i@0 = 2)
4 jump_if_not 7(11) i@0 = 2
5 set str@1 '2'
6 jump 11
7 jump_if_not 10(11) (i@0 = 3)
7 jump_if_not 10(11) i@0 = 3
8 set str@1 '3'
9 jump 11
10 set str@1 'unknown'
@@ -353,27 +353,27 @@ Pos Instruction
0 set str_i@2 NULL
1 set str_j@3 NULL
2 set_case_expr (27) 0 i@0
3 jump_if_not 6(27) (case_expr@0 = 10)
3 jump_if_not 6(27) case_expr@0 = 10
4 set str_i@2 '10'
5 jump 27
6 jump_if_not 20(27) (case_expr@0 = 20)
6 jump_if_not 20(27) case_expr@0 = 20
7 set str_i@2 '20'
8 jump_if_not 11(18) (j@1 = 1)
8 jump_if_not 11(18) j@1 = 1
9 set str_j@3 '1'
10 jump 18
11 jump_if_not 14(18) (j@1 = 2)
11 jump_if_not 14(18) j@1 = 2
12 set str_j@3 '2'
13 jump 18
14 jump_if_not 17(18) (j@1 = 3)
14 jump_if_not 17(18) j@1 = 3
15 set str_j@3 '3'
16 jump 18
17 set str_j@3 'unknown'
18 stmt 0 "select "i was 20""
19 jump 27
20 jump_if_not 23(27) (case_expr@0 = 30)
20 jump_if_not 23(27) case_expr@0 = 30
21 set str_i@2 '30'
22 jump 27
23 jump_if_not 26(27) (case_expr@0 = 40)
23 jump_if_not 26(27) case_expr@0 = 40
24 set str_i@2 '40'
25 jump 27
26 set str_i@2 'unknown'
@@ -382,28 +382,28 @@ SHOW PROCEDURE CODE proc_19194_nested_2;
Pos Instruction
0 set str_i@2 NULL
1 set str_j@3 NULL
2 jump_if_not 5(27) (i@0 = 10)
2 jump_if_not 5(27) i@0 = 10
3 set str_i@2 '10'
4 jump 27
5 jump_if_not 20(27) (i@0 = 20)
5 jump_if_not 20(27) i@0 = 20
6 set str_i@2 '20'
7 set_case_expr (18) 0 j@1
8 jump_if_not 11(18) (case_expr@0 = 1)
8 jump_if_not 11(18) case_expr@0 = 1
9 set str_j@3 '1'
10 jump 18
11 jump_if_not 14(18) (case_expr@0 = 2)
11 jump_if_not 14(18) case_expr@0 = 2
12 set str_j@3 '2'
13 jump 18
14 jump_if_not 17(18) (case_expr@0 = 3)
14 jump_if_not 17(18) case_expr@0 = 3
15 set str_j@3 '3'
16 jump 18
17 set str_j@3 'unknown'
18 stmt 0 "select "i was 20""
19 jump 27
20 jump_if_not 23(27) (i@0 = 30)
20 jump_if_not 23(27) i@0 = 30
21 set str_i@2 '30'
22 jump 27
23 jump_if_not 26(27) (i@0 = 40)
23 jump_if_not 26(27) i@0 = 40
24 set str_i@2 '40'
25 jump 27
26 set str_i@2 'unknown'
@@ -413,28 +413,28 @@ Pos Instruction
0 set str_i@2 NULL
1 set str_j@3 NULL
2 set_case_expr (28) 0 i@0
3 jump_if_not 6(28) (case_expr@0 = 10)
3 jump_if_not 6(28) case_expr@0 = 10
4 set str_i@2 '10'
5 jump 28
6 jump_if_not 21(28) (case_expr@0 = 20)
6 jump_if_not 21(28) case_expr@0 = 20
7 set str_i@2 '20'
8 set_case_expr (19) 1 j@1
9 jump_if_not 12(19) (case_expr@1 = 1)
9 jump_if_not 12(19) case_expr@1 = 1
10 set str_j@3 '1'
11 jump 19
12 jump_if_not 15(19) (case_expr@1 = 2)
12 jump_if_not 15(19) case_expr@1 = 2
13 set str_j@3 '2'
14 jump 19
15 jump_if_not 18(19) (case_expr@1 = 3)
15 jump_if_not 18(19) case_expr@1 = 3
16 set str_j@3 '3'
17 jump 19
18 set str_j@3 'unknown'
19 stmt 0 "select "i was 20""
20 jump 28
21 jump_if_not 24(28) (case_expr@0 = 30)
21 jump_if_not 24(28) case_expr@0 = 30
22 set str_i@2 '30'
23 jump 28
24 jump_if_not 27(28) (case_expr@0 = 40)
24 jump_if_not 27(28) case_expr@0 = 40
25 set str_i@2 '40'
26 jump 28
27 set str_i@2 'unknown'
@@ -443,27 +443,27 @@ SHOW PROCEDURE CODE proc_19194_nested_4;
Pos Instruction
0 set str_i@2 NULL
1 set str_j@3 NULL
2 jump_if_not 5(26) (i@0 = 10)
2 jump_if_not 5(26) i@0 = 10
3 set str_i@2 '10'
4 jump 26
5 jump_if_not 19(26) (i@0 = 20)
5 jump_if_not 19(26) i@0 = 20
6 set str_i@2 '20'
7 jump_if_not 10(17) (j@1 = 1)
7 jump_if_not 10(17) j@1 = 1
8 set str_j@3 '1'
9 jump 17
10 jump_if_not 13(17) (j@1 = 2)
10 jump_if_not 13(17) j@1 = 2
11 set str_j@3 '2'
12 jump 17
13 jump_if_not 16(17) (j@1 = 3)
13 jump_if_not 16(17) j@1 = 3
14 set str_j@3 '3'
15 jump 17
16 set str_j@3 'unknown'
17 stmt 0 "select "i was 20""
18 jump 26
19 jump_if_not 22(26) (i@0 = 30)
19 jump_if_not 22(26) i@0 = 30
20 set str_i@2 '30'
21 jump 26
22 jump_if_not 25(26) (i@0 = 40)
22 jump_if_not 25(26) i@0 = 40
23 set str_i@2 '40'
24 jump 26
25 set str_i@2 'unknown'
@@ -668,8 +668,8 @@ Pos Instruction
0 set i@1 5
1 hpush_jump 8 2 CONTINUE
2 stmt 0 "select 'caught something'"
3 jump_if_not 7(7) (i@1 > 0)
4 set i@1 (i@1 - 1)
3 jump_if_not 7(7) i@1 > 0
4 set i@1 i@1 - 1
5 stmt 0 "select 'looping', i"
6 jump 3
7 hreturn 2
@@ -683,8 +683,8 @@ Pos Instruction
0 set i@1 5
1 hpush_jump 9 2 CONTINUE
2 stmt 0 "select 'caught something'"
3 jump_if_not 7(7) (i@1 > 0)
4 set i@1 (i@1 - 1)
3 jump_if_not 7(7) i@1 > 0
4 set i@1 i@1 - 1
5 stmt 0 "select 'looping', i"
6 jump 3
7 stmt 0 "select 'optimizer: keep hreturn'"
@@ -796,8 +796,8 @@ Pos Instruction
0 set count1@1 '0'
1 set vb@2 NULL
2 set last_row@3 NULL
3 jump_if_not 24(24) (num@0 >= 1)
4 set num@0 (num@0 - 1)
3 jump_if_not 24(24) num@0 >= 1
4 set num@0 num@0 - 1
5 cpush cur1@0
6 hpush_jump 9 4 CONTINUE
7 set last_row@3 1
@@ -807,11 +807,11 @@ Pos Instruction
11 hpush_jump 13 4 EXIT
12 hreturn 0 17
13 cfetch cur1@0 vb@2
14 jump_if_not 17(17) (last_row@3 = 1)
14 jump_if_not 17(17) last_row@3 = 1
15 hpop 1
16 jump 19
17 hpop 1
18 jump_if_not 11(19) (last_row@3 = 1)
18 jump_if_not 11(19) last_row@3 = 1
19 cclose cur1@0
20 hpop 1
21 cpop 1
@@ -821,8 +821,8 @@ Pos Instruction
0 set count1@1 '0'
1 set vb@2 NULL
2 set last_row@3 NULL
3 jump_if_not 23(23) (num@0 >= 1)
4 set num@0 (num@0 - 1)
3 jump_if_not 23(23) num@0 >= 1
4 set num@0 num@0 - 1
5 cpush cur1@0
6 hpush_jump 9 4 CONTINUE
7 set last_row@3 1
@@ -831,11 +831,11 @@ Pos Instruction
10 copen cur1@0
11 cpush cur2@1
12 cfetch cur1@0 vb@2
13 jump_if_not 16(16) (last_row@3 = 1)
13 jump_if_not 16(16) last_row@3 = 1
14 cpop 1
15 jump 18
16 cpop 1
17 jump_if_not 11(18) (last_row@3 = 1)
17 jump_if_not 11(18) last_row@3 = 1
18 cclose cur1@0
19 hpop 1
20 cpop 1
@@ -883,7 +883,7 @@ SHOW PROCEDURE CODE p1;
Pos Instruction
0 set dummy@0 0
1 set_case_expr (6) 0 12
2 jump_if_not 5(6) (case_expr@0 = 12)
2 jump_if_not 5(6) case_expr@0 = 12
3 set dummy@0 0
4 jump 6
5 error 1339