Merge 5c5d8a4 into a458b35

Author: rvu1024

ydb/library/yql/providers/yt/provider/yql_yt_physical_finalizing.cpp

@@ -379,7 +379,7 @@ class TYtPhysicalFinalizingTransformer : public TSyncTransformerBase {
         }
 
         if (const auto mode = State_->Configuration->ColumnGroupMode.Get().GetOrElse(EColumnGroupMode::Disable); mode != EColumnGroupMode::Disable) {
-            status = CalculateColumnGroups(input, output, opDepsOrder, opDeps, mode, ctx);
+            status = CalculateColumnGroups(input, output, opDepsOrder, opDeps, lefts, mode, ctx);
             if (status.Level != TStatus::Ok) {
                 return status;
             }
@@ -2822,7 +2822,9 @@ class TYtPhysicalFinalizingTransformer : public TSyncTransformerBase {
         }
     }
 
-    TStatus CalculateColumnGroups(TExprNode::TPtr input, TExprNode::TPtr& output, std::vector<const TExprNode*> opDepsOrder, const TOpDeps& opDeps, EColumnGroupMode mode, TExprContext& ctx) {
+    TStatus CalculateColumnGroups(TExprNode::TPtr input, TExprNode::TPtr& output, const std::vector<const TExprNode*>& opDepsOrder, const TOpDeps& opDeps,
+        const TNodeSet& lefts, EColumnGroupMode mode, TExprContext& ctx)
+    {
         const auto maxGroups = State_->Configuration->MaxColumnGroups.Get().GetOrElse(DEFAULT_MAX_COLUMN_GROUPS);
         const auto minGroupSize = State_->Configuration->MinColumnGroupSize.Get().GetOrElse(DEFAULT_MIN_COLUMN_GROUP_SIZE);
 
@@ -2908,6 +2910,7 @@ class TYtPhysicalFinalizingTransformer : public TSyncTransformerBase {
         }
 
         TNodeOnNodeOwnedMap remap;
+        TNodeOnNodeOwnedMap newOps;
         for (auto& x: colUsages) {
             auto writer = x.first;
             TColumnUsage& usage = x.second;
@@ -3012,11 +3015,22 @@ class TYtPhysicalFinalizingTransformer : public TSyncTransformerBase {
                     }
                     if (newOp) {
                         remap[writer] = newOp;
+                        newOps[writer] = newOp;
                     }
                 }
             }
         }
 
+        if (!lefts.empty() && !newOps.empty()) {
+            for (auto node: lefts) {
+                TCoLeft left(node);
+                auto newIt = newOps.find(left.Input().Raw());
+                if (newIt != newOps.end()) {
+                    remap[node] = ctx.ChangeChild(*node, TCoLeft::idx_Input, TExprNode::TPtr(newIt->second));
+                }
+            }
+        }
+
         if (!remap.empty()) {
             YQL_CLOG(INFO, ProviderYt) << "PhysicalFinalizing-CalculateColumnGroups";
             return RemapExpr(input, output, remap, ctx, TOptimizeExprSettings{State_->Types});