Add original keys to MapJoinCore (#2592)

author: Pavel Velikhov <[email protected]> 2024-03-12 21:29:48 +0300
committer: GitHub <[email protected]> 2024-03-12 21:29:48 +0300
commit: ece018e7f8887ac594a0d8775344f7bedf1d32a0 (patch)
tree: 32ef38fc13e124a846de907678cebef0bd16ff51
parent: 76f688158ce4fdb838985f291d0039e0f6ddaa96 (diff)
48 files changed, 251 insertions, 236 deletions
diff --git a/ydb/core/kqp/opt/kqp_query_plan.cpp b/ydb/core/kqp/opt/kqp_query_plan.cpp
index 2e9ec61900a..ecacc13b9e2 100644
--- a/ydb/core/kqp/opt/kqp_query_plan.cpp
+++ b/ydb/core/kqp/opt/kqp_query_plan.cpp
@@ -1338,7 +1338,7 @@ private:
 
         TOperator op;
         op.Properties["Name"] = name;
-        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumns(), join.RightKeysColumns());
+        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames());
 
         AddOptimizerEstimates(op, join);
 
@@ -1354,7 +1354,7 @@ private:
 
         TOperator op;
         op.Properties["Name"] = name;
-        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumns(), join.RightKeysColumns());
+        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames());
 
 
         AddOptimizerEstimates(op, join);
diff --git a/ydb/library/yql/core/common_opt/yql_co_extr_members.cpp b/ydb/library/yql/core/common_opt/yql_co_extr_members.cpp
index 2386e723367..a4e8f7afda6 100644
--- a/ydb/library/yql/core/common_opt/yql_co_extr_members.cpp
+++ b/ydb/library/yql/core/common_opt/yql_co_extr_members.cpp
@@ -506,6 +506,8 @@ TExprNode::TPtr ApplyExtractMembersToMapJoinCore(const TExprNode::TPtr& node, co
         .RightKeysColumns(mapJoin.RightKeysColumns())
         .LeftRenames(ctx.NewList(mapJoin.LeftInput().Pos(), std::move(left)))
         .RightRenames(ctx.NewList(mapJoin.RightRenames().Pos(), std::move(right)))
+        .LeftKeysColumnNames(mapJoin.LeftKeysColumnNames())
+        .RightKeysColumnNames(mapJoin.RightKeysColumnNames())
         .Done().Ptr();
 }
 
diff --git a/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json b/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json
index eaff205f767..1e063278eb7 100644
--- a/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json
+++ b/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json
@@ -1570,7 +1570,9 @@
                 {"Index": 3, "Name": "LeftKeysColumns", "Type": "TCoAtomList"},
                 {"Index": 4, "Name": "RightKeysColumns", "Type": "TCoAtomList"},
                 {"Index": 5, "Name": "LeftRenames", "Type": "TCoAtomList"},
