Skip to content

Commit 41725b4

Browse files
mariadb-YuchenPeimariadb-YuchenPei
committed
MDEV-37810 Introduce combinations of gbh and usual handlers for all spider tests
This also has the side benefits of catching --view-protocol failures in CI, as --view-protocol often causes spider gbh not to be created
1 parent 4d84292 commit 41725b4

38 files changed

+776
-3
lines changed

‎storage/spider/mysql-test/spider/bg/combinations‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/ycp/source/mariadb-server/10.11/src/storage/spider/mysql-test/spider/combinations

‎storage/spider/mysql-test/spider/bg/r/direct_aggregate,usual_handler.rdiff‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
--- ../src/storage/spider/mysql-test/spider/bg/r/direct_aggregate.result 2024-06-21 13:50:21.429397065 +1000
2+
+++ ../src/storage/spider/mysql-test/spider/bg/r/direct_aggregate.reject 2025-10-22 17:39:27.706744886 +1100
3+
@@ -54,31 +54,31 @@
4+
5
5+
SHOW STATUS LIKE 'Spider_direct_aggregate';
6+
Variable_name Value
7+
-Spider_direct_aggregate 0
8+
+Spider_direct_aggregate 1
9+
SELECT MAX(a) FROM ta_l;
10+
MAX(a)
11+
5
12+
SHOW STATUS LIKE 'Spider_direct_aggregate';
13+
Variable_name Value
14+
-Spider_direct_aggregate 0
15+
+Spider_direct_aggregate 1
16+
SELECT MIN(a) FROM ta_l;
17+
MIN(a)
18+
1
19+
SHOW STATUS LIKE 'Spider_direct_aggregate';
20+
Variable_name Value
21+
-Spider_direct_aggregate 0
22+
+Spider_direct_aggregate 1
23+
SELECT MAX(a) FROM ta_l WHERE a < 5;
24+
MAX(a)
25+
4
26+
SHOW STATUS LIKE 'Spider_direct_aggregate';
27+
Variable_name Value
28+
-Spider_direct_aggregate 0
29+
+Spider_direct_aggregate 1
30+
SELECT MIN(a) FROM ta_l WHERE a > 1;
31+
MIN(a)
32+
2
33+
SHOW STATUS LIKE 'Spider_direct_aggregate';
34+
Variable_name Value
35+
-Spider_direct_aggregate 0
36+
+Spider_direct_aggregate 1
37+
38+
deinit
39+
connection master_1;

‎storage/spider/mysql-test/spider/bugfix/combinations‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/ycp/source/mariadb-server/10.11/src/storage/spider/mysql-test/spider/combinations

‎storage/spider/mysql-test/spider/bugfix/disabled.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
wait_timeout : MDEV-26045
22
mdev_27239: MDEV-32046
33
mdev_27575 : MDEV-32997
4-
mdev_28739_simple : MDEV-33343

