Skip to content

Commit 1cd8a5e

Browse files
sanja-byelkinsanja-byelkin
committed
Fix of Backport block-nl-join.r_unpack_time_ms.
1 parent 9bf2e5e commit 1cd8a5e

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

‎mysql-test/main/except.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ ANALYZE
328328
"buffer_size": "119",
329329
"join_type": "BNL",
330330
"r_filtered": 100,
331-
"r_unpack_time_ms": 0.0012
331+
"r_unpack_time_ms": "REPLACED"
332332
}
333333
}
334334
},
@@ -363,7 +363,7 @@ ANALYZE
363363
"buffer_size": "119",
364364
"join_type": "BNL",
365365
"r_filtered": 100,
366-
"r_unpack_time_ms": 5.4e-4
366+
"r_unpack_time_ms": "REPLACED"
367367
}
368368
}
369369
}
@@ -426,7 +426,7 @@ ANALYZE
426426
"buffer_size": "119",
427427
"join_type": "BNL",
428428
"r_filtered": 100,
429-
"r_unpack_time_ms": 0.0011
429+
"r_unpack_time_ms": "REPLACED"
430430
}
431431
}
432432
},
@@ -461,7 +461,7 @@ ANALYZE
461461
"buffer_size": "119",
462462
"join_type": "BNL",
463463
"r_filtered": 100,
464-
"r_unpack_time_ms": 6.1e-4
464+
"r_unpack_time_ms": "REPLACED"
465465
}
466466
}
467467
}

‎mysql-test/main/except.test

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ EXPLAIN extended (select a,b from t1) except (select c,d from t2);
1313
EXPLAIN extended select * from ((select a,b from t1) except (select c,d from t2)) a;
1414
EXPLAIN format=json (select a,b from t1) except (select c,d from t2);
1515

16-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
1716
--source include/analyze-format.inc
1817
ANALYZE format=json (select a,b from t1) except (select c,d from t2);
19-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
2018
--source include/analyze-format.inc
2119
ANALYZE format=json select * from ((select a,b from t1) except (select c,d from t2)) a;
2220
select * from ((select a,b from t1) except (select c,d from t2)) a;
@@ -47,9 +45,9 @@ EXPLAIN (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4);
4745
EXPLAIN extended select * from ((select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4)) a;
4846
EXPLAIN format=json (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4);
4947

50-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
48+
--source include/analyze-format.inc
5149
ANALYZE format=json (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4);
52-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
50+
--source include/analyze-format.inc
5351
ANALYZE format=json select * from ((select a,b,e,f from t1,t3) except
5452
(select c,d,g,h from t2,t4)) a;
5553
select * from ((select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4)) a;

‎mysql-test/main/intersect.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ ANALYZE
386386
"buffer_size": "256Kb",
387387
"join_type": "BNL",
388388
"r_filtered": 100,
389-
"r_unpack_time_ms": 6.1e-4
389+
"r_unpack_time_ms": "REPLACED"
390390
}
391391
}
392392
}
@@ -466,7 +466,7 @@ ANALYZE
466466
"buffer_size": "256Kb",
467467
"join_type": "BNL",
468468
"r_filtered": 100,
469-
"r_unpack_time_ms": 5.8e-4
469+
"r_unpack_time_ms": "REPLACED"
470470
}
471471
}
472472
}

‎mysql-test/main/intersect.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ EXPLAIN (select a,b from t1) intersect (select c,d from t2) intersect (select e,
2424
EXPLAIN extended (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3);
2525
EXPLAIN extended select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a;
2626
EXPLAIN format=json (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3);
27-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
27+
--source include/analyze-format.inc
2828
ANALYZE format=json (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3);
29-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
29+
--source include/analyze-format.inc
3030
ANALYZE format=json select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a;
3131
select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a;
3232

@@ -44,9 +44,9 @@ EXPLAIN extended (select a,b from t1) intersect (select c,e from t2,t3);
4444
EXPLAIN extended select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a;
4545
set @@optimizer_switch='optimize_join_buffer_size=off';
4646
EXPLAIN format=json (select a,b from t1) intersect (select c,e from t2,t3);
47-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
47+
--source include/analyze-format.inc
4848
ANALYZE format=json (select a,b from t1) intersect (select c,e from t2,t3);
49-
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
49+
--source include/analyze-format.inc
5050
ANALYZE format=json select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a;
5151
set @@optimizer_switch=@save_optimizer_switch;
5252
select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a;

0 commit comments

Comments
 (0)