-                {"Index": 6, "Name": "RightRenames", "Type": "TCoAtomList"}
+                {"Index": 6, "Name": "RightRenames", "Type": "TCoAtomList"},
+                {"Index": 7, "Name": "LeftKeysColumnNames", "Type": "TCoAtomList"},
+                {"Index": 8, "Name": "RightKeysColumnNames", "Type": "TCoAtomList"}
             ]
         },
         {
diff --git a/ydb/library/yql/core/type_ann/type_ann_join.cpp b/ydb/library/yql/core/type_ann/type_ann_join.cpp
index 3e4dc9942eb..8b2eb350d4e 100644
--- a/ydb/library/yql/core/type_ann/type_ann_join.cpp
+++ b/ydb/library/yql/core/type_ann/type_ann_join.cpp
@@ -476,7 +476,7 @@ namespace NTypeAnnImpl {
     IGraphTransformer::TStatus MapJoinCoreWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx) {
         Y_UNUSED(output);
         
-        if (!EnsureArgsCount(*input, 7, ctx.Expr)) {
+        if (!EnsureArgsCount(*input, 9, ctx.Expr)) {
             return IGraphTransformer::TStatus::Error;
         }
 
diff --git a/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp b/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp
index c5c3449b056..86de099661e 100644
--- a/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp
+++ b/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp
@@ -2177,7 +2177,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
 
     (let dict (ToDict list2 (lambda '(item) '((Member item 'key2) (Member item 'subkey2))) (lambda '(item) '((Member item 'subkey2) (Member item 'value2))) '('One 'Hashed)))
 
-    (let join (MapJoinCore (ToFlow list1) dict 'Inner '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v)))
+    (let join (MapJoinCore (ToFlow list1) dict 'Inner '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v) '() '()))
     (let list (Collect join))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2219,7 +2219,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
 
     (let dict (ToDict list2 (lambda '(item) '((Member item 'key2) (Member item 'subkey2))) (lambda '(item) '((Member item 'subkey2) (Member item 'value2))) '('Many 'Hashed)))
 
-    (let join (MapJoinCore (ToFlow list1) dict 'Inner '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v)))
+    (let join (MapJoinCore (ToFlow list1) dict 'Inner '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v) '() '()))
     (let list (Collect join))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2261,7 +2261,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
 
     (let dict (ToDict list2 (lambda '(item) '((Member item 'key2) (Member item 'subkey2))) (lambda '(item) '((Member item 'subkey2) (Member item 'value2))) '('One 'Hashed)))
 
-    (let join (MapJoinCore (ToFlow list1) dict 'Left '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v)))
+    (let join (MapJoinCore (ToFlow list1) dict 'Left '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v) '() '()))
     (let list (Collect join))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2303,7 +2303,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
 
     (let dict (ToDict list2 (lambda '(item) '((Member item 'key2) (Member item 'subkey2))) (lambda '(item) '((Member item 'subkey2) (Member item 'value2))) '('Many 'Hashed)))
 
-    (let join (MapJoinCore (ToFlow list1) dict 'Left '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v)))
+    (let join (MapJoinCore (ToFlow list1) dict 'Left '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '('0 's '1 'v) '() '()))
     (let list (Collect join))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2345,7 +2345,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
 
     (let dict (ToDict list2 (lambda '(item) '((Member item 'key2) (Member item 'subkey2))) (lambda '(item) '()) '('One 'Hashed)))
 
-    (let join (MapJoinCore (ToFlow list1) dict 'LeftSemi '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '()))
+    (let join (MapJoinCore (ToFlow list1) dict 'LeftSemi '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'subkey1 'subkey 'value1 'value) '() '() '()))
     (let list (Collect join))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2387,7 +2387,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
 
     (let dict (ToDict list2 (lambda '(item) '((Member item 'key2) (Member item 'subkey2))) (lambda '(item) '()) '('One 'Hashed)))
 
-    (let join (MapJoinCore (ToFlow list1) dict 'LeftOnly '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'value1 'value) '()))
+    (let join (MapJoinCore (ToFlow list1) dict 'LeftOnly '('key1 'subkey1) '('key2 'subkey2) '('key1 'key 'value1 'value) '() '() '()))
     (let list (Collect join))
 
     (let res_sink (DataSink 'yt (quote plato)))
diff --git a/ydb/library/yql/dq/opt/dq_opt_join.cpp b/ydb/library/yql/dq/opt/dq_opt_join.cpp
index d11239b91c3..e05030efe21 100644
--- a/ydb/library/yql/dq/opt/dq_opt_join.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_join.cpp
@@ -1421,6 +1421,8 @@ TExprBase DqBuildHashJoin(const TDqJoin& join, EHashJoinMode mode, bool useCBO,
                                         return parent;
                                     })
                                 .Seal()
+                                .List(7).Add(join.LeftJoinKeyNames().Ref().ChildrenList()).Seal()
+                                .List(8).Add(join.RightJoinKeyNames().Ref().ChildrenList()).Seal()
                             .Seal()
                         .Seal()
                     .Seal().Build();
@@ -1469,6 +1471,8 @@ TExprBase DqBuildHashJoin(const TDqJoin& join, EHashJoinMode mode, bool useCBO,
                                         return parent;
                                     })
                                 .Seal()
+                                .List(7).Add(join.LeftJoinKeyNames().Ref().ChildrenList()).Seal()
+                                .List(8).Add(join.RightJoinKeyNames().Ref().ChildrenList()).Seal()
                             .Seal()
                         .Seal()
                     .Seal().Build();
diff --git a/ydb/library/yql/dq/opt/dq_opt_peephole.cpp b/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
index 06224da1555..cd6d3138fbd 100644
--- a/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
@@ -292,7 +292,8 @@ TExprBase DqPeepholeRewriteMapJoin(const TExprBase& node, TExprContext& ctx) {
     const bool payloads = !rightPayloads.empty();
     rightInput = MakeDictForJoin<true>(PrepareListForJoin(std::move(rightInput), keyTypes, rightKeyColumnNodes, rightPayloads, payloads, false, true, ctx), payloads, withRightSide, ctx);
     leftInput = AddConvertedKeys(std::move(leftInput), ctx, leftKeyColumnNodes, keyTypesLeft, itemTypeLeft);
-    auto [_, rightKeyColumnNodesCopy] = JoinKeysToAtoms(ctx, mapJoin, leftTableLabel, rightTableLabel);
+    auto [leftKeyColumnNodesCopy, rightKeyColumnNodesCopy] = JoinKeysToAtoms(ctx, mapJoin, leftTableLabel, rightTableLabel);
+    auto [_, rightKeyColumnNodesAnotherCopy] = JoinKeysToAtoms(ctx, mapJoin, leftTableLabel, rightTableLabel);
 
     return Build<TCoExtractMembers>(ctx, pos)
         .Input<TCoFlatMap>()
@@ -304,9 +305,11 @@ TExprBase DqPeepholeRewriteMapJoin(const TExprBase& node, TExprContext& ctx) {
                     .RightDict("dict")
                     .JoinKind(mapJoin.JoinType())
                     .LeftKeysColumns(ctx.NewList(pos, std::move(leftKeyColumnNodes)))
-                    .RightKeysColumns(ctx.NewList(pos, std::move(rightKeyColumnNodesCopy)))
+                    .RightKeysColumns(ctx.NewList(pos,  std::move(rightKeyColumnNodesCopy)))
                     .LeftRenames(ctx.NewList(pos, std::move(leftRenames)))
                     .RightRenames(ctx.NewList(pos, std::move(rightRenames)))
+                    .LeftKeysColumnNames(ctx.NewList(pos,  std::move(leftKeyColumnNodesCopy)))
+                    .RightKeysColumnNames(ctx.NewList(pos,  std::move(rightKeyColumnNodesAnotherCopy)))
                 .Build()
             .Build()
         .Build()
diff --git a/ydb/library/yql/dq/opt/dq_opt_stat.cpp b/ydb/library/yql/dq/opt/dq_opt_stat.cpp
index 464def94be6..9f0ea03e9fa 100644
--- a/ydb/library/yql/dq/opt/dq_opt_stat.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_stat.cpp
@@ -154,11 +154,11 @@ void InferStatisticsForMapJoin(const TExprNode::TPtr& input, TTypeAnnotationCont
     TVector<TString> leftJoinKeys;
     TVector<TString> rightJoinKeys;
 
-    for (size_t i=0; i<join.LeftKeysColumns().Size(); i++) {
-        leftJoinKeys.push_back(RemoveAliases(join.LeftKeysColumns().Item(i).StringValue()));
+    for (size_t i=0; i<join.LeftKeysColumnNames().Size(); i++) {
+        leftJoinKeys.push_back(RemoveAliases(join.LeftKeysColumnNames().Item(i).StringValue()));
     }
-    for (size_t i=0; i<join.RightKeysColumns().Size(); i++) {
-        rightJoinKeys.push_back(RemoveAliases(join.RightKeysColumns().Item(i).StringValue()));
+    for (size_t i=0; i<join.RightKeysColumnNames().Size(); i++) {
+        rightJoinKeys.push_back(RemoveAliases(join.RightKeysColumnNames().Item(i).StringValue()));
     }
 
     typeCtx->SetStats(join.Raw(), std::make_shared<TOptimizerStatistics>(
diff --git a/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.cpp b/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.cpp
index c15f6dba273..3b029d7fda4 100644
--- a/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.cpp
+++ b/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.cpp
@@ -1886,6 +1886,8 @@ bool RewriteYtMapJoin(TYtEquiJoin equiJoin, const TJoinLabels& labels, bool isLo
                                 .Add(4, ctx.NewList(pos, std::move(remappedMembers)))
                                 .Add(5, ctx.NewList(pos, std::move(leftRenameNodes)))
                                 .Add(6, ctx.NewList(pos, std::move(rightRenameNodes)))
+                                .Add(7, leftKeyColumns)
+                                .Add(8, rightKeyColumns)
                             .Seal()
                         .Seal()
                     .Seal()
@@ -1900,6 +1902,8 @@ bool RewriteYtMapJoin(TYtEquiJoin equiJoin, const TJoinLabels& labels, bool isLo
                         .Add(4, ctx.NewList(pos, std::move(remappedMembers)))
                         .Add(5, ctx.NewList(pos, std::move(leftRenameNodes)))
                         .Add(6, ctx.NewList(pos, std::move(rightRenameNodes)))
+                        .Add(7, leftKeyColumns)
+                        .Add(8, rightKeyColumns)
                     .Seal()
                     .Build();
             }
diff --git a/ydb/library/yql/tests/s-expressions/suites/Join/EmptyLeftJoin.yql b/ydb/library/yql/tests/s-expressions/suites/Join/EmptyLeftJoin.yql
index f34783b7809..78c4cbd20f2 100644
--- a/ydb/library/yql/tests/s-expressions/suites/Join/EmptyLeftJoin.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/Join/EmptyLeftJoin.yql
@@ -13,7 +13,7 @@
 
 (let dictOne (ToDict list2 keyExtractor payloadExtractor '('Hashed 'One 'Compact)))
 (let dictMany (ToDict list2 keyExtractor payloadExtractor '('Hashed 'Many 'Compact)))
-(let joinLeft (MapJoinCore (Iterator list1 (DependsOn (String 'Left))) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
+(let joinLeft (MapJoinCore (Iterator list1 (DependsOn (String 'Left))) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Collect joinLeft) '('('type))))
diff --git a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore.yql b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore.yql
index 46644005176..31113280248 100644
--- a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore.yql
@@ -21,12 +21,12 @@
 
 (let dictOne (ToDict list2 keyExtractor payloadExtractor '('Hashed 'One 'Compact)))
 (let dictMany (ToDict list2 keyExtractor payloadExtractor '('Hashed 'Many 'Compact)))
-(let joinLeftSemi (MapJoinCore (Iterator list1 (DependsOn (String 'LeftSemi))) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '()))
-(let joinLeftOnly (MapJoinCore (Iterator list1 (DependsOn (String 'LeftOnly))) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '()))
-(let joinInnerUnique (MapJoinCore (Iterator list1 (DependsOn (String 'InnerU))) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2)))
-(let joinLeftUnique (MapJoinCore (Iterator list1 (DependsOn (String 'LeftU))) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
-(let joinInner (MapJoinCore (Iterator list1 (DependsOn (String 'Inner))) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2)))
-(let joinLeft (MapJoinCore (Iterator list1 (DependsOn (String 'Left))) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
+(let joinLeftSemi (MapJoinCore (Iterator list1 (DependsOn (String 'LeftSemi))) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '() '() '()))
+(let joinLeftOnly (MapJoinCore (Iterator list1 (DependsOn (String 'LeftOnly))) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '() '() '()))
+(let joinInnerUnique (MapJoinCore (Iterator list1 (DependsOn (String 'InnerU))) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2) '() '()))
+(let joinLeftUnique (MapJoinCore (Iterator list1 (DependsOn (String 'LeftU))) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
+(let joinInner (MapJoinCore (Iterator list1 (DependsOn (String 'Inner))) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2) '() '()))
+(let joinLeft (MapJoinCore (Iterator list1 (DependsOn (String 'Left))) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Collect joinLeftSemi) '('('type))))
diff --git a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yql b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yql
index 94801e9d6ef..663bde49553 100644
--- a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yql
@@ -21,12 +21,12 @@
 
 (let dictOne (ToDict list2 keyExtractor payloadExtractor '('Hashed 'One 'Compact)))
 (let dictMany (ToDict list2 keyExtractor payloadExtractor '('Hashed 'Many 'Compact)))
-(let joinLeftSemi (MapJoinCore (Iterator list1 (DependsOn (String 'LeftSemi))) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '()))
-(let joinLeftOnly (MapJoinCore (Iterator list1 (DependsOn (String 'LeftOnly))) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '()))
-(let joinInnerUnique (MapJoinCore (Iterator list1 (DependsOn (String 'InnerU))) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2)))
-(let joinLeftUnique (MapJoinCore (Iterator list1 (DependsOn (String 'LeftU))) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
-(let joinInner (MapJoinCore (Iterator list1 (DependsOn (String 'Inner))) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2)))
-(let joinLeft (MapJoinCore (Iterator list1 (DependsOn (String 'Left))) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
+(let joinLeftSemi (MapJoinCore (Iterator list1 (DependsOn (String 'LeftSemi))) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '() '() '()))
+(let joinLeftOnly (MapJoinCore (Iterator list1 (DependsOn (String 'LeftOnly))) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '() '() '()))
+(let joinInnerUnique (MapJoinCore (Iterator list1 (DependsOn (String 'InnerU))) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2) '() '()))
+(let joinLeftUnique (MapJoinCore (Iterator list1 (DependsOn (String 'LeftU))) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
+(let joinInner (MapJoinCore (Iterator list1 (DependsOn (String 'Inner))) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2) '() '()))
+(let joinLeft (MapJoinCore (Iterator list1 (DependsOn (String 'Left))) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Collect joinLeftSemi) '('('type))))
diff --git a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yql b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yql
index 55b696b83b8..9c1ef15dfec 100644
--- a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yql
@@ -21,12 +21,12 @@
 
 (let dictOne (ToDict list2 keyExtractor payloadExtractor '('Hashed 'One 'Compact)))
 (let dictMany (ToDict list2 keyExtractor payloadExtractor '('Hashed 'Many 'Compact)))
-(let joinLeftSemi (MapJoinCore (ToFlow list1) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '()))
-(let joinLeftOnly (MapJoinCore (ToFlow list1) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '()))
-(let joinInnerUnique (MapJoinCore (ToFlow list1) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2)))
-(let joinLeftUnique (MapJoinCore (ToFlow list1) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
-(let joinInner (MapJoinCore (ToFlow list1) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2)))
-(let joinLeft (MapJoinCore (ToFlow list1) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
+(let joinLeftSemi (MapJoinCore (ToFlow list1) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '() '() '()))
+(let joinLeftOnly (MapJoinCore (ToFlow list1) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '() '() '()))
+(let joinInnerUnique (MapJoinCore (ToFlow list1) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2) '() '()))
+(let joinLeftUnique (MapJoinCore (ToFlow list1) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
+(let joinInner (MapJoinCore (ToFlow list1) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2) '() '()))
+(let joinLeft (MapJoinCore (ToFlow list1) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Collect joinLeftSemi) '('('type))))
diff --git a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_Flow.yql b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_Flow.yql
index 152f57d2275..61b150f5f85 100644
--- a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_Flow.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_Flow.yql
@@ -21,12 +21,12 @@
 
 (let dictOne (ToDict list2 keyExtractor payloadExtractor '('Hashed 'One 'Compact)))
 (let dictMany (ToDict list2 keyExtractor payloadExtractor '('Hashed 'Many 'Compact)))
-(let joinLeftSemi (MapJoinCore (ToFlow list1) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '()))
-(let joinLeftOnly (MapJoinCore (ToFlow list1) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '()))
-(let joinInnerUnique (MapJoinCore (ToFlow list1) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2)))
-(let joinLeftUnique (MapJoinCore (ToFlow list1) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
-(let joinInner (MapJoinCore (ToFlow list1) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2)))
-(let joinLeft (MapJoinCore (ToFlow list1) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2)))
+(let joinLeftSemi (MapJoinCore (ToFlow list1) dictOne 'LeftSemi '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '() '() '()))
+(let joinLeftOnly (MapJoinCore (ToFlow list1) dictOne 'LeftOnly '('key1) '('key2) '('key1 'a.key1 'key1 'another_key 'key1 'yet_another_key) '() '() '()))
+(let joinInnerUnique (MapJoinCore (ToFlow list1) dictOne 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('value2 'b.value2) '() '()))
+(let joinLeftUnique (MapJoinCore (ToFlow list1) dictOne 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
+(let joinInner (MapJoinCore (ToFlow list1) dictMany 'Inner '('key1) '('key2) '('key1 'a.key1 'value1 'a.value1) '('key2 'b.key2) '() '()))
+(let joinLeft (MapJoinCore (ToFlow list1) dictMany 'Left '('key1) '('key2) '('key1 'a.key1) '('key2 'b.key2 'value2 'b.value2) '() '()))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Collect joinLeftSemi) '('('type))))
diff --git a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yql b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yql
index 2398fb52f4a..dbd0d1712d9 100644
--- a/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yql
@@ -21,12 +21,12 @@
 
 (let dictOne (ToDict list2 keyExtractor payloadExtractor '('Hashed 'One 'Compact)))
 (let dictMany (ToDict list2 keyExtractor payloadExtractor '('Hashed 'Many 'Compact)))
-(let joinLeftSemi (MapJoinCore (ToFlow list1) dictOne 'LeftSemi '('0) '('0) '('0 '0 '1 '1) '()))
-(let joinLeftOnly (MapJoinCore (ToFlow list1) dictOne 'LeftOnly '('0) '('0) '('0 '0 '0 '1 '0 '2) '()))
-(let joinInnerUnique (MapJoinCore (ToFlow list1) dictOne 'Inner '('0) '('0) '('0 '2 '1 '1) '('1 '0)))
-(let joinLeftUnique (MapJoinCore (ToFlow list1) dictOne 'Left '('0) '('0) '('0 '0) '('0 '1 '1 '2)))
-(let joinInner (MapJoinCore (ToFlow list1) dictMany 'Inner '('0) '('0) '('0 '0 '1 '1) '('0 '2)))
-(let joinLeft (MapJoinCore (ToFlow list1) dictMany 'Left '('0) '('0) '('0 '2) '('0 '1 '1 '0)))
+(let joinLeftSemi (MapJoinCore (ToFlow list1) dictOne 'LeftSemi '('0) '('0) '('0 '0 '1 '1) '() '() '()))
+(let joinLeftOnly (MapJoinCore (ToFlow list1) dictOne 'LeftOnly '('0) '('0) '('0 '0 '0 '1 '0 '2) '() '() '()))
+(let joinInnerUnique (MapJoinCore (ToFlow list1) dictOne 'Inner '('0) '('0) '('0 '2 '1 '1) '('1 '0) '() '()))
+(let joinLeftUnique (MapJoinCore (ToFlow list1) dictOne 'Left '('0) '('0) '('0 '0) '('0 '1 '1 '2) '() '()))
+(let joinInner (MapJoinCore (ToFlow list1) dictMany 'Inner '('0) '('0) '('0 '0 '1 '1) '('0 '2) '() '()))
+(let joinLeft (MapJoinCore (ToFlow list1) dictMany 'Left '('0) '('0) '('0 '2) '('0 '1 '1 '0) '() '()))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Collect joinLeftSemi) '('('type))))
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part0/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part0/canondata/result.json
index def8d56d042..1d46ba33d6d 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part0/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part0/canondata/result.json
@@ -1124,9 +1124,9 @@
     ],
     "test.test[EquiJoinAny-MapAllAny-Debug]": [
         {
-            "checksum": "3e336855b745e76c1fff5db0f2384b9d",
-            "size": 16461,
-            "uri": "https://{canondata_backend}/1942525/2625516bd6b4d87e6907d69736714a878bb99eda/resource.tar.gz#test.test_EquiJoinAny-MapAllAny-Debug_/opt.yql"
+            "checksum": "c8fc2813f3c2691ac7af2a2f84ba6efd",
+            "size": 16542,
+            "uri": "https://{canondata_backend}/1936842/f3b677604f179d705646371349e02fb68d0fcbdc/resource.tar.gz#test.test_EquiJoinAny-MapAllAny-Debug_/opt.yql"
         },
         {
             "checksum": "cc642a4c9bb547af7576be99222b9a6c",
@@ -1496,9 +1496,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapOpt1Key2-Debug]": [
         {
-            "checksum": "15d06561217eef9ed61e75fea8b54f75",
-            "size": 12131,
-            "uri": "https://{canondata_backend}/1942525/2625516bd6b4d87e6907d69736714a878bb99eda/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt1Key2-Debug_/opt.yql"
+            "checksum": "6ac22da2f11b8aebddbf38756270725a",
+            "size": 12260,
+            "uri": "https://{canondata_backend}/1936842/f3b677604f179d705646371349e02fb68d0fcbdc/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt1Key2-Debug_/opt.yql"
         },
         {
             "checksum": "23adb645dca07b689d9cb40adc75b885",
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part1/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part1/canondata/result.json
index 01fc0575e2c..78928de3601 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part1/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part1/canondata/result.json
@@ -1444,9 +1444,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapOpt2Key2-Debug]": [
         {
-            "checksum": "8f48c716970314b675cfdc4ef96f2ab7",
-            "size": 11441,
-            "uri": "https://{canondata_backend}/1925821/d77dfb0724f257da04acc048da686ded70b7674d/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt2Key2-Debug_/opt.yql"
+            "checksum": "d39dfc60939fd6af2ac2ad0ad13c498c",
+            "size": 11570,
+            "uri": "https://{canondata_backend}/1871002/acb4ef8d6ffa99cd4630cb9d0d72f63bbfd2749d/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt2Key2-Debug_/opt.yql"
         },
         {
             "checksum": "f8276d6bca57d02de485b933b276bca1",
@@ -3060,9 +3060,9 @@
     ],
     "test.test[Join-MapJoinCore_Flow-Debug]": [
         {
-            "checksum": "981099c5a1398d3e3fe2380069257815",
-            "size": 1865,
-            "uri": "https://{canondata_backend}/1925821/d77dfb0724f257da04acc048da686ded70b7674d/resource.tar.gz#test.test_Join-MapJoinCore_Flow-Debug_/opt.yql"
+            "checksum": "bb8716ed4d474a241e5fec0622f2d12b",
+            "size": 1913,
+            "uri": "https://{canondata_backend}/1871002/acb4ef8d6ffa99cd4630cb9d0d72f63bbfd2749d/resource.tar.gz#test.test_Join-MapJoinCore_Flow-Debug_/opt.yql"
         }
     ],
     "test.test[Join-MapJoinCore_Flow-Plan]": [
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part2/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part2/canondata/result.json
index eab9b72ea2f..207c780fca6 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part2/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part2/canondata/result.json
@@ -969,9 +969,9 @@
     ],
     "test.test[EquiJoin-EquiJoinConvertMapI8U8-Debug]": [
         {
-            "checksum": "b1d084d7d7753d7346abb75224fce171",
-            "size": 52886,
-            "uri": "https://{canondata_backend}/1784117/329ac28d12d307d2cf29fc397e08cb08d9401dee/resource.tar.gz#test.test_EquiJoin-EquiJoinConvertMapI8U8-Debug_/opt.yql"
+            "checksum": "d87c1a23542fc29a1977933752acc149",
+            "size": 53157,
+            "uri": "https://{canondata_backend}/1923547/a0cc9646b39377ed13e6bfcf3d7a99167b242f62/resource.tar.gz#test.test_EquiJoin-EquiJoinConvertMapI8U8-Debug_/opt.yql"
         },
         {
             "checksum": "de438775b4de1b6e9e8e2a94418df106",
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part3/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part3/canondata/result.json
index 8d7370fe601..c9081504217 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part3/canondata/result.json
@@ -2579,9 +2579,9 @@
     ],
     "test.test[EquiJoinMap-JoinMap-Debug]": [
         {
-            "checksum": "d4c24d241eb73bd0fc03e2d82087b468",
-            "size": 11370,
-            "uri": "https://{canondata_backend}/1942525/56ab242c36f63ffdebf5ab3621cf76b5a6e1582b/resource.tar.gz#test.test_EquiJoinMap-JoinMap-Debug_/opt.yql"
+            "checksum": "0fefead00e9d335d13de27c04157f8cd",
+            "size": 11475,
+            "uri": "https://{canondata_backend}/1936997/279baa2948c0f30fec80612cc1c5990e9db63d77/resource.tar.gz#test.test_EquiJoinMap-JoinMap-Debug_/opt.yql"
         },
         {
             "checksum": "2d03e58540254763262f2e979bc02598",
@@ -2700,9 +2700,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapOpt1-Debug]": [
         {
-            "checksum": "2e5b0d0714819d2dd282cd2cbc1b186f",
-            "size": 11789,
-            "uri": "https://{canondata_backend}/1942525/56ab242c36f63ffdebf5ab3621cf76b5a6e1582b/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt1-Debug_/opt.yql"
+            "checksum": "dbb154dfd9d7a2658e8483e3849cc283",
+            "size": 11894,
+            "uri": "https://{canondata_backend}/1936997/279baa2948c0f30fec80612cc1c5990e9db63d77/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt1-Debug_/opt.yql"
         },
         {
             "checksum": "2d03e58540254763262f2e979bc02598",
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json
index 6895eddd3ce..e9bf0c4546b 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json
@@ -1035,9 +1035,9 @@
     ],
     "test.test[EquiJoin-EquiJoinConvertMapI8U32-Debug]": [
         {
-            "checksum": "4fa66375333a1f35aac4b52533a69e8d",
-            "size": 18332,
-            "uri": "https://{canondata_backend}/212715/995f69379fcdd3b61fbbb822de048b2ffe81c81f/resource.tar.gz#test.test_EquiJoin-EquiJoinConvertMapI8U32-Debug_/opt.yql"
+            "checksum": "07df0647cd2720568de2acd1c2f5ac23",
+            "size": 18434,
+            "uri": "https://{canondata_backend}/1880306/3923e1a600f93542b414a543bc91520fbd3a2554/resource.tar.gz#test.test_EquiJoin-EquiJoinConvertMapI8U32-Debug_/opt.yql"
         },
         {
             "checksum": "b3ad6c26babf882b76373f6084dbf37c",
@@ -2055,9 +2055,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapOpt12-Debug]": [
         {
-            "checksum": "f6a7e48b4f5de06461c055d5a4e035a0",
-            "size": 11315,
-            "uri": "https://{canondata_backend}/212715/995f69379fcdd3b61fbbb822de048b2ffe81c81f/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt12-Debug_/opt.yql"
+            "checksum": "6ac5b3e60d94579d9c613d598d6f7144",
+            "size": 11419,
+            "uri": "https://{canondata_backend}/1880306/3923e1a600f93542b414a543bc91520fbd3a2554/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt12-Debug_/opt.yql"
         },
         {
             "checksum": "b74c80ac0ad5d13bd4367a827b9cb52e",
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part5/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part5/canondata/result.json
index 70e5f517267..26116420c5f 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part5/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part5/canondata/result.json
@@ -787,9 +787,9 @@
     ],
     "test.test[EquiJoin-Bug2566-Debug]": [
         {
-            "checksum": "e56c1a6435d395e0dbde68ff799488f1",
-            "size": 3712,
-            "uri": "https://{canondata_backend}/1880306/2b4f005974b24222919b5e116add03374f16e485/resource.tar.gz#test.test_EquiJoin-Bug2566-Debug_/opt.yql"
+            "checksum": "ed3656738efcf66be28999ee493c455e",
+            "size": 3742,
+            "uri": "https://{canondata_backend}/1942173/8a8be16d50e4fa0ff291510f24607fdd47796490/resource.tar.gz#test.test_EquiJoin-Bug2566-Debug_/opt.yql"
         },
         {
             "checksum": "633c5e7d2f9bcdd1b37e8bd6a4c9dfa0",
@@ -2247,9 +2247,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapOpt12Key2-Debug]": [
         {
-            "checksum": "f798ac0ea66d51971b4aee241d677d34",
-            "size": 11423,
-            "uri": "https://{canondata_backend}/1880306/2b4f005974b24222919b5e116add03374f16e485/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt12Key2-Debug_/opt.yql"
+            "checksum": "1b767f645259bc81e5937bf6a56299b9",
+            "size": 11551,
+            "uri": "https://{canondata_backend}/1942173/8a8be16d50e4fa0ff291510f24607fdd47796490/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt12Key2-Debug_/opt.yql"
         },
         {
             "checksum": "f8276d6bca57d02de485b933b276bca1",
@@ -2368,9 +2368,9 @@
     ],
     "test.test[EquiJoinMap-bug3054-Debug]": [
         {
-            "checksum": "db5d94e3ef2214eb89460a44fe3046ed",
-            "size": 3069,
-            "uri": "https://{canondata_backend}/1880306/2b4f005974b24222919b5e116add03374f16e485/resource.tar.gz#test.test_EquiJoinMap-bug3054-Debug_/opt.yql"
+            "checksum": "2741445b1ea03be033c3d218fe6c650b",
+            "size": 3131,
+            "uri": "https://{canondata_backend}/1942173/8a8be16d50e4fa0ff291510f24607fdd47796490/resource.tar.gz#test.test_EquiJoinMap-bug3054-Debug_/opt.yql"
         },
         {
             "checksum": "c8561fd25062f8bc1f51ae454d9d4d40",
@@ -3491,9 +3491,9 @@
     ],
     "test.test[Join-MapJoinCore-Debug]": [
         {
-            "checksum": "be163fc2b4acd9a3f9e755b2ae83b78f",
-            "size": 2130,
-            "uri": "https://{canondata_backend}/1880306/2b4f005974b24222919b5e116add03374f16e485/resource.tar.gz#test.test_Join-MapJoinCore-Debug_/opt.yql"
+            "checksum": "c9f354e8e0bc1744184a1502c0982f4b",
+            "size": 2178,
+            "uri": "https://{canondata_backend}/1942173/8a8be16d50e4fa0ff291510f24607fdd47796490/resource.tar.gz#test.test_Join-MapJoinCore-Debug_/opt.yql"
         }
     ],
     "test.test[Join-MapJoinCore-Plan]": [
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part6/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part6/canondata/result.json
index 3d8cfaa88d3..3a0b41a87cb 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part6/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part6/canondata/result.json
@@ -1829,9 +1829,9 @@
     ],
     "test.test[EquiJoin-HintLeftUniqueRightMap-Debug]": [
         {
-            "checksum": "f656cc1c70d0a3c5715dcede0bf613dc",
-            "size": 3684,
-            "uri": "https://{canondata_backend}/1925842/6cda52b754dfbf22f4689dab1717eebd26ae88d6/resource.tar.gz#test.test_EquiJoin-HintLeftUniqueRightMap-Debug_/opt.yql"
+            "checksum": "f37c32620628bc39b143b373559b4dec",
+            "size": 3706,
+            "uri": "https://{canondata_backend}/1936947/86eb63797b7147bcdbee91829fe8d39a33d28f25/resource.tar.gz#test.test_EquiJoin-HintLeftUniqueRightMap-Debug_/opt.yql"
         },
         {
             "checksum": "a95bc48c26607bf8d91d4b24d31e8329",
@@ -1880,9 +1880,9 @@
     ],
     "test.test[EquiJoin-HintRightUniqueInnerMap-Debug]": [
         {
-            "checksum": "d0bfec608a5d22ad63bb3dc1a122410d",
-            "size": 3683,
-            "uri": "https://{canondata_backend}/1925842/6cda52b754dfbf22f4689dab1717eebd26ae88d6/resource.tar.gz#test.test_EquiJoin-HintRightUniqueInnerMap-Debug_/opt.yql"
+            "checksum": "955e91056fb266a34a13e81944dbcb38",
+            "size": 3705,
+            "uri": "https://{canondata_backend}/1936947/86eb63797b7147bcdbee91829fe8d39a33d28f25/resource.tar.gz#test.test_EquiJoin-HintRightUniqueInnerMap-Debug_/opt.yql"
         },
         {
             "checksum": "a95bc48c26607bf8d91d4b24d31e8329",
@@ -1931,9 +1931,9 @@
     ],
     "test.test[EquiJoin-HintRightUniqueLeftMap-Debug]": [
         {
-            "checksum": "3c0b890c0cf1b2ff872dfe3a2849b463",
-            "size": 3682,
-            "uri": "https://{canondata_backend}/1925842/6cda52b754dfbf22f4689dab1717eebd26ae88d6/resource.tar.gz#test.test_EquiJoin-HintRightUniqueLeftMap-Debug_/opt.yql"
+            "checksum": "8f84ed9ff347b312b7bfe34b90fb266c",
+            "size": 3704,
+            "uri": "https://{canondata_backend}/1936947/86eb63797b7147bcdbee91829fe8d39a33d28f25/resource.tar.gz#test.test_EquiJoin-HintRightUniqueLeftMap-Debug_/opt.yql"
         },
         {
             "checksum": "a95bc48c26607bf8d91d4b24d31e8329",
@@ -2470,9 +2470,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapKey2-Debug]": [
         {
-            "checksum": "05935b86d737d8915bb32047d27db597",
-            "size": 11580,
-            "uri": "https://{canondata_backend}/1925842/6cda52b754dfbf22f4689dab1717eebd26ae88d6/resource.tar.gz#test.test_EquiJoinMap-JoinMapKey2-Debug_/opt.yql"
+            "checksum": "652ebe593747b8780fca4947634bfff3",
+            "size": 11709,
+            "uri": "https://{canondata_backend}/1936947/86eb63797b7147bcdbee91829fe8d39a33d28f25/resource.tar.gz#test.test_EquiJoinMap-JoinMapKey2-Debug_/opt.yql"
         },
         {
             "checksum": "23adb645dca07b689d9cb40adc75b885",
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json
index 802d570240f..71e87d4979d 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json
@@ -2841,9 +2841,9 @@
     ],
     "test.test[Join-MapJoinCoreOnStrings-Debug]": [
         {
-            "checksum": "a56222ed992e716d7da0b6c70d8b88e7",
-            "size": 2258,
-            "uri": "https://{canondata_backend}/937458/0247422c71a54b963096179ffcfee626d399f24c/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings-Debug_/opt.yql"
+            "checksum": "d5b6f06a3dd0a70d4fd4be5529a11c10",
+            "size": 2306,
+            "uri": "https://{canondata_backend}/1871002/837fd883f7bd2133a5fdd26c0cb86acbe6da6a0a/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings-Debug_/opt.yql"
         }
     ],
     "test.test[Join-MapJoinCoreOnStrings-Plan]": [
@@ -2862,9 +2862,9 @@
     ],
     "test.test[Join-MapJoinCoreOnStrings_Flow-Debug]": [
         {
-            "checksum": "4611394783bbcb085fcca9a98ef7db66",
-            "size": 1995,
-            "uri": "https://{canondata_backend}/937458/0247422c71a54b963096179ffcfee626d399f24c/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings_Flow-Debug_/opt.yql"
+            "checksum": "8f678680ddf6e347fe6c7ddcbb8c980b",
+            "size": 2043,
+            "uri": "https://{canondata_backend}/1871002/837fd883f7bd2133a5fdd26c0cb86acbe6da6a0a/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings_Flow-Debug_/opt.yql"
         }
     ],
     "test.test[Join-MapJoinCoreOnStrings_Flow-Plan]": [
@@ -2883,9 +2883,9 @@
     ],
     "test.test[Join-MapJoinCore_FlowOfTuples-Debug]": [
         {
-            "checksum": "fa0cf8d3511d8f697cff262a5fb78426",
-            "size": 1456,
-            "uri": "https://{canondata_backend}/937458/0247422c71a54b963096179ffcfee626d399f24c/resource.tar.gz#test.test_Join-MapJoinCore_FlowOfTuples-Debug_/opt.yql"
+            "checksum": "959f1f81244494590d1d1b9d39397a76",
+            "size": 1504,
+            "uri": "https://{canondata_backend}/1871002/837fd883f7bd2133a5fdd26c0cb86acbe6da6a0a/resource.tar.gz#test.test_Join-MapJoinCore_FlowOfTuples-Debug_/opt.yql"
         }
     ],
     "test.test[Join-MapJoinCore_FlowOfTuples-Plan]": [
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part8/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part8/canondata/result.json
index e1d69fe2d24..a5826ae7306 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part8/canondata/result.json
@@ -866,9 +866,9 @@
     ],
     "test.test[EquiJoin-HintRightUniqueLeftSemiShardedMap-Debug]": [
         {
-            "checksum": "de9ec11eb66d887beef2c2e888357394",
-            "size": 4616,
-            "uri": "https://{canondata_backend}/1784117/baace651ee706ace7f8ee7f7567cf33040313ab5/resource.tar.gz#test.test_EquiJoin-HintRightUniqueLeftSemiShardedMap-Debug_/opt.yql"
+            "checksum": "66c0d4be2be8ecd8354534930b96142c",
+            "size": 4674,
+            "uri": "https://{canondata_backend}/1600758/271a71b06aefe85a1455f9c61f657a0d598f6333/resource.tar.gz#test.test_EquiJoin-HintRightUniqueLeftSemiShardedMap-Debug_/opt.yql"
         },
         {
             "checksum": "ccc02c6a5a4970bb10f98a02fb46614f",
@@ -1419,9 +1419,9 @@
     ],
     "test.test[EquiJoinAny-MapAnyAll-Debug]": [
         {
-            "checksum": "11bc5d7d2b43ee3e71cd61dcb91b774f",
-            "size": 16505,
-            "uri": "https://{canondata_backend}/1784117/baace651ee706ace7f8ee7f7567cf33040313ab5/resource.tar.gz#test.test_EquiJoinAny-MapAnyAll-Debug_/opt.yql"
+            "checksum": "22fa6fd622679e63957d0921cc1d45e5",
+            "size": 16586,
+            "uri": "https://{canondata_backend}/1600758/271a71b06aefe85a1455f9c61f657a0d598f6333/resource.tar.gz#test.test_EquiJoinAny-MapAnyAll-Debug_/opt.yql"
         },
         {
             "checksum": "1f417d417653fa79b794e6e159152b7e",
@@ -1911,9 +1911,9 @@
     ],
     "test.test[EquiJoinMap-JoinMapOpt2-Debug]": [
         {
-            "checksum": "ef832238b3376c061a6d9bee384e8c10",
-            "size": 11248,
-            "uri": "https://{canondata_backend}/1784117/baace651ee706ace7f8ee7f7567cf33040313ab5/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt2-Debug_/opt.yql"
+            "checksum": "8388d086c4c42cba99829abe8b553210",
+            "size": 11353,
+            "uri": "https://{canondata_backend}/1600758/271a71b06aefe85a1455f9c61f657a0d598f6333/resource.tar.gz#test.test_EquiJoinMap-JoinMapOpt2-Debug_/opt.yql"
         },
         {
             "checksum": "b74c80ac0ad5d13bd4367a827b9cb52e",
@@ -3021,9 +3021,9 @@
     ],
     "test.test[Join-EmptyLeftJoin-Debug]": [
         {
-            "checksum": "a7f3c23b34156c770b6681831d1891d3",
-            "size": 517,
-            "uri": "https://{canondata_backend}/1784117/baace651ee706ace7f8ee7f7567cf33040313ab5/resource.tar.gz#test.test_Join-EmptyLeftJoin-Debug_/opt.yql"
+            "checksum": "311a2298a2af39e9706be39abf7b286e",
+            "size": 525,
+            "uri": "https://{canondata_backend}/1600758/271a71b06aefe85a1455f9c61f657a0d598f6333/resource.tar.gz#test.test_Join-EmptyLeftJoin-Debug_/opt.yql"
         }
     ],
     "test.test[Join-EmptyLeftJoin-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
index cedf84014e1..113904d504a 100644
--- a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
@@ -1014,9 +1014,9 @@
     ],
     "test.test[join-grace_join1-map-Debug]": [
         {
-            "checksum": "364edabe894457a73f9365d8004e0ca9",
-            "size": 3137,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-grace_join1-map-Debug_/opt.yql_patched"
+            "checksum": "a018259a357438a707d7886ec5eebd11",
+            "size": 3145,
+            "uri": "https://{canondata_backend}/1936947/f37a1b295bca7eb2be1a3d7ccbeec933b661fb3c/resource.tar.gz#test.test_join-grace_join1-map-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-grace_join1-map-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json
index 951af00e17c..43e502b503e 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-lookupjoin_bug7646_subst--Debug]": [
         {
-            "checksum": "2ed6996d0ca1c4e8b0fedfe72eb13524",
-            "size": 4932,
-            "uri": "https://{canondata_backend}/937458/86cd9556e848ee086e123481cd12ceae5d55267c/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst--Debug_/opt.yql_patched"
+            "checksum": "6e9a5f307aa9b96a8b3ad929f7dd890f",
+            "size": 5035,
+            "uri": "https://{canondata_backend}/1599023/74b23ff9b38db227646b30609d5489db53d0ee76/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug7646_subst--Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json
index e1ca9e6ee57..6360f1239b3 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-lookupjoin_with_cache--Debug]": [
         {
-            "checksum": "9e75e25a9d4acc6c45d0a2d7b44de5c9",
-            "size": 4066,
-            "uri": "https://{canondata_backend}/1871002/6bb22969fb3a802c4430aaadcadaa9b716ea406b/resource.tar.gz#test.test_join-lookupjoin_with_cache--Debug_/opt.yql_patched"
+            "checksum": "548a878163445437da7757ef7a60bd26",
+            "size": 4096,
+            "uri": "https://{canondata_backend}/1599023/f155d3919d1fe7155cafc3f2696e4f0f1a822600/resource.tar.gz#test.test_join-lookupjoin_with_cache--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_with_cache--Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json
index 2088d874357..63705f44fb9 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-mapjoin_with_anonymous--Debug]": [
         {
-            "checksum": "d7506459dac18f6b52e8c5d54c2ddd6f",
-            "size": 3151,
-            "uri": "https://{canondata_backend}/1942100/8fb0a7a6c71d8992f7b5d0fc7d2d03c809f0254b/resource.tar.gz#test.test_join-mapjoin_with_anonymous--Debug_/opt.yql_patched"
+            "checksum": "a61ce187aba53d78d40e1ab35afc624d",
+            "size": 3181,
+            "uri": "https://{canondata_backend}/1880306/78e8dc2de09e00e723c5ee882673373bf1f94680/resource.tar.gz#test.test_join-mapjoin_with_anonymous--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_with_anonymous--Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json
index 2bffe5f6b82..c7bc38a2c3a 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-mapjoin_opt_vs_2xopt--Debug]": [
         {
-            "checksum": "e15276ed2ed2f69efb1cade40aa54216",
-            "size": 4250,
-            "uri": "https://{canondata_backend}/1937367/5f1c05a434c7181753fab354e3806860905138af/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt--Debug_/opt.yql_patched"
+            "checksum": "b76569e40929132a856bfaaeb12c1c89",
+            "size": 4280,
+            "uri": "https://{canondata_backend}/1936947/9df851a3cc689f975db52aa6e783e8317bcdc97e/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_opt_vs_2xopt--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part1/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part1/canondata/result.json
index 8d0ea1c6a3f..76cc3140cfe 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part1/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part1/canondata/result.json
@@ -1151,9 +1151,9 @@
     ],
     "test.test[join-convert_key--Debug]": [
         {
-            "checksum": "27592bc0476bc2f153b9dd9a29d30ea2",
-            "size": 3533,
-            "uri": "https://{canondata_backend}/1880306/5943c0be93d87630d332e1bfbd7c544ecdabb04b/resource.tar.gz#test.test_join-convert_key--Debug_/opt.yql"
+            "checksum": "0c50ed83960efd97c01e380543336bd4",
+            "size": 3623,
+            "uri": "https://{canondata_backend}/1936947/c15a9c75f86a7e612cc7c0188d6b08ef1aa71358/resource.tar.gz#test.test_join-convert_key--Debug_/opt.yql"
         }
     ],
     "test.test[join-convert_key--Plan]": [
@@ -1217,9 +1217,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o2o--Debug]": [
         {
-            "checksum": "74e9e2f24d2b199816cb21ee2c23cadc",
-            "size": 2760,
-            "uri": "https://{canondata_backend}/1880306/5943c0be93d87630d332e1bfbd7c544ecdabb04b/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o--Debug_/opt.yql"
+            "checksum": "765be729624e3f7259c5b2b816880b9e",
+            "size": 2846,
+            "uri": "https://{canondata_backend}/1936947/c15a9c75f86a7e612cc7c0188d6b08ef1aa71358/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_inner_1o2o--Plan]": [
@@ -1252,9 +1252,9 @@
     ],
     "test.test[join-premap_map_semi--Debug]": [
         {
-            "checksum": "e6dc24ae6a648f0bfc43e25febb2840d",
-            "size": 3061,
-            "uri": "https://{canondata_backend}/1880306/5943c0be93d87630d332e1bfbd7c544ecdabb04b/resource.tar.gz#test.test_join-premap_map_semi--Debug_/opt.yql"
+            "checksum": "4f64895ae04d8f92b85e41c0b1b56a6e",
+            "size": 3089,
+            "uri": "https://{canondata_backend}/1936947/c15a9c75f86a7e612cc7c0188d6b08ef1aa71358/resource.tar.gz#test.test_join-premap_map_semi--Debug_/opt.yql"
         }
     ],
     "test.test[join-premap_map_semi--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
index ec138a3e58f..f904a2159e4 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
@@ -1195,9 +1195,9 @@
     ],
     "test.test[join-mapjoin_unused_keys--Debug]": [
         {
-            "checksum": "1dce180d91035f7989aacb02d5aa4297",
-            "size": 4383,
-            "uri": "https://{canondata_backend}/1924537/6033fa62c3628f7f8f85fe0b254eb896d2d9c2ce/resource.tar.gz#test.test_join-mapjoin_unused_keys--Debug_/opt.yql"
+            "checksum": "0ed619363690fcb1cda6760a7a02e698",
+            "size": 4443,
+            "uri": "https://{canondata_backend}/212715/a3959cc0b2516d527e2f4d2b5c8107ef5b2449ba/resource.tar.gz#test.test_join-mapjoin_unused_keys--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_unused_keys--Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-yql-16011--Debug]": [
         {
-            "checksum": "19c42961e91829c0acd712349c687f97",
-            "size": 6260,
-            "uri": "https://{canondata_backend}/1942525/49af3c94c6efd825d1eb806386392743839350de/resource.tar.gz#test.test_join-yql-16011--Debug_/opt.yql"
+            "checksum": "33c7448aa596fc0a6a20340400e77fcb",
+            "size": 6368,
+            "uri": "https://{canondata_backend}/212715/a3959cc0b2516d527e2f4d2b5c8107ef5b2449ba/resource.tar.gz#test.test_join-yql-16011--Debug_/opt.yql"
         }
     ],
     "test.test[join-yql-16011--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
index 5ccfc18efee..caa03783b44 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
@@ -1121,9 +1121,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_star--Debug]": [
         {
-            "checksum": "d6e6feb892dcf57a249150d0f581a7dd",
-            "size": 3259,
-            "uri": "https://{canondata_backend}/1937027/642fd2ff53bdb0fed32ca89598d70c9c5848ac20/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star--Debug_/opt.yql"
+            "checksum": "e48d16ba886490b03eb6ac33071b61f8",
+            "size": 3304,
+            "uri": "https://{canondata_backend}/1942415/9b9ffb6888f759fc490f2658e2da958acd522b7f/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_star--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
index d0c90e368a0..b826c238ab6 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
@@ -1316,9 +1316,9 @@
     ],
     "test.test[join-lookupjoin_inner--Debug]": [
         {
-            "checksum": "6126ca0f7bc87752edeb5079d68e7874",
-            "size": 2679,
-            "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-lookupjoin_inner--Debug_/opt.yql"
+            "checksum": "651c42adfb42d784912eebcc9d91f13e",
+            "size": 2765,
+            "uri": "https://{canondata_backend}/1942415/c965479a0fb62798a85005e8d4034aefa295aa24/resource.tar.gz#test.test_join-lookupjoin_inner--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_inner--Plan]": [
@@ -1337,9 +1337,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o2o--Debug]": [
         {
-            "checksum": "fce7c9508eee239911d0de45b9c1609b",
-            "size": 2734,
-            "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o--Debug_/opt.yql"
+            "checksum": "bf79dc20366850098d33d994104c4b4e",
+            "size": 2762,
+            "uri": "https://{canondata_backend}/1942415/c965479a0fb62798a85005e8d4034aefa295aa24/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_semi_1o2o--Plan]": [
@@ -1358,9 +1358,9 @@
     ],
     "test.test[join-lookupjoin_with_cache--Debug]": [
         {
-            "checksum": "97b9b53793dd29196c7e97c71b602f4b",
-            "size": 3980,
-            "uri": "https://{canondata_backend}/1777230/71c6479f8613e2c300e7fdbc85b0b12269149d01/resource.tar.gz#test.test_join-lookupjoin_with_cache--Debug_/opt.yql"
+            "checksum": "631f1a9a43fbe6ab16f2474da585e217",
+            "size": 4010,
+            "uri": "https://{canondata_backend}/1942415/c965479a0fb62798a85005e8d4034aefa295aa24/resource.tar.gz#test.test_join-lookupjoin_with_cache--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_with_cache--Plan]": [
@@ -1379,9 +1379,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_sequence--Debug]": [
         {
-            "checksum": "8de013ae532bf9151a5307feed346a37",
-            "size": 4679,
-            "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence--Debug_/opt.yql"
+            "checksum": "eac6f70fb4b66bdf327319c9876e62d7",
+            "size": 4756,
+            "uri": "https://{canondata_backend}/1942415/c965479a0fb62798a85005e8d4034aefa295aa24/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_sequence--Plan]": [
@@ -2596,9 +2596,9 @@
     ],
     "test.test[sampling-mapjoin_left_sample-default.txt-Debug]": [
         {
-            "checksum": "e8d25bff3c97ae684d7e0b0117104772",
-            "size": 2432,
-            "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_sampling-mapjoin_left_sample-default.txt-Debug_/opt.yql"
+            "checksum": "0befd403348e30de9220d6f9ab4511b8",
+            "size": 2462,
+            "uri": "https://{canondata_backend}/1942415/c965479a0fb62798a85005e8d4034aefa295aa24/resource.tar.gz#test.test_sampling-mapjoin_left_sample-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[sampling-mapjoin_left_sample-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
index 4776678a62d..38494063ca0 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
@@ -1182,9 +1182,9 @@
     ],
     "test.test[join-mapjoin_opt_vs_2xopt--Debug]": [
         {
-            "checksum": "f8c391093e42253d49794b743c644974",
-            "size": 4151,
-            "uri": "https://{canondata_backend}/937458/a0841dd3e01c3743dba748525fef5097880607dc/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt--Debug_/opt.yql"
+            "checksum": "2f2e13ed10fbeec8909077ce44ceef5b",
+            "size": 4181,
+            "uri": "https://{canondata_backend}/1871002/234378e478fdd486d52ee04e386f8aad4e94ea30/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_opt_vs_2xopt--Plan]": [
@@ -2285,9 +2285,9 @@
     ],
     "test.test[sampling-subquery_mapjoin-default.txt-Debug]": [
         {
-            "checksum": "26d750d8f1c50a376072539d94fc20ba",
-            "size": 2481,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_sampling-subquery_mapjoin-default.txt-Debug_/opt.yql"
+            "checksum": "7e226acab70066f4d46c8e596a3e2dad",
+            "size": 2511,
+            "uri": "https://{canondata_backend}/1871002/234378e478fdd486d52ee04e386f8aad4e94ea30/resource.tar.gz#test.test_sampling-subquery_mapjoin-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[sampling-subquery_mapjoin-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
index ae0257a32b7..b27ed539ce6 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
@@ -1393,9 +1393,9 @@
     ],
     "test.test[join-mapjoin_with_anonymous--Debug]": [
         {
-            "checksum": "d30cae32f8e915f94d597f1815cd5d77",
-            "size": 3067,
-            "uri": "https://{canondata_backend}/1903885/d48e78489ae557f8510451b183c5b7207f7bc38a/resource.tar.gz#test.test_join-mapjoin_with_anonymous--Debug_/opt.yql"
+            "checksum": "007d5b7e10b877687d4068e531b21156",
+            "size": 3097,
+            "uri": "https://{canondata_backend}/1942100/5fb7c2a708d11a3fabbac19cbd4432d5777e7a5f/resource.tar.gz#test.test_join-mapjoin_with_anonymous--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_with_anonymous--Plan]": [
@@ -2480,9 +2480,9 @@
     ],
     "test.test[sampling-mapjoin_right_sample-default.txt-Debug]": [
         {
-            "checksum": "7bb4043f46133bad675c58a49853b2f7",
-            "size": 2432,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_sampling-mapjoin_right_sample-default.txt-Debug_/opt.yql"
+            "checksum": "16a03a4ae5e67af3b0043fefbfef412d",
+            "size": 2462,
+            "uri": "https://{canondata_backend}/1942100/5fb7c2a708d11a3fabbac19cbd4432d5777e7a5f/resource.tar.gz#test.test_sampling-mapjoin_right_sample-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[sampling-mapjoin_right_sample-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json
index c2d0aa90500..9baabb63d32 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json
@@ -1169,9 +1169,9 @@
     ],
     "test.test[join-lookupjoin_semi--Debug]": [
         {
-            "checksum": "83627adab1bf041fb3f13893fc5da1c2",
-            "size": 2686,
-            "uri": "https://{canondata_backend}/1923547/61458c9c64b8429a1ff4c80acb29f295ac160173/resource.tar.gz#test.test_join-lookupjoin_semi--Debug_/opt.yql"
+            "checksum": "c890a827184d57c6f8751baf10305cd4",
+            "size": 2714,
+            "uri": "https://{canondata_backend}/1942173/473832042f0e729474d169aec9e09b8b3d2baf78/resource.tar.gz#test.test_join-lookupjoin_semi--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_semi--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
index 8d6dc9206cb..2d8527fea64 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
@@ -970,9 +970,9 @@
     ],
     "test.test[join-join_comp_map_table--Debug]": [
         {
-            "checksum": "686f41aa5e5d7dcac8f4441e4e24bbfa",
-            "size": 7747,
-            "uri": "https://{canondata_backend}/1924537/d66bfe69aa802f6a81aadbac897621b721f31b4b/resource.tar.gz#test.test_join-join_comp_map_table--Debug_/opt.yql"
+            "checksum": "76ee8f42ea802a087bb5e40c00595072",
+            "size": 7853,
+            "uri": "https://{canondata_backend}/1936947/7a6a8cc892365cd704a9cb898353d0fd7f57edf6/resource.tar.gz#test.test_join-join_comp_map_table--Debug_/opt.yql"
         }
     ],
     "test.test[join-join_comp_map_table--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json
index 8b70191bc2b..f1a1b8a315d 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json
@@ -987,9 +987,9 @@
     ],
     "test.test[in-yql-14677-default.txt-Debug]": [
         {
-            "checksum": "ce09ebeff7ee7a89c91197677669b441",
-            "size": 1791,
-            "uri": "https://{canondata_backend}/1923547/68f2fa8e051f31489bd496c183d28c4abddf9f68/resource.tar.gz#test.test_in-yql-14677-default.txt-Debug_/opt.yql"
+            "checksum": "2aa2c53f6e57da49f2705a5f810861eb",
+            "size": 1845,
+            "uri": "https://{canondata_backend}/1880306/2554a138cfb649d459281fa9b3e723e10b9afc53/resource.tar.gz#test.test_in-yql-14677-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[in-yql-14677-default.txt-Plan]": [
@@ -1060,9 +1060,9 @@
     ],
     "test.test[join-mapjoin_partial_uniq_keys--Debug]": [
         {
-            "checksum": "e3ea7295e3094a88421bc83d7cc9f59e",
-            "size": 2113,
-            "uri": "https://{canondata_backend}/1923547/68f2fa8e051f31489bd496c183d28c4abddf9f68/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys--Debug_/opt.yql"
+            "checksum": "4630307b4061a03ba6bda0758fc25d35",
+            "size": 2143,
+            "uri": "https://{canondata_backend}/1936947/38c164e72ca0c18d59a3c39d246444512465dd95/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_partial_uniq_keys--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part18/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part18/canondata/result.json
index 67cea870414..ae17c80c1dc 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part18/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part18/canondata/result.json
@@ -1001,9 +1001,9 @@
     ],
     "test.test[join-lookupjoin_semi_2o--Debug]": [
         {
-            "checksum": "64f200e4e8720ee054f9aeb2ba5b4f4c",
-            "size": 2904,
-            "uri": "https://{canondata_backend}/1937027/67f47e98bc150e7387e3e30adedc957caafe9c32/resource.tar.gz#test.test_join-lookupjoin_semi_2o--Debug_/opt.yql"
+            "checksum": "69d494929026763cd1b8abe8f161312f",
+            "size": 2932,
+            "uri": "https://{canondata_backend}/1773845/222710319af77df66a1ed7393fa40d1186e569f2/resource.tar.gz#test.test_join-lookupjoin_semi_2o--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_semi_2o--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
index d1241faa4e2..495ccdb29c3 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
@@ -1255,9 +1255,9 @@
     ],
     "test.test[join-lookupjoin_bug8533--Debug]": [
         {
-            "checksum": "5a22252f40278687c7d7ac93f5554bb3",
-            "size": 2739,
-            "uri": "https://{canondata_backend}/1937027/16b7289b1b8f5fdff728155d836fa2b238949b2d/resource.tar.gz#test.test_join-lookupjoin_bug8533--Debug_/opt.yql"
+            "checksum": "01c4f48336b48c07292d2171a04a03be",
+            "size": 2767,
+            "uri": "https://{canondata_backend}/1871002/c0c085c0587d4534761e3b4de67903bb31e5d198/resource.tar.gz#test.test_join-lookupjoin_bug8533--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_bug8533--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part2/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part2/canondata/result.json
index cc2215e43da..c5fac6d6013 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part2/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part2/canondata/result.json
@@ -1249,9 +1249,9 @@
     ],
     "test.test[join-lookupjoin_semi_subq--Debug]": [
         {
-            "checksum": "061ed54e879344d7ef7ae518e53e7c19",
-            "size": 2587,
-            "uri": "https://{canondata_backend}/1903885/9f3cc059d0dff973193fe9dfe5618178bac27a80/resource.tar.gz#test.test_join-lookupjoin_semi_subq--Debug_/opt.yql"
+            "checksum": "4b9bdc9bd4b0f8e70dc8e4f858b96af8",
+            "size": 2615,
+            "uri": "https://{canondata_backend}/1936947/9708b2866b764419fc50340a1652f66c666a5251/resource.tar.gz#test.test_join-lookupjoin_semi_subq--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_semi_subq--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
index 045836cf04e..9441dd780a2 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
@@ -989,9 +989,9 @@
     ],
     "test.test[join-lookupjoin_inner_2o--Debug]": [
         {
-            "checksum": "5e9f35e9fc3161651a5479319bd3ad95",
-            "size": 3019,
-            "uri": "https://{canondata_backend}/1936842/fab2fef3f906a5afbc02b8ac3c5121b8eb14dff2/resource.tar.gz#test.test_join-lookupjoin_inner_2o--Debug_/opt.yql"
+            "checksum": "ccdbf0f9295d69eec4bb3ef9a284b1b9",
+            "size": 3105,
+            "uri": "https://{canondata_backend}/937458/a6148e419f1dbfe8aa6ba034c871a70aa3721edf/resource.tar.gz#test.test_join-lookupjoin_inner_2o--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_inner_2o--Plan]": [
@@ -1010,9 +1010,9 @@
     ],
     "test.test[join-lookupjoin_unused_keys--Debug]": [
         {
-            "checksum": "0659a1353f7830f19e78a7243d47486b",
-            "size": 5042,
-            "uri": "https://{canondata_backend}/1936842/fab2fef3f906a5afbc02b8ac3c5121b8eb14dff2/resource.tar.gz#test.test_join-lookupjoin_unused_keys--Debug_/opt.yql"
+            "checksum": "5400621a83b67f228d86ff5fdd027f43",
+            "size": 5102,
+            "uri": "https://{canondata_backend}/937458/a6148e419f1dbfe8aa6ba034c871a70aa3721edf/resource.tar.gz#test.test_join-lookupjoin_unused_keys--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_unused_keys--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
index cf5e896494c..73fa5c85a16 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
@@ -949,9 +949,9 @@
     ],
     "test.test[join-mapjoin_dup_key--Debug]": [
         {
-            "checksum": "56b68742c193bbfac9c78e138f8e01be",
-            "size": 2342,
-            "uri": "https://{canondata_backend}/1903885/357a4fea0449e98db159f5a087a2bdeb6fb084ab/resource.tar.gz#test.test_join-mapjoin_dup_key--Debug_/opt.yql"
+            "checksum": "99e428fed9c7ca49c91fc852b52a7244",
+            "size": 2435,
+            "uri": "https://{canondata_backend}/1937027/3190d2f517ce1b8b71b3fae5159fb120dc137870/resource.tar.gz#test.test_join-mapjoin_dup_key--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_dup_key--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
index 6cd5800c899..fa542241f81 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
@@ -1516,9 +1516,9 @@
     ],
     "test.test[join-lookupjoin_bug7646_subst--Debug]": [
         {
-            "checksum": "4da7f3a81100af019259fac96dbc91c9",
-            "size": 4832,
-            "uri": "https://{canondata_backend}/1781765/88dafcc0f761fc5e7e73d30a3b936de0aeb25217/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst--Debug_/opt.yql"
+            "checksum": "8de04d6f37f05f75509540ecc967d540",
+            "size": 4935,
+            "uri": "https://{canondata_backend}/1871182/efbac85f28fb0c517a9ce029a8a8b0beeda5b633/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_bug7646_subst--Plan]": [
@@ -1537,9 +1537,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite--Debug]": [
         {
-            "checksum": "920d09852bfb8ff3a5746e7b84a2dde5",
-            "size": 3176,
-            "uri": "https://{canondata_backend}/1924537/a1724f09c61ca2d7b118f636b56ba6ad473f8d09/resource.tar.gz#test.test_join-mapjoin_early_rewrite--Debug_/opt.yql"
+            "checksum": "ee425b8f871ce14f046b7cc1c37a6648",
+            "size": 3221,
+            "uri": "https://{canondata_backend}/1871182/efbac85f28fb0c517a9ce029a8a8b0beeda5b633/resource.tar.gz#test.test_join-mapjoin_early_rewrite--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_early_rewrite--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json
index 4ba9dea363b..8a7d0be8967 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json
@@ -1351,9 +1351,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o--Debug]": [
         {
-            "checksum": "c536b12b798d9e9b1a4fce43b40a61df",
-            "size": 3195,
-            "uri": "https://{canondata_backend}/1936842/f78569e172299b7a2aee3d6ade84c2cc02cc5940/resource.tar.gz#test.test_join-lookupjoin_inner_1o--Debug_/opt.yql"
+            "checksum": "842e1e44493a6ab7bdc80f5b5c605713",
+            "size": 3281,
+            "uri": "https://{canondata_backend}/1936947/27044849191fa57e78f8e84ac7ecb11a14e41ad3/resource.tar.gz#test.test_join-lookupjoin_inner_1o--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_inner_1o--Plan]": [
@@ -1372,9 +1372,9 @@
     ],
     "test.test[join-premap_map_inner--Debug]": [
         {
-            "checksum": "8a6f86726e00e9533d6348e1ba66a572",
-            "size": 3193,
-            "uri": "https://{canondata_backend}/1936842/f78569e172299b7a2aee3d6ade84c2cc02cc5940/resource.tar.gz#test.test_join-premap_map_inner--Debug_/opt.yql"
+            "checksum": "da871099502b72e095047d22e1154449",
+            "size": 3221,
+            "uri": "https://{canondata_backend}/1936947/27044849191fa57e78f8e84ac7ecb11a14e41ad3/resource.tar.gz#test.test_join-premap_map_inner--Debug_/opt.yql"
         }
     ],
     "test.test[join-premap_map_inner--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
index 58d2b86da0d..3fc3debc488 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
@@ -1068,9 +1068,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o--Debug]": [
         {
-            "checksum": "c29b3dc95f12c3bedf3901adf7e53e99",
-            "size": 2903,
-            "uri": "https://{canondata_backend}/1936947/1a2ec30f6c678213d458879d62698daad5e086d0/resource.tar.gz#test.test_join-lookupjoin_semi_1o--Debug_/opt.yql"
+            "checksum": "3d35b45bc3ec3fc1fb9a45a8a252793e",
+            "size": 2931,
+            "uri": "https://{canondata_backend}/1936947/996442f96af18019d0950659c626e4e870669ed0/resource.tar.gz#test.test_join-lookupjoin_semi_1o--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_semi_1o--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
index 6142ed06f5d..036809baca2 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
@@ -1500,9 +1500,9 @@
     ],
     "test.test[join-mapjoin_left_null_column--Debug]": [
         {
-            "checksum": "d5d1f8254d9624f59025bbc7abaa35b8",
-            "size": 3224,
-            "uri": "https://{canondata_backend}/1773845/c865fc3a6f63b56097b2e5205cf04a3ce881c52d/resource.tar.gz#test.test_join-mapjoin_left_null_column--Debug_/opt.yql"
+            "checksum": "f580c04e36e88206b489eb8dfd615b46",
+            "size": 3252,
+            "uri": "https://{canondata_backend}/1936947/37919730ebf18199295eb5140ec2269a684eb3d0/resource.tar.gz#test.test_join-mapjoin_left_null_column--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_left_null_column--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part9/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part9/canondata/result.json
index bab9490cef4..aa232da660e 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part9/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part9/canondata/result.json
@@ -1113,9 +1113,9 @@
     ],
     "test.test[join-lookupjoin_take_skip--Debug]": [
         {
-            "checksum": "ec3f9c13770d70475d8748b580ad445c",
-            "size": 4631,
-            "uri": "https://{canondata_backend}/1942525/a8f9f6564bca0ccc9a3de84da1c700fc36c07fc1/resource.tar.gz#test.test_join-lookupjoin_take_skip--Debug_/opt.yql"
+            "checksum": "1d6a082f671623111c1677ac13dfd330",
+            "size": 4657,
+            "uri": "https://{canondata_backend}/1871182/37e3073a112d386a7d91e2ce89c774f0da4fb00c/resource.tar.gz#test.test_join-lookupjoin_take_skip--Debug_/opt.yql"
         }
     ],
     "test.test[join-lookupjoin_take_skip--Plan]": [
@@ -1134,9 +1134,9 @@
     ],
     "test.test[join-mapjoin_on_tablerecord--Debug]": [
         {
-            "checksum": "3b497f4710d5a847eb8f44f8c586261e",
-            "size": 3667,
-            "uri": "https://{canondata_backend}/1937429/1ca07da234d7bcc8f0a3159b3e1bfcdf4830cdde/resource.tar.gz#test.test_join-mapjoin_on_tablerecord--Debug_/opt.yql"
+            "checksum": "e598221e98315680e0c938dbdb8ac249",
+            "size": 3735,
+            "uri": "https://{canondata_backend}/1871182/37e3073a112d386a7d91e2ce89c774f0da4fb00c/resource.tar.gz#test.test_join-mapjoin_on_tablerecord--Debug_/opt.yql"
         }
     ],
     "test.test[join-mapjoin_on_tablerecord--Plan]": [
@@ -1176,9 +1176,9 @@
     ],
     "test.test[join-yql-14847--Debug]": [
         {
-            "checksum": "10b406ebcf3eac463d2b639d45bc781b",
-            "size": 4529,
-            "uri": "https://{canondata_backend}/1937429/1ca07da234d7bcc8f0a3159b3e1bfcdf4830cdde/resource.tar.gz#test.test_join-yql-14847--Debug_/opt.yql"
+            "checksum": "5c2847426c033ae0d00b357fe8dcefa4",
+            "size": 4558,
+            "uri": "https://{canondata_backend}/1871182/37e3073a112d386a7d91e2ce89c774f0da4fb00c/resource.tar.gz#test.test_join-yql-14847--Debug_/opt.yql"
         }
     ],
     "test.test[join-yql-14847--Plan]": [
author	Pavel Velikhov <[email protected]>	2024-03-12 21:29:48 +0300
committer	GitHub <[email protected]>	2024-03-12 21:29:48 +0300
commit	ece018e7f8887ac594a0d8775344f7bedf1d32a0 (patch)
tree	32ef38fc13e124a846de907678cebef0bd16ff51
parent	76f688158ce4fdb838985f291d0039e0f6ddaa96 (diff)