YQL-14354: EquiJoin

ref:71141e22080bd58b267621a873cdb1dab4a4ebe4

1 files changed, 4 insertions, 4 deletions

diff --git a/ydb/library/yql/providers/dq/opt/logical_optimize.cpp b/ydb/library/yql/providers/dq/opt/logical_optimize.cpp
index 9e87f81e7c..012571a3f6 100644
--- a/ydb/library/yql/providers/dq/opt/logical_optimize.cpp
+++ b/ydb/library/yql/providers/dq/opt/logical_optimize.cpp
@@ -96,6 +96,7 @@ protected:
 
     TMaybeNode<TExprBase> RewriteEquiJoin(TExprBase node, TExprContext& ctx) {
         auto equiJoin = node.Cast<TCoEquiJoin>();
+        bool hasDqConnections = false;
         for (size_t i = 0; i + 2 < equiJoin.ArgCount(); ++i) {
             auto list = equiJoin.Arg(i).Cast<TCoEquiJoinInput>().List();
             if (auto maybeExtractMembers = list.Maybe<TCoExtractMembers>()) {
@@ -104,11 +105,10 @@ protected:
             if (auto maybeFlatMap = list.Maybe<TCoFlatMapBase>()) {
                 list = maybeFlatMap.Cast().Input();
             }
-            if (!list.Maybe<TDqConnection>()) {
-                return node;
-            }
+            hasDqConnections |= !!list.Maybe<TDqConnection>();
         }
-        return DqRewriteEquiJoin(node, ctx);
+
+        return hasDqConnections ? DqRewriteEquiJoin(node, ctx) : node;
     }
 
     TMaybeNode<TExprBase> ExpandWindowFunctions(TExprBase node, TExprContext& ctx) {