YQL-15441: Fix PO order

YQL-15441: Fix PO order

14 files changed, 115 insertions, 91 deletions

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 f998b1a527..23f17ccbf0 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
@@ -3536,42 +3536,6 @@ void CombineJoinStatus(TStatus& status, TStatus other) {
     }
 }
 
-TStatus RewriteYtEquiJoinLeaves(TYtEquiJoin equiJoin, TYtJoinNodeOp& op, const TYtState::TPtr& state, TExprContext& ctx) {
-    TYtJoinNodeLeaf* leftLeaf = dynamic_cast<TYtJoinNodeLeaf*>(op.Left.Get());
-    TYtJoinNodeLeaf* rightLeaf = dynamic_cast<TYtJoinNodeLeaf*>(op.Right.Get());
-
-    TStatus result = TStatus::Repeat;
-    if (!leftLeaf) {
-        auto& leftOp = *dynamic_cast<TYtJoinNodeOp*>(op.Left.Get());
-        CombineJoinStatus(result, RewriteYtEquiJoinLeaves(equiJoin, leftOp, state, ctx));
-        if (result.Level == TStatus::Error) {
-            return result;
-        }
-        if (result.Level == TStatus::Ok && leftOp.Output) {
-            // convert to leaf
-            op.Left = ConvertYtEquiJoinToLeaf(leftOp, equiJoin.Pos(), ctx);
-        }
-    }
-
-    if (!rightLeaf) {
-        auto& rightOp = *dynamic_cast<TYtJoinNodeOp*>(op.Right.Get());
-        CombineJoinStatus(result, RewriteYtEquiJoinLeaves(equiJoin, rightOp, state, ctx));
-        if (result.Level == TStatus::Error) {
-            return result;
-        }
-        if (result.Level == TStatus::Ok && rightOp.Output) {
-            // convert to leaf
-            op.Right = ConvertYtEquiJoinToLeaf(rightOp, equiJoin.Pos(), ctx);
-        }
-    }
-
-    if (leftLeaf && rightLeaf) {
-        CombineJoinStatus(result, RewriteYtEquiJoinLeaf(equiJoin, op, *leftLeaf, *rightLeaf, state, ctx));
-    }
-
-    return result;
-}
-
 enum class EStarRewriteStatus {
     WaitInput,
     None,
@@ -4718,6 +4682,42 @@ IGraphTransformer::TStatus RewriteYtEquiJoin(TYtEquiJoin equiJoin, TYtJoinNodeOp
     return RewriteYtEquiJoinLeaves(equiJoin, op, state, ctx);
 }
 
+TStatus RewriteYtEquiJoinLeaves(TYtEquiJoin equiJoin, TYtJoinNodeOp& op, const TYtState::TPtr& state, TExprContext& ctx) {
+    TYtJoinNodeLeaf* leftLeaf = dynamic_cast<TYtJoinNodeLeaf*>(op.Left.Get());
+    TYtJoinNodeLeaf* rightLeaf = dynamic_cast<TYtJoinNodeLeaf*>(op.Right.Get());
+
+    TStatus result = TStatus::Repeat;
+    if (!leftLeaf) {
+        auto& leftOp = *dynamic_cast<TYtJoinNodeOp*>(op.Left.Get());
+        CombineJoinStatus(result, RewriteYtEquiJoinLeaves(equiJoin, leftOp, state, ctx));
+        if (result.Level == TStatus::Error) {
+            return result;
+        }
+        if (result.Level == TStatus::Ok && leftOp.Output) {
+            // convert to leaf
+            op.Left = ConvertYtEquiJoinToLeaf(leftOp, equiJoin.Pos(), ctx);
+        }
+    }
+
+    if (!rightLeaf) {
+        auto& rightOp = *dynamic_cast<TYtJoinNodeOp*>(op.Right.Get());
+        CombineJoinStatus(result, RewriteYtEquiJoinLeaves(equiJoin, rightOp, state, ctx));
+        if (result.Level == TStatus::Error) {
+            return result;
+        }
+        if (result.Level == TStatus::Ok && rightOp.Output) {
+            // convert to leaf
+            op.Right = ConvertYtEquiJoinToLeaf(rightOp, equiJoin.Pos(), ctx);
+        }
+    }
+
+    if (leftLeaf && rightLeaf) {
+        CombineJoinStatus(result, RewriteYtEquiJoinLeaf(equiJoin, op, *leftLeaf, *rightLeaf, state, ctx));
+    }
+
+    return result;
+}
+
 TMaybeNode<TExprBase> ExportYtEquiJoin(TYtEquiJoin equiJoin, const TYtJoinNodeOp& op, TExprContext& ctx,
     const TYtState::TPtr& state) {
     if (op.Output) {
diff --git a/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.h b/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.h
index 3680c38a5a..618df9576e 100644
--- a/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.h
+++ b/ydb/library/yql/providers/yt/provider/yql_yt_join_impl.h
@@ -61,6 +61,7 @@ struct TYtJoinNodeOp : TYtJoinNode {
 };
 
 TYtJoinNodeOp::TPtr ImportYtEquiJoin(TYtEquiJoin equiJoin, TExprContext& ctx);
+IGraphTransformer::TStatus RewriteYtEquiJoinLeaves(TYtEquiJoin equiJoin, TYtJoinNodeOp& op, const TYtState::TPtr& state, TExprContext& ctx);
 IGraphTransformer::TStatus RewriteYtEquiJoin(TYtEquiJoin equiJoin, TYtJoinNodeOp& op, const TYtState::TPtr& state, TExprContext& ctx);
 TMaybeNode<TExprBase> ExportYtEquiJoin(TYtEquiJoin equiJoin, const TYtJoinNodeOp& op, TExprContext& ctx, const TYtState::TPtr& state);
 TYtJoinNodeOp::TPtr OrderJoins(TYtJoinNodeOp::TPtr op, const TYtState::TPtr& state, TExprContext& ctx, bool debug = false);
diff --git a/ydb/library/yql/providers/yt/provider/yql_yt_physical_optimize.cpp b/ydb/library/yql/providers/yt/provider/yql_yt_physical_optimize.cpp
index ca46293811..60b4fbe590 100644
--- a/ydb/library/yql/providers/yt/provider/yql_yt_physical_optimize.cpp
+++ b/ydb/library/yql/providers/yt/provider/yql_yt_physical_optimize.cpp
@@ -90,7 +90,7 @@ public:
         AddHandler(0, &TYtDqWrite::Match, HNDL(YtDqWrite));
         AddHandler(0, &TYtDqProcessWrite::Match, HNDL(YtDqProcessWrite));
         AddHandler(0, &TYtTransientOpBase::Match, HNDL(ZeroSample));
-        AddHandler(0, &TYtEquiJoin::Match, HNDL(RuntimeEquiJoin));
+        AddHandler(0, &TYtEquiJoin::Match, HNDL(EarlyMergeJoin));
 
         AddHandler(1, &TYtMap::Match, HNDL(FuseInnerMap));
         AddHandler(1, &TYtMap::Match, HNDL(FuseOuterMap));
@@ -111,6 +111,7 @@ public:
         AddHandler(1, &TYtMerge::Match, HNDL(PushMergeLimitToInput));
         AddHandler(1, &TYtReduce::Match, HNDL(FuseReduce));
 
+        AddHandler(2, &TYtEquiJoin::Match, HNDL(RuntimeEquiJoin));
         AddHandler(2, &TStatWriteTable::Match, HNDL(ReplaceStatWriteTable));
         AddHandler(2, &TYtMap::Match, HNDL(MapToMerge));
         AddHandler(2, &TYtPublish::Match, HNDL(UnorderedPublishTarget));
@@ -5736,6 +5737,28 @@ private:
             .Done();
     }
 
+    TMaybeNode<TExprBase> EarlyMergeJoin(TExprBase node, TExprContext& ctx) const {
+        if (State_->Configuration->JoinMergeTablesLimit.Get()) {
+            auto equiJoin = node.Cast<TYtEquiJoin>();
+            const auto tree = ImportYtEquiJoin(equiJoin, ctx);
+            if (State_->Configuration->JoinMergeForce.Get() || tree->LinkSettings.ForceSortedMerge) {
+                const auto rewriteStatus = RewriteYtEquiJoinLeaves(equiJoin, *tree, State_, ctx);
+                switch (rewriteStatus.Level) {
+                    case TStatus::Repeat:
+                        return node;
+                    case TStatus::Error:
+                        return {};
+                    case TStatus::Ok:
+                        break;
+                    default:
+                        YQL_ENSURE(false, "Unexpected rewrite status");
+                }
+                return ExportYtEquiJoin(equiJoin, *tree, ctx, State_);
+            }
+        }
+        return node;
+    }
+
     TMaybeNode<TExprBase> RuntimeEquiJoin(TExprBase node, TExprContext& ctx) const {
         auto equiJoin = node.Cast<TYtEquiJoin>();
 
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 4294ef2fbe..7c119b9262 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
@@ -1335,9 +1335,9 @@
     ],
     "test.test[EquiJoinAny-MergeAllAny-Debug]": [
         {
-            "checksum": "749bf064a55b60415a22f76c92fe76d9",
-            "size": 14870,
-            "uri": "https://{canondata_backend}/1880306/459f5eec63e7612bbdc851e3b684292fa4707651/resource.tar.gz#test.test_EquiJoinAny-MergeAllAny-Debug_/opt.yql"
+            "checksum": "76ec5bc1e3c4538e84d7a00fc418f31b",
+            "size": 14765,
+            "uri": "https://{canondata_backend}/1775059/3fefb549fd47c5ea8445d0ae57e6925d43865d9f/resource.tar.gz#test.test_EquiJoinAny-MergeAllAny-Debug_/opt.yql"
         },
         {
             "checksum": "a03ffd76b67f9034e4a1878b98f37379",
@@ -1699,9 +1699,9 @@
     ],
     "test.test[EquiJoinMerge-Left2key2_1o2o-Debug]": [
         {
-            "checksum": "dc10a333c00356d88f58bc70a790384d",
-            "size": 4494,
-            "uri": "https://{canondata_backend}/1942525/317c7aed2d1c54dcca0e15782141456ff47724cc/resource.tar.gz#test.test_EquiJoinMerge-Left2key2_1o2o-Debug_/opt.yql"
+            "checksum": "9b02c985e7f7a3256f8af1da9575fd1c",
+            "size": 4477,
+            "uri": "https://{canondata_backend}/1781765/e6ce641c67ee5e8fd774af099d76f9f50309186e/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_1o2o-Debug_/opt.yql"
         },
         {
             "checksum": "06b8bb7057879ece152c50e0a001f659",
@@ -1730,9 +1730,9 @@
     ],
     "test.test[EquiJoinMerge-RightSemi2key2_1o2o-Debug]": [
         {
-            "checksum": "b5c7f084e6dfaf4549e357db86e7dc3f",
-            "size": 3788,
-            "uri": "https://{canondata_backend}/1871182/ca687fde417c85e27f38caf6806d69fb76d218e8/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_1o2o-Debug_/opt.yql"
+            "checksum": "4c9d5859b78595451ae76259bab588f9",
+            "size": 3771,
+            "uri": "https://{canondata_backend}/1781765/e6ce641c67ee5e8fd774af099d76f9f50309186e/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_1o2o-Debug_/opt.yql"
         },
         {
             "checksum": "315ab8647f789e8c363770150e2a55c8",
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 8402924f13..5dae1ebaa7 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
@@ -1283,9 +1283,9 @@
     ],
     "test.test[EquiJoinAny-MergeAnyAny-Debug]": [
         {
-            "checksum": "7b1668b199e4c01bed1ce835f0c5fcb7",
-            "size": 14595,
-            "uri": "https://{canondata_backend}/1937492/942a5f52179195a16fb24a97b3d27efa854e10b2/resource.tar.gz#test.test_EquiJoinAny-MergeAnyAny-Debug_/opt.yql"
+            "checksum": "c9e58e2dbcf3191359eeb11f62bb7b22",
+            "size": 14480,
+            "uri": "https://{canondata_backend}/995452/109b2a13f6dfea57a6bc3bae3e31614d50c33d9e/resource.tar.gz#test.test_EquiJoinAny-MergeAnyAny-Debug_/opt.yql"
         },
         {
             "checksum": "487da415848b649a95cbdab4a577525a",
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 fc01cc3e10..42453fc18c 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
@@ -928,9 +928,9 @@
     ],
     "test.test[EquiJoin-EquiInnerSelfIntTakeDiff-Debug]": [
         {
-            "checksum": "c58f9da11ffe8384c6006d29d21144cf",
-            "size": 4522,
-            "uri": "https://{canondata_backend}/1880306/e99b0bcdf0afa276a9a94933dc8751892443c45e/resource.tar.gz#test.test_EquiJoin-EquiInnerSelfIntTakeDiff-Debug_/opt.yql"
+            "checksum": "5dcac3e2c44be39c2725d5022135ce3a",
+            "size": 4521,
+            "uri": "https://{canondata_backend}/1937367/d7ac164e16bfc347a93897e4b847d9ae20585e5f/resource.tar.gz#test.test_EquiJoin-EquiInnerSelfIntTakeDiff-Debug_/opt.yq"
         },
         {
             "checksum": "5e9fa2ef7241da7823a14468e422892e",
@@ -2910,9 +2910,9 @@
     ],
     "test.test[EquiJoinMerge-RightSemi2key2_12-Debug]": [
         {
-            "checksum": "78953174ca2f15fab0de3eeac544c41c",
-            "size": 3651,
-            "uri": "https://{canondata_backend}/1942525/39638f5ba1a43ad65b382016136128f5c3e1fd7f/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_12-Debug_/opt.yql"
+            "checksum": "0ee40cac51a26a6d2ebec23b5d5eaa8e",
+            "size": 3634,
+            "uri": "https://{canondata_backend}/1937367/d7ac164e16bfc347a93897e4b847d9ae20585e5f/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_12-Debug_/opt.yql"
         },
         {
             "checksum": "e2fe4647c6208d67d4d7dcd0972761c7",
@@ -2941,9 +2941,9 @@
     ],
     "test.test[EquiJoinOrdered-JoinOrderedKey2-Debug]": [
         {
-            "checksum": "5d05763b6dd34aa3bb15681ff5115a37",
-            "size": 16804,
-            "uri": "https://{canondata_backend}/1775059/3d6eab922ae6cb3b23323b9b04ef1928b261f1d1/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedKey2-Debug_/opt.yql"
+            "checksum": "69b862359af6e528d02eb75c96ef52f2",
+            "size": 16736,
+            "uri": "https://{canondata_backend}/1937367/d7ac164e16bfc347a93897e4b847d9ae20585e5f/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedKey2-Debug_/opt.yql"
         },
         {
             "checksum": "d53ac59a8643eadff806e2a6372ed328",
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 1041fa0668..286642b0cf 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
@@ -3139,9 +3139,9 @@
     ],
     "test.test[EquiJoinOrdered-JoinOrderedOpt12Key2-Debug]": [
         {
-            "checksum": "ae3260a5444b1c4103688c3e74235d34",
-            "size": 16779,
-            "uri": "https://{canondata_backend}/1942525/5782268524b17fa5e42aa80fbf7cb4ebc984c6d0/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt12Key2-Debug_/opt.yql"
+            "checksum": "9f73e93f844696696fd857c55fcb4efd",
+            "size": 16711,
+            "uri": "https://{canondata_backend}/1781765/157ffc59b1acb69b4013a6bc0e040f7546b220e0/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt12Key2-Debug_/opt.yql"
         },
         {
             "checksum": "8945382ad95d62da1ff0a2b13d55db55",
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 fcd890ad2a..26323d1885 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
@@ -2309,9 +2309,9 @@
     ],
     "test.test[EquiJoinAny-MergeAnyAll-Debug]": [
         {
-            "checksum": "69a1a8fd35b5fb71042def56d05c67f4",
-            "size": 14865,
-            "uri": "https://{canondata_backend}/1942278/95ffb5252ba8a2116c74e3fefbd5933ff4dab873/resource.tar.gz#test.test_EquiJoinAny-MergeAnyAll-Debug_/opt.yql"
+            "checksum": "d7bc4d241c80afc5a78d3d8c123d5249",
+            "size": 14695,
+            "uri": "https://{canondata_backend}/1775059/4fd6fc1ec0a79ec1976a3fb817bf3b53df6309a1/resource.tar.gz#test.test_EquiJoinAny-MergeAnyAll-Debug_/opt.yql"
         },
         {
             "checksum": "ff8e0b78e3292421a664fdf22102be42",
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 7ab2bf3530..375d6bf250 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
@@ -2165,9 +2165,9 @@
     ],
     "test.test[EquiJoinMerge-Left2key2_12-Debug]": [
         {
-            "checksum": "eabeb9466317a19a643126d9268d3435",
-            "size": 4364,
-            "uri": "https://{canondata_backend}/1942173/0af18feeda427b3ce6b009b74e4f3f83a567da47/resource.tar.gz#test.test_EquiJoinMerge-Left2key2_12-Debug_/opt.yql"
+            "checksum": "f45d52e2d78612e90f7164d43d7391d1",
+            "size": 4347,
+            "uri": "https://{canondata_backend}/1773845/236c9627e15574ab1245e8d0c9aedda0f655d080/resource.tar.gz#test.test_EquiJoinMerge-Left2key2_12-Debug_/opt.yql"
         },
         {
             "checksum": "b322f9f64817dfa8445579d82ea73709",
@@ -2196,9 +2196,9 @@
     ],
     "test.test[EquiJoinOrdered-JoinOrderedOpt1Key2-Debug]": [
         {
-            "checksum": "ba818f66be74a46b5736110e038ea04d",
-            "size": 17057,
-            "uri": "https://{canondata_backend}/1936997/a7ee3ae0f1b39770377264165955df96bee15955/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt1Key2-Debug_/opt.yql"
+            "checksum": "e8a920e2fa5a8e1ae17278419a2f4fcb",
+            "size": 16984,
+            "uri": "https://{canondata_backend}/1942278/6f07a9b50e1dae5952f5231a58807764d5418327/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt1Key2-Debug_/opt.yql"
         },
         {
             "checksum": "9456cb39e9c78acb597ad1442ea2628b",
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part9/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part9/canondata/result.json
index 47a1d26489..60956cf545 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part9/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part9/canondata/result.json
@@ -3460,9 +3460,9 @@
     ],
     "test.test[EquiJoinOrdered-JoinOrderedOpt2Key2-Debug]": [
         {
-            "checksum": "f402f4ea72fe9fbb7a953071a29cde70",
-            "size": 17057,
-            "uri": "https://{canondata_backend}/1936842/5ec728eb38b21f2ebf6fcbd440711eeb6da6a428/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt2Key2-Debug_/opt.yql"
+            "checksum": "8fc8335dcb05aa9bf084b249ea5ad48e",
+            "size": 16984,
+            "uri": "https://{canondata_backend}/995452/de79e3ba669e27014d9c3fb8659c721e7f64b879/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt2Key2-Debug_/opt.yql"
         },
         {
             "checksum": "4dd68f5100e1caefe7d069c1231b7925",
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 700067b4ff..33223baf58 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
@@ -1877,9 +1877,9 @@
     ],
     "test.test[in-in_exists_immediate_nested_subq--Debug]": [
         {
-            "checksum": "7f39e13c6e1ca0459a49ea83517a7c87",
-            "size": 5088,
-            "uri": "https://{canondata_backend}/1942415/f8c4e737c387a8a47b3bbff733d1d2a7c3544ad4/resource.tar.gz#test.test_in-in_exists_immediate_nested_subq--Debug_/opt.yql"
+            "checksum": "837e61271ef9460c6ecefcb5e423277a",
+            "size": 5121,
+            "uri": "https://{canondata_backend}/1936273/78bab576ef835300f10263ba394134a6f84a3c66/resource.tar.gz#test.test_in-in_exists_immediate_nested_subq--Debug_/opt.yql"
         }
     ],
     "test.test[in-in_exists_immediate_nested_subq--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 ae5488134c..1c7005c587 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
@@ -2632,16 +2632,16 @@
     ],
     "test.test[join-mergejoin_saves_output_sort--Debug]": [
         {
-            "checksum": "4e91af99ad0b184bd8aa322b23fa59d7",
-            "size": 13859,
-            "uri": "https://{canondata_backend}/1900335/89a12705610603fae492f309490f2eb265443d3b/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Debug_/opt.yql"
+            "checksum": "b466fa4cd7de29d3516265235d152608",
+            "size": 14410,
+            "uri": "https://{canondata_backend}/1925821/6e192910650dc063776d9d3a130fb0472c8ae2d3/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Debug_/opt.yql"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort--Plan]": [
         {
-            "checksum": "a1cefe5b0582eac30dc62e8fc65a3b6e",
-            "size": 33521,
-            "uri": "https://{canondata_backend}/1937027/c927b5a10a196d9c7631e03d7836f8c3bb1a22a3/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Plan_/plan.txt"
+            "checksum": "71217dd57d74e201cffc0ff15c781cbe",
+            "size": 35403,
+            "uri": "https://{canondata_backend}/212715/f1c0072764dd58478ca2b054487f66726290c8eb/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Plan_/plan.txt"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort--Results]": [
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 e37384f760..c21144b0c9 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
@@ -3626,16 +3626,16 @@
     ],
     "test.test[pg-tpch-q20-default.txt-Debug]": [
         {
-            "checksum": "7400d10be9dcdc6a8ed0406932d84e9a",
-            "size": 22114,
-            "uri": "https://{canondata_backend}/1924537/b5e225a17c32c48dd7548b60456cf27b89f13512/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Debug_/opt.yql"
+            "checksum": "a05838f1c8c60eb677cfe2ea210f416e",
+            "size": 21772,
+            "uri": "https://{canondata_backend}/1942671/118b60dd2b90ae52bc2ab9b25fee1f6e3f2bde69/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[pg-tpch-q20-default.txt-Plan]": [
         {
-            "checksum": "859dba9c7c8f84d49e1de5836fca1e8d",
-            "size": 27537,
-            "uri": "https://{canondata_backend}/1942100/7c68eab84fdf0cd479076134dd8b4ae6923cbae8/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Plan_/plan.txt"
+            "checksum": "64cb22960ad9b3d84628a0de0b2db23c",
+            "size": 26455,
+            "uri": "https://{canondata_backend}/1817427/2e8d61f2667980cfac8d977faa8f28cafe7d528b/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[pg-tpch-q20-default.txt-Results]": [
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 1f7a4367dc..dd716cdfb1 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
@@ -2660,9 +2660,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names--Debug]": [
         {
-            "checksum": "cf69297c22b2775b8c2548f0d88a1964",
-            "size": 7997,
-            "uri": "https://{canondata_backend}/1936273/0acf964c75c65d637b5e42aede4cb228a47132fc/resource.tar.gz#test.test_join-mergejoin_with_different_key_names--Debug_/opt.yql"
+            "checksum": "34a353bc2edb4d2d2298b797a8bb9cff",
+            "size": 7980,
+            "uri": "https://{canondata_backend}/1924537/e92f29984818b3263df1bdb38087134e330299ca/resource.tar.gz#test.test_join-mergejoin_with_different_key_names--Debug_/opt.yql"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names--Plan]": [