From 8ce9e6ee1d3807c4c43bd8a3417ba2d54759a73c Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sat, 8 Feb 2025 17:14:48 +0800
Subject: [PATCH] fix: join condition push down issue

---
 source/libs/planner/src/planOptimizer.c | 4 +++-
 tests/script/tsim/join/join_nested.sim  | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index e7ea028e5a..32b2636359 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -635,7 +635,9 @@ static EDealRes pdcJoinIsCrossTableCond(SNode* pNode, void* pContext) {
   if (QUERY_NODE_COLUMN == nodeType(pNode)) {
     if (pdcJoinColInTableList(pNode, pCxt->pLeftTbls)) {
       pCxt->havaLeftCol = true;
-    } else if (pdcJoinColInTableList(pNode, pCxt->pRightTbls)) {
+    } 
+
+    if (pdcJoinColInTableList(pNode, pCxt->pRightTbls)) {
       pCxt->haveRightCol = true;
     }
     return pCxt->havaLeftCol && pCxt->haveRightCol ? DEAL_RES_END : DEAL_RES_CONTINUE;
diff --git a/tests/script/tsim/join/join_nested.sim b/tests/script/tsim/join/join_nested.sim
index 77785c9d4d..ed84e7d1aa 100644
--- a/tests/script/tsim/join/join_nested.sim
+++ b/tests/script/tsim/join/join_nested.sim
@@ -32,6 +32,13 @@ sql select a.t1 from (select * from sta partition by tbname order by ts desc) a
 if $rows != 12 then
   return -1
 endi
+sql select a.ts from (select last(tba1.ts) as ts from tba1, tba2 where tba1.ts = tba2.ts) as a join (select ts from tba2) as tba2 on a.ts = tba2.ts;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:03.000@ then
+  return -1
+endi
 
 #left join + non join
 sql_error select a.*,b.* from (select * from sta partition by tbname) a left join (select * from sta partition by tbname order by ts) b on a.ts = b.ts;