Skip to content

M
MariaDB
Commit 1cd8a5ef authored by Oleksandr Byelkin's avatar Oleksandr Byelkin
Browse files
Options

Fix of Backport block-nl-join.r_unpack_time_ms.

parent 9bf2e5e3
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 14 deletions
mysql-test/main/except.result
View file @ 1cd8a5ef
...@@ -328,7 +328,7 @@ ANALYZE ...@@ -328,7 +328,7 @@ ANALYZE
"buffer_size": "119", "buffer_size": "119",
"join_type": "BNL", "join_type": "BNL",
"r_filtered": 100, "r_filtered": 100,
"r_unpack_time_ms": 0.0012 "r_unpack_time_ms": "REPLACED"
} }
} }
}, },
...@@ -363,7 +363,7 @@ ANALYZE ...@@ -363,7 +363,7 @@ ANALYZE
"buffer_size": "119", "buffer_size": "119",
"join_type": "BNL", "join_type": "BNL",
"r_filtered": 100, "r_filtered": 100,
"r_unpack_time_ms": 5.4e-4 "r_unpack_time_ms": "REPLACED"
} }
} }
} }
...@@ -426,7 +426,7 @@ ANALYZE ...@@ -426,7 +426,7 @@ ANALYZE
"buffer_size": "119", "buffer_size": "119",
"join_type": "BNL", "join_type": "BNL",
"r_filtered": 100, "r_filtered": 100,
"r_unpack_time_ms": 0.0011 "r_unpack_time_ms": "REPLACED"
} }
} }
}, },
...@@ -461,7 +461,7 @@ ANALYZE ...@@ -461,7 +461,7 @@ ANALYZE
"buffer_size": "119", "buffer_size": "119",
"join_type": "BNL", "join_type": "BNL",
"r_filtered": 100, "r_filtered": 100,
"r_unpack_time_ms": 6.1e-4 "r_unpack_time_ms": "REPLACED"
} }
} }
} }
......
mysql-test/main/except.test
View file @ 1cd8a5ef
...@@ -13,10 +13,8 @@ EXPLAIN extended (select a,b from t1) except (select c,d from t2); ...@@ -13,10 +13,8 @@ EXPLAIN extended (select a,b from t1) except (select c,d from t2);
EXPLAIN extended select * from ((select a,b from t1) except (select c,d from t2)) a; EXPLAIN extended select * from ((select a,b from t1) except (select c,d from t2)) a;
EXPLAIN format=json (select a,b from t1) except (select c,d from t2); EXPLAIN format=json (select a,b from t1) except (select c,d from t2);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
--source include/analyze-format.inc --source include/analyze-format.inc
ANALYZE format=json (select a,b from t1) except (select c,d from t2); ANALYZE format=json (select a,b from t1) except (select c,d from t2);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/
--source include/analyze-format.inc --source include/analyze-format.inc
ANALYZE format=json select * from ((select a,b from t1) except (select c,d from t2)) a; ANALYZE format=json select * from ((select a,b from t1) except (select c,d from t2)) a;
select * from ((select a,b from t1) except (select c,d from t2)) a; 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); ...@@ -47,9 +45,9 @@ EXPLAIN (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4);
EXPLAIN extended select * from ((select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4)) a; EXPLAIN extended select * from ((select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4)) a;
EXPLAIN format=json (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4); EXPLAIN format=json (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/ --source include/analyze-format.inc
ANALYZE format=json (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4); ANALYZE format=json (select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/ --source include/analyze-format.inc
ANALYZE format=json select * from ((select a,b,e,f from t1,t3) except ANALYZE format=json select * from ((select a,b,e,f from t1,t3) except
(select c,d,g,h from t2,t4)) a; (select c,d,g,h from t2,t4)) a;
select * from ((select a,b,e,f from t1,t3) except (select c,d,g,h from t2,t4)) a; 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
View file @ 1cd8a5ef
...@@ -386,7 +386,7 @@ ANALYZE ...@@ -386,7 +386,7 @@ ANALYZE
"buffer_size": "256Kb", "buffer_size": "256Kb",
"join_type": "BNL", "join_type": "BNL",
"r_filtered": 100, "r_filtered": 100,
"r_unpack_time_ms": 6.1e-4 "r_unpack_time_ms": "REPLACED"
} }
} }
} }
...@@ -466,7 +466,7 @@ ANALYZE ...@@ -466,7 +466,7 @@ ANALYZE
"buffer_size": "256Kb", "buffer_size": "256Kb",
"join_type": "BNL", "join_type": "BNL",
"r_filtered": 100, "r_filtered": 100,
"r_unpack_time_ms": 5.8e-4 "r_unpack_time_ms": "REPLACED"
} }
} }
} }
......
mysql-test/main/intersect.test
View file @ 1cd8a5ef
...@@ -24,9 +24,9 @@ EXPLAIN (select a,b from t1) intersect (select c,d from t2) intersect (select e, ...@@ -24,9 +24,9 @@ EXPLAIN (select a,b from t1) intersect (select c,d from t2) intersect (select e,
EXPLAIN extended (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3); EXPLAIN extended (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3);
EXPLAIN extended select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a; EXPLAIN extended select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a;
EXPLAIN format=json (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3); EXPLAIN format=json (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/ --source include/analyze-format.inc
ANALYZE format=json (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3); ANALYZE format=json (select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/ --source include/analyze-format.inc
ANALYZE format=json select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a; ANALYZE format=json select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a;
select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a; select * from ((select a,b from t1) intersect (select c,d from t2) intersect (select e,f from t3)) a;
...@@ -44,9 +44,9 @@ EXPLAIN extended (select a,b from t1) intersect (select c,e from t2,t3); ...@@ -44,9 +44,9 @@ EXPLAIN extended (select a,b from t1) intersect (select c,e from t2,t3);
EXPLAIN extended select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a; EXPLAIN extended select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a;
set @@optimizer_switch='optimize_join_buffer_size=off'; set @@optimizer_switch='optimize_join_buffer_size=off';
EXPLAIN format=json (select a,b from t1) intersect (select c,e from t2,t3); EXPLAIN format=json (select a,b from t1) intersect (select c,e from t2,t3);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/ --source include/analyze-format.inc
ANALYZE format=json (select a,b from t1) intersect (select c,e from t2,t3); ANALYZE format=json (select a,b from t1) intersect (select c,e from t2,t3);
--replace_regex /"r_total_time_ms": [0-9e\.\-+]*,/"r_total_time_ms": "REPLACED",/ --source include/analyze-format.inc
ANALYZE format=json select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a; ANALYZE format=json select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a;
set @@optimizer_switch=@save_optimizer_switch; set @@optimizer_switch=@save_optimizer_switch;
select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a; select * from ((select a,b from t1) intersect (select c,e from t2,t3)) a;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7