‎storage/spider/mysql-test/spider/bugfix/r/insert_select,usual_handler.rdiff‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--- ../src/storage/spider/mysql-test/spider/bugfix/r/insert_select.result 2024-05-01 14:39:20.114241787 +1000
2+
+++ ../src/storage/spider/mysql-test/spider/bugfix/r/insert_select.reject 2025-10-22 17:39:54.450930274 +1100
3+
@@ -60,16 +60,16 @@
4+
connection child2_1;
5+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
6+
argument
7+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 4) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
8+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 3) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
9+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 2) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
10+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 1) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
11+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 0) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
12+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 9) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
13+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 8) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
14+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 7) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
15+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 6) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
16+
-select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 5) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
17+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 4 and `dt` > _latin1'2012-11-21' and ((`skey` = 4) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
18+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 3 and `dt` > _latin1'2012-11-21' and ((`skey` = 3) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
19+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 2 and `dt` > _latin1'2012-11-21' and ((`skey` = 2) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
20+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 1 and `dt` > _latin1'2012-11-21' and ((`skey` = 1) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
21+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 0 and `dt` > _latin1'2012-11-21' and ((`skey` = 0) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
22+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 9 and `dt` > _latin1'2012-11-21' and ((`skey` = 9) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
23+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 8 and `dt` > _latin1'2012-11-21' and ((`skey` = 8) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
24+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 7 and `dt` > _latin1'2012-11-21' and ((`skey` = 7) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
25+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 6 and `dt` > _latin1'2012-11-21' and ((`skey` = 6) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
26+
+select `skey`,`dt`,`tm` from `auto_test_remote`.`tbl_a` where `skey` = 5 and `dt` > _latin1'2012-11-21' and ((`skey` = 5) and (`dt` > _latin1'2012-11-21')) order by `dt`,`tm` lock in share mode
27+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
28+
SELECT pkey, dt FROM tbl_b ORDER BY pkey;
29+
pkey dt

‎storage/spider/mysql-test/spider/bugfix/r/mdev_20100,usual_handler.rdiff‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--- ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_20100.result 2024-05-01 14:39:20.114241787 +1000
2+
+++ ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_20100.reject 2025-10-22 17:39:55.494937566 +1100
3+
@@ -78,16 +78,16 @@
4+
connection child2_1;
5+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
6+
argument
7+
-select t0.`a` `a`,t0.`b` `b`,t0.`c` `c` from `auto_test_remote`.`ta_r3` t0 where (t0.`b` = 'c')
8+
+select `a`,`b`,`c` from `auto_test_remote`.`ta_r3` where (`b` = 'c')
9+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r2`
10+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r3`
11+
-select t0.`a` `a`,t0.`b` `b`,t0.`c` `c` from `auto_test_remote`.`ta_r4` t0 where (t0.`b` = 'c')
12+
+select `a`,`b`,`c` from `auto_test_remote`.`ta_r4` where (`b` = 'c')
13+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r2`
14+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r3`
15+
-select t0.`a` `a`,t0.`b` `b`,t0.`c` `c` from `auto_test_remote`.`ta_r2` t0 where (t0.`b` = 'c')
16+
+select `a`,`b`,`c` from `auto_test_remote`.`ta_r2` where (`b` = 'c')
17+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r2`
18+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r4`
19+
-select t0.`a` `a`,t0.`b` `b`,t0.`c` `c` from `auto_test_remote`.`ta_r2` t0 where (t0.`b` = 'c')
20+
+select `a`,`b`,`c` from `auto_test_remote`.`ta_r2` where (`b` = 'c')
21+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r3`
22+
select `a`,`b`,`c` from `auto_test_remote`.`ta_r4`
23+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'

‎storage/spider/mysql-test/spider/bugfix/r/mdev_20502,usual_handler.rdiff‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--- ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_20502.result 2025-08-01 15:07:36.416896406 +1000
2+
+++ ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_20502.reject 2025-10-22 17:39:57.398950875 +1100
3+
@@ -54,14 +54,14 @@
4+
connection child2_1;
5+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
6+
argument
7+
-select t0.`id` `id`,0 `const`,t0.`val` `val` from `auto_test_remote`.`tbl_a` t0
8+
select `id`,`val` from `auto_test_remote`.`tbl_a`
9+
-select (t0.`val` + 1) `tbl_a.val+1` from `auto_test_remote`.`tbl_a` t0
10+
+select `id`,`val` from `auto_test_remote`.`tbl_a`
11+
+select `val` from `auto_test_remote`.`tbl_a`
12+
select `id`,`val` from `auto_test_remote`.`tbl_a` order by `id` desc limit 1 for update
13+
select `val` from `auto_test_remote`.`tbl_a` group by `val`
14+
-select (t0.`val` + 1) `tbl_a.val+1` from `auto_test_remote`.`tbl_a` t0 limit 1
15+
+select `val` from `auto_test_remote`.`tbl_a` limit 2
16+
select max(`id`),min(`id`),`val` from `auto_test_remote`.`tbl_a` group by `val`
17+
-select (t0.`val` + 1) `tbl_a.val+1` from `auto_test_remote`.`tbl_a` t0 limit 1
18+
+select `val` from `auto_test_remote`.`tbl_a` limit 2
19+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
20+
SELECT id, val FROM tbl_a ORDER BY id;
21+
id val

‎storage/spider/mysql-test/spider/bugfix/r/mdev_27172,usual_handler.rdiff‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result 2024-11-15 17:14:27.541903833 +1100
2+
+++ ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.reject 2025-10-22 17:40:25.831151167 +1100
3+
@@ -66,6 +66,9 @@
4+
connection child2_1;
5+
SELECT argument FROM mysql.general_log WHERE argument LIKE 'select `id`,`greeting` from %';
6+
argument
7+
+select `id`,`greeting` from `auto_test_remote`.`tbl_a` where `greeting` = 'Aloha!' and ((`greeting` = 'Aloha!') and ((case `greeting` when 'Aloha!' then _latin1'one' else _latin1'more' end) = _latin1'one'))
8+
+select `id`,`greeting` from `auto_test_remote`.`tbl_b` where `greeting` like 'Aloha%' and ((`greeting` = 'Aloha!') and ((case `greeting` when 'Aloha!' then _latin1'one' else _latin1'more' end) = _latin1'one'))
9+
+select `id`,`greeting` from `auto_test_remote`.`tbl_c` where `greeting` like 'Aloha%' and ((`greeting` = 'Aloha!') and ((case `greeting` when 'Aloha!' then _latin1'one' else _latin1'more' end) = _latin1'one'))
10+
connection child2_1;
11+
SET @@global.general_log = @general_log_backup;
12+
SET @@global.log_output = @log_output_backup;

‎storage/spider/mysql-test/spider/bugfix/r/mdev_29008,usual_handler.rdiff‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_29008.result 2025-08-01 15:07:36.416896406 +1000
2+
+++ ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_29008.reject 2025-10-22 17:40:29.191175025 +1100
3+
@@ -39,8 +39,10 @@
4+
connection child2_1;
5+
SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %';
6+
argument
7+
-select min(t1.`a`) `f1`,t0.`b` `f2` from `auto_test_remote`.`tbl_a` t0 join `auto_test_remote`.`tbl_a` t1 group by `f2` order by `f1`,`f2`
8+
-select min(t1.`a`) `f1`,t0.`b` `f2` from `auto_test_remote`.`tbl_a` t0 join `auto_test_remote`.`tbl_a` t1 group by `f2` order by min(t1.`a`),max(t1.`a`),`f2`
9+
+select `b` from `auto_test_remote`.`tbl_a`
10+
+select `a` from `auto_test_remote`.`tbl_a`
11+
+select `b` from `auto_test_remote`.`tbl_a`
12+
+select `a` from `auto_test_remote`.`tbl_a`
13+
SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %'
14+
set global log_output=@old_log_output;
15+
set global general_log=@old_general_log;

‎storage/spider/mysql-test/spider/bugfix/r/mdev_29502,usual_handler.rdiff‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
--- ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_29502.result 2025-08-01 15:07:36.416896406 +1000
2+
+++ ../src/storage/spider/mysql-test/spider/bugfix/r/mdev_29502.reject 2025-10-22 17:40:28.295168659 +1100
3+
@@ -35,7 +35,7 @@
4+
48 48
5+
SHOW STATUS LIKE 'Spider_direct_aggregate';
6+
Variable_name Value
7+
-Spider_direct_aggregate 0
8+
+Spider_direct_aggregate 8
9+
DROP TABLE t, t1;
10+
CREATE TABLE t (a INT, b INT);
11+
INSERT INTO t VALUES (23, -1),(48, 97);
12+
@@ -45,7 +45,7 @@
13+
145 -25
14+
SHOW STATUS LIKE 'Spider_direct_aggregate';
15+
Variable_name Value
16+
-Spider_direct_aggregate 0
17+
+Spider_direct_aggregate 10
18+
DROP TABLE t, t1;
19+
CREATE TABLE t (a INT);
20+
INSERT INTO t VALUES (23),(97),(42);
21+
@@ -55,13 +55,13 @@
22+
Y 97
23+
SHOW STATUS LIKE 'Spider_direct_aggregate';
24+
Variable_name Value
25+
-Spider_direct_aggregate 2
26+
+Spider_direct_aggregate 12
27+
SELECT MAX(a), IF(COUNT(a > 0),'Y','N') FROM t1;
28+
MAX(a) IF(COUNT(a > 0),'Y','N')
29+
97 Y
30+
SHOW STATUS LIKE 'Spider_direct_aggregate';
31+
Variable_name Value
32+
-Spider_direct_aggregate 4
33+
+Spider_direct_aggregate 14
34+
DROP TABLE t, t1;
35+
set spider_direct_aggregate=@old_spider_direct_aggregate;
36+
DROP SERVER srv_mdev_29502;

0 commit comments

Comments
 (0)