bug 1538:The instance occasionally crashes when the parallel degree i…

…s enabled of the right table #1538
stoneatom · Apr 11, 2023 · 758bce8 · 758bce8
1 parent 44d6ff8
commit 758bce8
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 1 deletion.
diff --git a/mysql-test/suite/tianmu/r/hash_join.result b/mysql-test/suite/tianmu/r/hash_join.result
@@ -7,15 +7,94 @@ CREATE TABLE `test1` (
 CREATE TABLE `test2` (
 `user_id` varchar(32) NOT NULL COMMENT '用户ID'
 ) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+CREATE TABLE `test3` (
+`id` varchar(32) NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+CREATE TABLE `test4` (
+`id` varchar(32) NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
 insert test1 values('aaa');
 insert test1 values('bbb');
 insert test1 values('ccc');
+insert test1 values('eee');
 insert test2 values('aaa');
 insert test2 values('bbb');
 insert test2 values('ccc');
+insert test2 values('fff');
+insert test3 values('aaa');
+insert test3 values('bbb');
+insert test3 values('ccc');
+insert test3 values('ddd');
+insert test4 values('aaa');
+insert test4 values('bbb');
+insert test4 values('ccc');
+insert test4 values('hhh');
+insert test4 values('ggg');
 select test1.id,test2.user_id  from test2,test1 where test2.user_id = test1.id ;
 id	user_id
 aaa	aaa
 bbb	bbb
 ccc	ccc
+select test1.id,test2.user_id,test3.id  from test2,test1,test3 where test2.user_id = test1.id and test2.user_id = test3.id;
+id	user_id	id
+aaa	aaa	aaa
+bbb	bbb	bbb
+ccc	ccc	ccc
+select test1.id,test2.user_id,test3.id,test4.id  from test2,test1,test3,test4 where test2.user_id = test1.id and test2.user_id = test3.id and test3.id = test4.id;
+id	user_id	id	id
+aaa	aaa	aaa	aaa
+bbb	bbb	bbb	bbb
+ccc	ccc	ccc	ccc
+CREATE TABLE `t1` (
+`id` int NOT NULL COMMENT 'ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `t2` (
+`user_id` int NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+CREATE TABLE `t3` (
+`id` int NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+CREATE TABLE `t4` (
+`id` int NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+insert t1 values(101);
+insert t1 values(103);
+insert t1 values(103);
+insert t1 values(201);
+insert t2 values(101);
+insert t2 values(102);
+insert t2 values(103);
+insert t2 values(202);
+insert t3 values(101);
+insert t3 values(102);
+insert t3 values(103);
+insert t3 values(203);
+insert t4 values(101);
+insert t4 values(102);
+insert t4 values(103);
+insert t4 values(204);
+insert t4 values(205);
+select t1.id,t2.user_id  from t2,t1 where t2.user_id = t1.id ;
+id	user_id
+101	101
+103	103
+103	103
+select t1.id,t2.user_id,t3.id  from t2,t1,t3 where t2.user_id = t1.id and t2.user_id = t3.id;
+id	user_id	id
+101	101	101
+103	103	103
+103	103	103
+select t1.id,t2.user_id,t3.id,t4.id  from t2,t1,t3,t4 where t2.user_id = t1.id and t2.user_id = t3.id and t3.id = t4.id;
+id	user_id	id	id
+101	101	101	101
+103	103	103	103
+103	103	103	103
+drop table test1;
+drop table test2;
+drop table test3;
+drop table test4;
+drop table t1;
+drop table t2;
+drop table t3;
+drop table t4;
 DROP DATABASE hash_join_test;
diff --git a/mysql-test/suite/tianmu/t/hash_join.test b/mysql-test/suite/tianmu/t/hash_join.test
@@ -16,14 +16,92 @@ CREATE TABLE `test2` (
   `user_id` varchar(32) NOT NULL COMMENT '用户ID'
 ) ENGINE=TIANMU DEFAULT CHARSET=utf8;
 
+CREATE TABLE `test3` (
+  `id` varchar(32) NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+
+CREATE TABLE `test4` (
+  `id` varchar(32) NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+
 insert test1 values('aaa');
 insert test1 values('bbb');
 insert test1 values('ccc');
+insert test1 values('eee');
 
 insert test2 values('aaa');
 insert test2 values('bbb');
 insert test2 values('ccc');
+insert test2 values('fff');
+
+insert test3 values('aaa');
+insert test3 values('bbb');
+insert test3 values('ccc');
+insert test3 values('ddd');
+
+insert test4 values('aaa');
+insert test4 values('bbb');
+insert test4 values('ccc');
+insert test4 values('hhh');
+insert test4 values('ggg');
 
 select test1.id,test2.user_id  from test2,test1 where test2.user_id = test1.id ;
 
+select test1.id,test2.user_id,test3.id  from test2,test1,test3 where test2.user_id = test1.id and test2.user_id = test3.id;
+
+select test1.id,test2.user_id,test3.id,test4.id  from test2,test1,test3,test4 where test2.user_id = test1.id and test2.user_id = test3.id and test3.id = test4.id;
+
+CREATE TABLE `t1` (
+  `id` int NOT NULL COMMENT 'ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `t2` (
+  `user_id` int NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+
+CREATE TABLE `t3` (
+  `id` int NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+
+CREATE TABLE `t4` (
+  `id` int NOT NULL COMMENT '用户ID'
+) ENGINE=TIANMU DEFAULT CHARSET=utf8;
+
+insert t1 values(101);
+insert t1 values(103);
+insert t1 values(103);
+insert t1 values(201);
+
+insert t2 values(101);
+insert t2 values(102);
+insert t2 values(103);
+insert t2 values(202);
+
+insert t3 values(101);
+insert t3 values(102);
+insert t3 values(103);
+insert t3 values(203);
+
+insert t4 values(101);
+insert t4 values(102);
+insert t4 values(103);
+insert t4 values(204);
+insert t4 values(205);
+
+select t1.id,t2.user_id  from t2,t1 where t2.user_id = t1.id ;
+
+select t1.id,t2.user_id,t3.id  from t2,t1,t3 where t2.user_id = t1.id and t2.user_id = t3.id;
+
+select t1.id,t2.user_id,t3.id,t4.id  from t2,t1,t3,t4 where t2.user_id = t1.id and t2.user_id = t3.id and t3.id = t4.id;
+
+drop table test1;
+drop table test2;
+drop table test3;
+drop table test4;
+
+drop table t1;
+drop table t2;
+drop table t3;
+drop table t4;
+
 DROP DATABASE hash_join_test;
diff --git a/storage/tianmu/core/parallel_hash_join.cpp b/storage/tianmu/core/parallel_hash_join.cpp
@@ -33,7 +33,11 @@
 namespace Tianmu {
 namespace core {
 namespace {
-const int kJoinSplittedMinPacks = 5;
+// bug 1538: The instance occasionally crashes when the parallel degree is enabled for
+// the hash join. To change this from 5 to INT_MAX32/2, to disable the parallel of
+// right table, btw. the kTraversedPacksPerFragment is for left table.
+// we'll re-enable the hash join later if the bug is fixed in near future.
+const int kJoinSplittedMinPacks = INT_MAX32 / 2;
 // bug 1476:  change this threhold from 30 to INT_MAX32 to disable the parallel hash join
 // because the result is sometimes wrong if parallel hash join is enabled.
 // we'll re-enable the hash join later if the bug is fixed in near future.