diff --git a/source/libs/planner/src/planSpliter.c b/source/libs/planner/src/planSpliter.c
index b077e6ef55b608eb7d17bb394f6722c10091aea9..3d77010c76fdf96e68f7f22ae3de82d23ae2b66d 100644
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
@@ -248,12 +248,25 @@ static bool stbSplNeedSplitWindow(bool streamQuery, SLogicNode* pNode) {
   return false;
 }
 
+static bool stbSplNeedSplitJoin(bool streamQuery, SJoinLogicNode* pJoin) {
+  if (pJoin->isSingleTableJoin) {
+    return false;
+  }
+  SNode* pChild = NULL;
+  FOREACH(pChild, pJoin->node.pChildren) {
+    if (QUERY_NODE_LOGIC_PLAN_SCAN != nodeType(pChild) && QUERY_NODE_LOGIC_PLAN_JOIN != nodeType(pChild)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 static bool stbSplNeedSplit(bool streamQuery, SLogicNode* pNode) {
   switch (nodeType(pNode)) {
     case QUERY_NODE_LOGIC_PLAN_SCAN:
       return stbSplIsMultiTbScan(streamQuery, (SScanLogicNode*)pNode);
     case QUERY_NODE_LOGIC_PLAN_JOIN:
-      return !(((SJoinLogicNode*)pNode)->isSingleTableJoin);
+      return stbSplNeedSplitJoin(streamQuery, (SJoinLogicNode*)pNode);
     case QUERY_NODE_LOGIC_PLAN_PARTITION:
       return stbSplIsMultiTbScanChild(streamQuery, pNode);
     case QUERY_NODE_LOGIC_PLAN_AGG:
diff --git a/tests/script/tsim/parser/condition_query.sim b/tests/script/tsim/parser/condition_query.sim
index a8a9be5cfd2009f59efca196ca260f6de212cf0a..d9bfcb80742230fe52cac7656dbc91735350a63d 100644
--- a/tests/script/tsim/parser/condition_query.sim
+++ b/tests/script/tsim/parser/condition_query.sim
@@ -37,7 +37,7 @@ sql select * from stb1 where c8 < 'nuLl';
 sql select * from stb1 where c9 > 'nuLl';
 sql_error select * from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b;
 sql_error select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 or b.c1 < 60;
-sql_error select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and ((a.c1 > 50 and a.c1 < 60) or (b.c2 > 60));
+sql select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and ((a.c1 > 50 and a.c1 < 60) or (b.c2 > 60));
 sql select * from stb1 where 'c2' is null;
 sql select * from stb1 where 'c2' is not null;
 
@@ -1475,66 +1475,66 @@ if $data20 != @21-05-05 18:19:25.000@ then
   return -1
 endi
 
-#sql select a.* from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 order by ts;
-#sql select a.* from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50;
-#if $rows != 4 then
-#  return -1
-#endi
-#if $data00 != @21-05-05 18:19:20.000@ then
-#  return -1
-#endi
-#if $data10 != @21-05-05 18:19:21.000@ then
-#  return -1
-#endi
-#if $data20 != @21-05-05 18:19:24.000@ then
-#  return -1
-#endi
-#if $data30 != @21-05-05 18:19:25.000@ then
-#  return -1
-#endi
+sql select a.* from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 order by ts;
+sql select a.* from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50;
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+  return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+  return -1
+endi
+if $data20 != @21-05-05 18:19:24.000@ then
+  return -1
+endi
+if $data30 != @21-05-05 18:19:25.000@ then
+  return -1
+endi
 
-#sql select a.ts,a.c1,a.c8,a.c9 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 and b.c1 < 60 order by ts;
-#sql select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 and b.c1 < 60 order by ts;
-#if $rows != 2 then
-#  return -1
-#endi
-#if $data00 != @21-05-05 18:19:20.000@ then
-#  return -1
-#endi
-#if $data10 != @21-05-05 18:19:21.000@ then
-#  return -1
-#endi
-#
-#sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and (a.c1 < 10 or a.c1 > 30) and (b.u1 < 5 or b.u1 > 5) order by ts;
-#if $rows != 4 then
-#  return -1
-#endi
-#if $data00 != @21-05-05 18:19:00.000@ then
-#  return -1
-#endi
-#if $data10 != @21-05-05 18:19:02.000@ then
-#  return -1
-#endi
-#if $data20 != @21-05-05 18:19:12.000@ then
-#  return -1
-#endi
-#if $data30 != @21-05-05 18:19:14.000@ then
-#  return -1
-#endi
-#
-#sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and a.c1 < 30 and b.u1 > 1 and a.c1 > 10 and b.u1 < 8 and b.u1<>5 order by ts;
-#if $rows != 3 then
-#  return -1
-#endi
-#if $data00 != @21-05-05 18:19:04.000@ then
-#  return -1
-#endi
-#if $data10 != @21-05-05 18:19:06.000@ then
-#  return -1
-#endi
-#if $data20 != @21-05-05 18:19:10.000@ then
-#  return -1
-#endi
+sql select a.ts,a.c1,a.c8,a.c9 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 and b.c1 < 60 order by ts;
+sql select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 and b.c1 < 60 order by ts;
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+  return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+  return -1
+endi
+
+sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and (a.c1 < 10 or a.c1 > 30) and (b.u1 < 5 or b.u1 > 5) order by ts;
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+  return -1
+endi
+if $data10 != @21-05-05 18:19:02.000@ then
+  return -1
+endi
+if $data20 != @21-05-05 18:19:12.000@ then
+  return -1
+endi
+if $data30 != @21-05-05 18:19:14.000@ then
+  return -1
+endi
+
+sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and a.c1 < 30 and b.u1 > 1 and a.c1 > 10 and b.u1 < 8 and b.u1<>5 order by ts;
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @21-05-05 18:19:04.000@ then
+  return -1
+endi
+if $data10 != @21-05-05 18:19:06.000@ then
+  return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+  return -1
+endi
 
 sql select * from stb1 where c1 is null and c1 is not null;
 if $rows != 0 then
@@ -2574,7 +2574,7 @@ sql select * from stb1 where c1 > 0 or t1 > 0 and c1 > 1
 sql select * from stb1 where t1 > 0 or t1 > 0 and c1 > 1
 sql select * from stb1 where (c1 > 0 and t1 > 0 ) or (t1 > 1 and c1 > 3)
 sql select * from stb1 where (c1 > 0 and t1 > 0 ) or t1 > 1
-sql_error select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and a.t1=b.t1;
+sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and a.t1=b.t1;
 
 sql select * from stb1 where c1 < 63 and t1 > 5
 if $rows != 2 then
diff --git a/tests/script/tsim/parser/first_last_query.sim b/tests/script/tsim/parser/first_last_query.sim
index d7d6f482596a41892de160c835a13f61a40b1510..92c9fd14d64107021d8b215d5236f22c272da2b8 100644
--- a/tests/script/tsim/parser/first_last_query.sim
+++ b/tests/script/tsim/parser/first_last_query.sim
@@ -284,7 +284,7 @@ sql connect
 sql use first_db0;
 
 sql select last(*), tbname from m1 group by tbname order by tbname;
-
+print $data00 $data01 $data02 $data10 $data11 $data12
 if $rows != 2 then
   return -1
 endi
@@ -314,4 +314,4 @@ if $data12 != @tm1@ then
   return -1
 endi
 
-sql drop table m1
\ No newline at end of file
+sql drop table m1