Merge e6db9c7 into a91cf35

Author: pashandor789

ydb/core/kqp/opt/logical/kqp_opt_cbo.cpp

@@ -111,11 +111,13 @@ bool IsLookupJoinApplicable(std::shared_ptr<IBaseOptimizerNode> left,
     const std::set<std::pair<TJoinColumn, TJoinColumn>>& joinConditions,
     const TVector<TString>& leftJoinKeys,
     const TVector<TString>& rightJoinKeys,
-    TKqpProviderContext& ctx) {
+    TKqpProviderContext& ctx
+) {
+    Y_UNUSED(left, joinConditions, leftJoinKeys);
 
-    Y_UNUSED(joinConditions);
-    Y_UNUSED(left);
-    Y_UNUSED(leftJoinKeys);
+    if (!(right->Stats->StorageType == EStorageType::RowStorage)) {
+        return false;
+    }
 
     auto rightStats = right->Stats;
 

ydb/library/yql/dq/opt/dq_opt_join_tree_node.cpp

@@ -17,6 +17,10 @@ std::shared_ptr<TJoinOptimizerNodeInternal> MakeJoinInternal(
 
     auto res = std::make_shared<TJoinOptimizerNodeInternal>(left, right, joinConditions, leftJoinKeys, rightJoinKeys, joinKind, joinAlgo, leftAny, rightAny);
     res->Stats = std::make_shared<TOptimizerStatistics>(ctx.ComputeJoinStats(*left->Stats, *right->Stats, leftJoinKeys, rightJoinKeys, joinAlgo, joinKind, maybeHint));
+    if (left->Stats->StorageType == right->Stats->StorageType) { 
+        res->Stats->StorageType = left->Stats->StorageType; 
+    }
+
     return res;
 }