diff --git a/ydb/library/yql/core/type_ann/type_ann_core.cpp b/ydb/library/yql/core/type_ann/type_ann_core.cpp
index dd385c780987..61977e7cb5c6 100644
--- a/ydb/library/yql/core/type_ann/type_ann_core.cpp
+++ b/ydb/library/yql/core/type_ann/type_ann_core.cpp
@@ -3445,16 +3445,21 @@ namespace NTypeAnnImpl {
         return IGraphTransformer::TStatus::Ok;
     }
 
-    IGraphTransformer::TStatus FromFlowWrapper(const TExprNode::TPtr& input, TExprNode::TPtr&, TContext& ctx) {
+    IGraphTransformer::TStatus FromFlowWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx) {
         if (!EnsureArgsCount(*input, 1, ctx.Expr)) {
             return IGraphTransformer::TStatus::Error;
         }
 
-        if (!EnsureFlowType(input->Head(), ctx.Expr)) {
+        const TTypeAnnotationNode* itemType = nullptr;
+        if (!EnsureNewSeqType<false, false>(input->Head(), ctx.Expr, &itemType)) {
             return IGraphTransformer::TStatus::Error;
         }
+        const auto kind = input->Head().GetTypeAnn()->GetKind();
+        if (ETypeAnnotationKind::Stream == kind) {
+            output = input->HeadPtr();
+            return IGraphTransformer::TStatus::Repeat;
+        }
 
-        const auto itemType = input->Head().GetTypeAnn()->Cast<TFlowExprType>()->GetItemType();
         input->SetTypeAnn(ctx.Expr.MakeType<TStreamExprType>(itemType));
         return IGraphTransformer::TStatus::Ok;
     }
diff --git a/ydb/library/yql/dq/opt/dq_opt_peephole.cpp b/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
index ed079387ffd8..11877696b431 100644
--- a/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
@@ -607,29 +607,10 @@ NNodes::TExprBase DqPeepholeRewriteReplicate(const NNodes::TExprBase& node, TExp
 
     TVector<TExprBase> branches;
     branches.reserve(dqReplicate.Args().Count() - 1);
-    const auto inputKind = dqReplicate.Arg(0).Ref().GetTypeAnn()->GetKind();
-    YQL_ENSURE(inputKind == ETypeAnnotationKind::Stream || inputKind == ETypeAnnotationKind::Flow);
-
     auto inputIndex = NDq::BuildAtomList("0", dqReplicate.Pos(), ctx);
     for (size_t i = 1; i < dqReplicate.Args().Count(); ++i) {
         branches.emplace_back(inputIndex);
-        const auto lambdaOutputKind = dqReplicate.Arg(i).Ref().GetTypeAnn()->GetKind();
-        YQL_ENSURE(lambdaOutputKind == ETypeAnnotationKind::Stream || lambdaOutputKind == ETypeAnnotationKind::Flow);
-        if (lambdaOutputKind != inputKind) {
-            branches.emplace_back(ctx.Builder(dqReplicate.Arg(i).Pos())
-                .Lambda()
-                    .Param("arg")
-                    .Callable(lambdaOutputKind == ETypeAnnotationKind::Stream ? "ToFlow" : "FromFlow")
-                        .Apply(0, dqReplicate.Arg(i).Ptr())
-                            .With(0, "arg")
-                        .Seal()
-                    .Seal()
-                .Seal()
-                .Build()
-            );
-        } else {
-            branches.emplace_back(ctx.DeepCopyLambda(dqReplicate.Arg(i).Ref()));
-        }
+        branches.emplace_back(ctx.DeepCopyLambda(dqReplicate.Arg(i).Ref()));
     }
 
     return Build<TCoSwitch>(ctx, dqReplicate.Pos())
diff --git a/ydb/library/yql/dq/opt/dq_opt_phy.cpp b/ydb/library/yql/dq/opt/dq_opt_phy.cpp
index a6fa7108575c..7e918f8d345d 100644
--- a/ydb/library/yql/dq/opt/dq_opt_phy.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_phy.cpp
@@ -835,13 +835,15 @@ TExprBase DqPushBaseLMapToStage(TExprBase node, TExprContext& ctx, IOptimization
     }
 
     auto lambda = Build<TCoLambda>(ctx, lmap.Lambda().Pos())
-        .Args({"stream"})
-        .template Body<TCoToStream>()
+        .Args({"arg"})
+        .template Body<TCoToFlow>()
             .template Input<TExprApplier>()
                 .Apply(lmap.Lambda())
-                .With(lmap.Lambda().Args().Arg(0), "stream")
+                .template With<TCoFromFlow>(0)
+                    .Input("arg")
                 .Build()
             .Build()
+        .Build()
         .Done();
 
     auto result = DqPushLambdaToStageUnionAll(dqUnion, lambda, {}, ctx, optCtx);
@@ -2253,13 +2255,10 @@ TExprBase DqBuildHasItems(TExprBase node, TExprContext& ctx, IOptimizationContex
     // Add LIMIT 1 via Take
     auto takeProgram = Build<TCoLambda>(ctx, node.Pos())
         .Args({"take_arg"})
-        // DqOutput expects stream as input, thus form stream with one element
-        .Body<TCoToStream>()
-            .Input<TCoTake>()
-                .Input({"take_arg"})
-                .Count<TCoUint64>()
-                    .Literal().Build("1")
-                    .Build()
+        .Body<TCoTake>()
+            .Input({"take_arg"})
+            .Count<TCoUint64>()
+                .Literal().Build("1")
                 .Build()
             .Build()
         .Done();
diff --git a/ydb/library/yql/dq/type_ann/dq_type_ann.cpp b/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
index 8841a3c71bf8..f5395ccd1020 100644
--- a/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
+++ b/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
@@ -772,10 +772,10 @@ TStatus AnnotateDqReplicate(const TExprNode::TPtr& input, TExprContext& ctx) {
         if (!lambda->GetTypeAnn()) {
             return TStatus::Repeat;
         }
-        const TTypeAnnotationNode* lambdaItemType = nullptr;
-        if (!EnsureNewSeqType<false, false>(*lambda, ctx, &lambdaItemType)) {
+        if (!EnsureFlowType(*lambda, ctx)) {
             return TStatus::Error;
         }
+        const TTypeAnnotationNode* lambdaItemType = lambda->GetTypeAnn()->Cast<TFlowExprType>()->GetItemType();
         if (!EnsurePersistableType(lambda->Pos(), *lambdaItemType, ctx)) {
             return TStatus::Error;
         }
diff --git a/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
index 320262266ef5..70ce60bbd48f 100644
--- a/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
@@ -445,45 +445,45 @@
     ],
     "test.test[blocks-combine_all_pg_filter--Analyze]": [
         {
-            "checksum": "4656668d4e2f733a00211fcb65bce80e",
-            "size": 6308,
-            "uri": "https://{canondata_backend}/1777230/2492c292c3dcbe5dcfc10230e1b6f79478cb2008/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Analyze_/plan.txt"
+            "checksum": "cb30717cca1cf1bf0c11f384cef516ff",
+            "size": 6207,
+            "uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_pg_filter--Debug]": [
         {
-            "checksum": "4ccfadbb9b2ef8f8a147f634eb24fdb8",
-            "size": 5951,
-            "uri": "https://{canondata_backend}/1889210/f053f10d689490bf5100a7fbf8cc00cf1b09e227/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Debug_/opt.yql_patched"
+            "checksum": "0175c2b71c1bee6c8898ad3e45f4fbf2",
+            "size": 5940,
+            "uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_pg_filter--Plan]": [
         {
-            "checksum": "4656668d4e2f733a00211fcb65bce80e",
-            "size": 6308,
-            "uri": "https://{canondata_backend}/1937001/6a56dcab007ee7dae62350ff55c93dfb66c55be9/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Plan_/plan.txt"
+            "checksum": "cb30717cca1cf1bf0c11f384cef516ff",
+            "size": 6207,
+            "uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_pg_filter--Results]": [],
     "test.test[blocks-minmax_strings--Analyze]": [
         {
-            "checksum": "37a57735794a77d894fa5a6b0abd3eb6",
-            "size": 10519,
-            "uri": "https://{canondata_backend}/1937367/e7bed33e6b4b2768362711c9af0c33aa77d7c6be/resource.tar.gz#test.test_blocks-minmax_strings--Analyze_/plan.txt"
+            "checksum": "8a75fbb5e579f9a872fefea76b24e45a",
+            "size": 10317,
+            "uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-minmax_strings--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-minmax_strings--Debug]": [
         {
-            "checksum": "3f2580c331318e495301e26412dddbe2",
-            "size": 7676,
-            "uri": "https://{canondata_backend}/1781765/8e0613d3790a082da800eb9686a3a395b3b84a69/resource.tar.gz#test.test_blocks-minmax_strings--Debug_/opt.yql_patched"
+            "checksum": "228cb9ea9ac90b76c19456f64f953232",
+            "size": 7621,
+            "uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-minmax_strings--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-minmax_strings--Plan]": [
         {
-            "checksum": "37a57735794a77d894fa5a6b0abd3eb6",
-            "size": 10519,
-            "uri": "https://{canondata_backend}/1924537/e1fc580fe9de3ebf40555bc861809490fa6c934d/resource.tar.gz#test.test_blocks-minmax_strings--Plan_/plan.txt"
+            "checksum": "8a75fbb5e579f9a872fefea76b24e45a",
+            "size": 10317,
+            "uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-minmax_strings--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-minmax_strings--Results]": [],
@@ -2505,23 +2505,23 @@
     "test.test[pg_catalog-pg_stat_gssapi-default.txt-Results]": [],
     "test.test[produce-discard_process_with_lambda-default.txt-Analyze]": [
         {
-            "checksum": "3bffa2a18b9b81cc1f89280482f926dc",
-            "size": 3833,
-            "uri": "https://{canondata_backend}/937458/ca874ae4a90e1527826d17c1da5f3d3dad325887/resource.tar.gz#test.test_produce-discard_process_with_lambda-default.txt-Analyze_/plan.txt"
+            "checksum": "ebe34f5d2b86ce7954a161dc02a783aa",
+            "size": 3732,
+            "uri": "https://{canondata_backend}/1942415/eb3b960b9379ed168e3265e38f52b5ecd2264129/resource.tar.gz#test.test_produce-discard_process_with_lambda-default.txt-Analyze_/plan.txt"
         }
     ],
     "test.test[produce-discard_process_with_lambda-default.txt-Debug]": [
         {
-            "checksum": "59db4a11e71c8c2545cf3b98a80f8791",
-            "size": 1376,
-            "uri": "https://{canondata_backend}/1777230/54900ab79add880940d8cd79f2a56fc8179d5364/resource.tar.gz#test.test_produce-discard_process_with_lambda-default.txt-Debug_/opt.yql_patched"
+            "checksum": "749ba4a052203d4896c672f6580262bc",
+            "size": 1365,
+            "uri": "https://{canondata_backend}/1942415/eb3b960b9379ed168e3265e38f52b5ecd2264129/resource.tar.gz#test.test_produce-discard_process_with_lambda-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[produce-discard_process_with_lambda-default.txt-Plan]": [
         {
-            "checksum": "3bffa2a18b9b81cc1f89280482f926dc",
-            "size": 3833,
-            "uri": "https://{canondata_backend}/1130705/1ce6c7c35a3d1f6575dcd3f9fb981d727082535c/resource.tar.gz#test.test_produce-discard_process_with_lambda-default.txt-Plan_/plan.txt"
+            "checksum": "ebe34f5d2b86ce7954a161dc02a783aa",
+            "size": 3732,
+            "uri": "https://{canondata_backend}/1942415/eb3b960b9379ed168e3265e38f52b5ecd2264129/resource.tar.gz#test.test_produce-discard_process_with_lambda-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[produce-discard_process_with_lambda-default.txt-Results]": [],
@@ -2989,9 +2989,9 @@
     ],
     "test.test[type_v3-replace_diff_layout--Analyze]": [
         {
-            "checksum": "d863f77ffae8e99c471b0cce2bbef8d4",
-            "size": 11581,
-            "uri": "https://{canondata_backend}/1809005/3e0dcc957dfc0708964adef6897d1196bc2dea9e/resource.tar.gz#test.test_type_v3-replace_diff_layout--Analyze_/plan.txt"
+            "checksum": "70c2ec8274c52f1a38ece9ded7ced484",
+            "size": 11480,
+            "uri": "https://{canondata_backend}/1942415/eb3b960b9379ed168e3265e38f52b5ecd2264129/resource.tar.gz#test.test_type_v3-replace_diff_layout--Analyze_/plan.txt"
         },
         {
             "uri": "file://test.test_type_v3-replace_diff_layout--Analyze_/extracted"
@@ -2999,16 +2999,16 @@
     ],
     "test.test[type_v3-replace_diff_layout--Debug]": [
         {
-            "checksum": "39269bdb2fb00936857832bbc988fd88",
-            "size": 4373,
-            "uri": "https://{canondata_backend}/1777230/54900ab79add880940d8cd79f2a56fc8179d5364/resource.tar.gz#test.test_type_v3-replace_diff_layout--Debug_/opt.yql_patched"
+            "checksum": "674c9808638ed8a52743648beab333db",
+            "size": 4362,
+            "uri": "https://{canondata_backend}/1942415/eb3b960b9379ed168e3265e38f52b5ecd2264129/resource.tar.gz#test.test_type_v3-replace_diff_layout--Debug_/opt.yql_patched"
         }
     ],
     "test.test[type_v3-replace_diff_layout--Plan]": [
         {
-            "checksum": "d863f77ffae8e99c471b0cce2bbef8d4",
-            "size": 11581,
-            "uri": "https://{canondata_backend}/1936842/022ff014d0af26bc1aae8870d28654d93e3348a0/resource.tar.gz#test.test_type_v3-replace_diff_layout--Plan_/plan.txt"
+            "checksum": "70c2ec8274c52f1a38ece9ded7ced484",
+            "size": 11480,
+            "uri": "https://{canondata_backend}/1942415/eb3b960b9379ed168e3265e38f52b5ecd2264129/resource.tar.gz#test.test_type_v3-replace_diff_layout--Plan_/plan.txt"
         }
     ],
     "test.test[type_v3-replace_diff_layout--Results]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part1/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part1/canondata/result.json
index a9ac00741aba..3e634dfc9d46 100644
--- a/ydb/library/yql/tests/sql/dq_file/part1/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part1/canondata/result.json
@@ -555,67 +555,67 @@
     "test.test[binding-table_concat_strict_binding-default.txt-Results]": [],
     "test.test[blocks-combine_hashed_min--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/995452/4303db57e47a09cae11e8629ebf6e39558f3f239/resource.tar.gz#test.test_blocks-combine_hashed_min--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_min--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_min--Debug]": [
         {
-            "checksum": "cf94ec3c4de2778ce8d83f21142747dc",
-            "size": 3140,
-            "uri": "https://{canondata_backend}/1871182/3b561e37ea20fe792066c7eeac8cad978b139090/resource.tar.gz#test.test_blocks-combine_hashed_min--Debug_/opt.yql_patched"
+            "checksum": "398f18ef6a29c6f822997d596000ea27",
+            "size": 3129,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_min--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_min--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/995452/4303db57e47a09cae11e8629ebf6e39558f3f239/resource.tar.gz#test.test_blocks-combine_hashed_min--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_min--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_min--Results]": [],
     "test.test[blocks-combine_hashed_minmax_double--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/937458/31b672b035d50dcb1b5f28743bbedc3d6401e486/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_minmax_double--Debug]": [
         {
-            "checksum": "fea32346f8badeb913295879181f10de",
-            "size": 2662,
-            "uri": "https://{canondata_backend}/1942525/e82383a0853340bf9ac348d8e641aeedc7c24e1b/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Debug_/opt.yql_patched"
+            "checksum": "e01e88e1444c41c1f8d21d1a5237e551",
+            "size": 2651,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_minmax_double--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/937458/31b672b035d50dcb1b5f28743bbedc3d6401e486/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_minmax_double--Results]": [],
     "test.test[blocks-combine_hashed_set--Analyze]": [
         {
-            "checksum": "741472e80da23a7b1e6c0c31ff42683f",
-            "size": 5955,
-            "uri": "https://{canondata_backend}/995452/4303db57e47a09cae11e8629ebf6e39558f3f239/resource.tar.gz#test.test_blocks-combine_hashed_set--Analyze_/plan.txt"
+            "checksum": "8e37a495395d396b51f75e9400f208cf",
+            "size": 5854,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_set--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_set--Debug]": [
         {
-            "checksum": "596c73b71938d8f69128fdb263ad2b91",
-            "size": 1885,
-            "uri": "https://{canondata_backend}/1784826/5dc930cd4ecffd67bdc527c9ec277464e97c3194/resource.tar.gz#test.test_blocks-combine_hashed_set--Debug_/opt.yql_patched"
+            "checksum": "e3f5652dd919c7ae5e35c6463089fd3f",
+            "size": 1874,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_set--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_set--Plan]": [
         {
-            "checksum": "741472e80da23a7b1e6c0c31ff42683f",
-            "size": 5955,
-            "uri": "https://{canondata_backend}/995452/4303db57e47a09cae11e8629ebf6e39558f3f239/resource.tar.gz#test.test_blocks-combine_hashed_set--Plan_/plan.txt"
+            "checksum": "8e37a495395d396b51f75e9400f208cf",
+            "size": 5854,
+            "uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_set--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_set--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
index 2d918eadb3eb..e1306d9f4cbd 100644
--- a/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
@@ -442,23 +442,23 @@
     ],
     "test.test[blocks-combine_all_avg_filter--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_blocks-combine_all_avg_filter--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1936947/7492087a2990a4ea8139b91b9e07d28aa0e09aa4/resource.tar.gz#test.test_blocks-combine_all_avg_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_avg_filter--Debug]": [
         {
-            "checksum": "02f87404f60fa06d179254415f3d0f3d",
-            "size": 2662,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_blocks-combine_all_avg_filter--Debug_/opt.yql_patched"
+            "checksum": "b3d477dfe3808c59dba6540b4c4d0524",
+            "size": 2651,
+            "uri": "https://{canondata_backend}/1936947/7492087a2990a4ea8139b91b9e07d28aa0e09aa4/resource.tar.gz#test.test_blocks-combine_all_avg_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_avg_filter--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_blocks-combine_all_avg_filter--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1936947/7492087a2990a4ea8139b91b9e07d28aa0e09aa4/resource.tar.gz#test.test_blocks-combine_all_avg_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_avg_filter--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
index 134ebea71c87..6399e55983f7 100644
--- a/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
@@ -410,67 +410,67 @@
     "test.test[aggregate-having_distinct_expr--Results]": [],
     "test.test[blocks-combine_all_some_filter--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-combine_all_some_filter--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-combine_all_some_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_some_filter--Debug]": [
         {
-            "checksum": "6b0e27d10754680af8bdbe8db7796a3d",
-            "size": 2364,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-combine_all_some_filter--Debug_/opt.yql_patched"
+            "checksum": "a116a04b5a9ade6e13213bcfa6c5bc56",
+            "size": 2353,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-combine_all_some_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_some_filter--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-combine_all_some_filter--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-combine_all_some_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_some_filter--Results]": [],
     "test.test[blocks-combine_all_sum--Analyze]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-combine_all_sum--Analyze_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-combine_all_sum--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_sum--Debug]": [
         {
-            "checksum": "16ee21b9b4ed618beb33521c24a0b5df",
-            "size": 4370,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-combine_all_sum--Debug_/opt.yql_patched"
+            "checksum": "ac1024d5a0d7de104d9d299001b12fbb",
+            "size": 4359,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-combine_all_sum--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_sum--Plan]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-combine_all_sum--Plan_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-combine_all_sum--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_sum--Results]": [],
     "test.test[blocks-distinct_opt_state_keys--Analyze]": [
         {
-            "checksum": "ad16ca94b9913776e027a04f60d080ae",
-            "size": 12502,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-distinct_opt_state_keys--Analyze_/plan.txt"
+            "checksum": "5425be3bb775c88a36595646ef5ca83f",
+            "size": 12199,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-distinct_opt_state_keys--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_opt_state_keys--Debug]": [
         {
-            "checksum": "34e70b133426f980722fb04d0da4df5f",
-            "size": 8486,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-distinct_opt_state_keys--Debug_/opt.yql_patched"
+            "checksum": "d65b917d8a9419005e1d31b6798b6454",
+            "size": 8409,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-distinct_opt_state_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-distinct_opt_state_keys--Plan]": [
         {
-            "checksum": "ad16ca94b9913776e027a04f60d080ae",
-            "size": 12502,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_blocks-distinct_opt_state_keys--Plan_/plan.txt"
+            "checksum": "5425be3bb775c88a36595646ef5ca83f",
+            "size": 12199,
+            "uri": "https://{canondata_backend}/1775319/cbe1478d30f21f8e722d56bbf22e0acf9604e341/resource.tar.gz#test.test_blocks-distinct_opt_state_keys--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_opt_state_keys--Results]": [],
@@ -2060,23 +2060,23 @@
     "test.test[pg-tpch-q19-default.txt-Results]": [],
     "test.test[produce-process_with_lambda-default.txt-Analyze]": [
         {
-            "checksum": "3bffa2a18b9b81cc1f89280482f926dc",
-            "size": 3833,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_produce-process_with_lambda-default.txt-Analyze_/plan.txt"
+            "checksum": "ebe34f5d2b86ce7954a161dc02a783aa",
+            "size": 3732,
+            "uri": "https://{canondata_backend}/1781765/a9bb192df522b281951b02a8ad80c7fbaa8b1717/resource.tar.gz#test.test_produce-process_with_lambda-default.txt-Analyze_/plan.txt"
         }
     ],
     "test.test[produce-process_with_lambda-default.txt-Debug]": [
         {
-            "checksum": "9f61854c58a6ff64ee4cfa4e972a362d",
-            "size": 1350,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_produce-process_with_lambda-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9d8694d99122b0029f4d1af39f76c2d5",
+            "size": 1339,
+            "uri": "https://{canondata_backend}/1781765/a9bb192df522b281951b02a8ad80c7fbaa8b1717/resource.tar.gz#test.test_produce-process_with_lambda-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[produce-process_with_lambda-default.txt-Plan]": [
         {
-            "checksum": "3bffa2a18b9b81cc1f89280482f926dc",
-            "size": 3833,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_produce-process_with_lambda-default.txt-Plan_/plan.txt"
+            "checksum": "ebe34f5d2b86ce7954a161dc02a783aa",
+            "size": 3732,
+            "uri": "https://{canondata_backend}/1781765/a9bb192df522b281951b02a8ad80c7fbaa8b1717/resource.tar.gz#test.test_produce-process_with_lambda-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[produce-process_with_lambda-default.txt-Results]": [],
@@ -2456,23 +2456,23 @@
     "test.test[tpch-q4-default.txt-Results]": [],
     "test.test[type_v3-append_diff_layout1--Analyze]": [
         {
-            "checksum": "ba7fa6dbd19293295d318c735d1e44fb",
-            "size": 14216,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_type_v3-append_diff_layout1--Analyze_/plan.txt"
+            "checksum": "36a2ec3af109956ad4fab1aa31139529",
+            "size": 14115,
+            "uri": "https://{canondata_backend}/1781765/a9bb192df522b281951b02a8ad80c7fbaa8b1717/resource.tar.gz#test.test_type_v3-append_diff_layout1--Analyze_/plan.txt"
         }
     ],
     "test.test[type_v3-append_diff_layout1--Debug]": [
         {
-            "checksum": "433aa97154942e539d6f3b0de88c9cb6",
-            "size": 5221,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_type_v3-append_diff_layout1--Debug_/opt.yql_patched"
+            "checksum": "213a8124ad06035f1cebe3fed0d6c925",
+            "size": 5210,
+            "uri": "https://{canondata_backend}/1781765/a9bb192df522b281951b02a8ad80c7fbaa8b1717/resource.tar.gz#test.test_type_v3-append_diff_layout1--Debug_/opt.yql_patched"
         }
     ],
     "test.test[type_v3-append_diff_layout1--Plan]": [
         {
-            "checksum": "ba7fa6dbd19293295d318c735d1e44fb",
-            "size": 14216,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_type_v3-append_diff_layout1--Plan_/plan.txt"
+            "checksum": "36a2ec3af109956ad4fab1aa31139529",
+            "size": 14115,
+            "uri": "https://{canondata_backend}/1781765/a9bb192df522b281951b02a8ad80c7fbaa8b1717/resource.tar.gz#test.test_type_v3-append_diff_layout1--Plan_/plan.txt"
         }
     ],
     "test.test[type_v3-append_diff_layout1--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
index d383546c4c8f..0f0f9158213d 100644
--- a/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
@@ -338,89 +338,89 @@
     "test.test[blocks-add_int16--Results]": [],
     "test.test[blocks-combine_all_max--Analyze]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_all_max--Analyze_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_all_max--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_max--Debug]": [
         {
-            "checksum": "2ac19fbfa2e12aad9c1622a708727745",
-            "size": 6116,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_all_max--Debug_/opt.yql_patched"
+            "checksum": "7f0b98ba934e3867cdc1b3b631d0fa70",
+            "size": 6105,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_all_max--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_max--Plan]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_all_max--Plan_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_all_max--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_max--Results]": [],
     "test.test[blocks-combine_all_minmax_nested--Analyze]": [
         {
-            "checksum": "449c941f910dbdbfecaac33355f0acea",
-            "size": 5941,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_all_minmax_nested--Analyze_/plan.txt"
+            "checksum": "88b98e04135a26960f2c8a1ad8d62335",
+            "size": 5840,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_all_minmax_nested--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_minmax_nested--Debug]": [
         {
-            "checksum": "49a5dd6d167bd63a29ef9e342d102f3a",
-            "size": 2730,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_all_minmax_nested--Debug_/opt.yql_patched"
+            "checksum": "ce09e4d7b2418ff007bafcadbbe6d02e",
+            "size": 2719,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_all_minmax_nested--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_minmax_nested--Plan]": [
         {
-            "checksum": "449c941f910dbdbfecaac33355f0acea",
-            "size": 5941,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_all_minmax_nested--Plan_/plan.txt"
+            "checksum": "88b98e04135a26960f2c8a1ad8d62335",
+            "size": 5840,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_all_minmax_nested--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_minmax_nested--Results]": [],
     "test.test[blocks-combine_hashed_sum--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_hashed_sum--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_hashed_sum--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_sum--Debug]": [
         {
-            "checksum": "dda68e0d33654e679ca6870438f209f3",
-            "size": 3195,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_hashed_sum--Debug_/opt.yql_patched"
+            "checksum": "a083dd33edce76dc52d5314b6f3c377c",
+            "size": 3184,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_hashed_sum--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_sum--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-combine_hashed_sum--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-combine_hashed_sum--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_sum--Results]": [],
     "test.test[blocks-minmax_strings_filter--Analyze]": [
         {
-            "checksum": "06db77d2249f4ca2c6a3f5a574b69300",
-            "size": 6422,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-minmax_strings_filter--Analyze_/plan.txt"
+            "checksum": "96b8e427563eb2aff7b5d762278b8f3c",
+            "size": 6321,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-minmax_strings_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-minmax_strings_filter--Debug]": [
         {
-            "checksum": "4b0213558f8ada1ff7045f9af134b44a",
-            "size": 3589,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-minmax_strings_filter--Debug_/opt.yql_patched"
+            "checksum": "8fb3a7a4af59f1de64ed4eb4d236f9ae",
+            "size": 3578,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-minmax_strings_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-minmax_strings_filter--Plan]": [
         {
-            "checksum": "06db77d2249f4ca2c6a3f5a574b69300",
-            "size": 6422,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_blocks-minmax_strings_filter--Plan_/plan.txt"
+            "checksum": "96b8e427563eb2aff7b5d762278b8f3c",
+            "size": 6321,
+            "uri": "https://{canondata_backend}/1871182/13cce29fc8b67e5d39a177b7652da47c8b01797a/resource.tar.gz#test.test_blocks-minmax_strings_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-minmax_strings_filter--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
index b87c8f00a01c..a97dbc8c3ba2 100644
--- a/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
@@ -457,45 +457,45 @@
     "test.test[blocks-add_uint64_opt--Results]": [],
     "test.test[blocks-combine_hashed_pg--Analyze]": [
         {
-            "checksum": "b7810045abf9daca638de89aa18c29ba",
-            "size": 6127,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_blocks-combine_hashed_pg--Analyze_/plan.txt"
+            "checksum": "888bcfd5b4b149a6e976e8ae1d1b0806",
+            "size": 6026,
+            "uri": "https://{canondata_backend}/1937429/52f9a8537df2909289575d4d4020fe6214c41fba/resource.tar.gz#test.test_blocks-combine_hashed_pg--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_pg--Debug]": [
         {
-            "checksum": "c2fbddbfb611e85666d477928eeb052e",
-            "size": 5450,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_blocks-combine_hashed_pg--Debug_/opt.yql_patched"
+            "checksum": "5e72a4a23527e107f516f67432a5fa2a",
+            "size": 5439,
+            "uri": "https://{canondata_backend}/1937429/52f9a8537df2909289575d4d4020fe6214c41fba/resource.tar.gz#test.test_blocks-combine_hashed_pg--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_pg--Plan]": [
         {
-            "checksum": "b7810045abf9daca638de89aa18c29ba",
-            "size": 6127,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_blocks-combine_hashed_pg--Plan_/plan.txt"
+            "checksum": "888bcfd5b4b149a6e976e8ae1d1b0806",
+            "size": 6026,
+            "uri": "https://{canondata_backend}/1937429/52f9a8537df2909289575d4d4020fe6214c41fba/resource.tar.gz#test.test_blocks-combine_hashed_pg--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_pg--Results]": [],
     "test.test[blocks-distinct_opt_state_all--Analyze]": [
         {
-            "checksum": "3dd10f7e2305fefebc6822a7d3774c18",
-            "size": 11735,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_blocks-distinct_opt_state_all--Analyze_/plan.txt"
+            "checksum": "abd8ee4af3627092d8fdb4eb3d4463c2",
+            "size": 11432,
+            "uri": "https://{canondata_backend}/1937429/52f9a8537df2909289575d4d4020fe6214c41fba/resource.tar.gz#test.test_blocks-distinct_opt_state_all--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_opt_state_all--Debug]": [
         {
-            "checksum": "f3df16ee4dde043447109ed7785bc619",
-            "size": 8413,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_blocks-distinct_opt_state_all--Debug_/opt.yql_patched"
+            "checksum": "7f319d92f1f2ed44970acdab62c153f3",
+            "size": 8336,
+            "uri": "https://{canondata_backend}/1937429/52f9a8537df2909289575d4d4020fe6214c41fba/resource.tar.gz#test.test_blocks-distinct_opt_state_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-distinct_opt_state_all--Plan]": [
         {
-            "checksum": "3dd10f7e2305fefebc6822a7d3774c18",
-            "size": 11735,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_blocks-distinct_opt_state_all--Plan_/plan.txt"
+            "checksum": "abd8ee4af3627092d8fdb4eb3d4463c2",
+            "size": 11432,
+            "uri": "https://{canondata_backend}/1937429/52f9a8537df2909289575d4d4020fe6214c41fba/resource.tar.gz#test.test_blocks-distinct_opt_state_all--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_opt_state_all--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
index bee87e8e8515..cfbd4de16cdb 100644
--- a/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
@@ -529,67 +529,67 @@
     "test.test[binding-tie_scalar_context-default.txt-Results]": [],
     "test.test[blocks-combine_all_max_filter_opt--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_all_max_filter_opt--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_all_max_filter_opt--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_max_filter_opt--Debug]": [
         {
-            "checksum": "2141938ed4f77e8c033cca0b40313def",
-            "size": 2463,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_all_max_filter_opt--Debug_/opt.yql_patched"
+            "checksum": "13283a641b398a852b60f5d0507b3206",
+            "size": 2452,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_all_max_filter_opt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_max_filter_opt--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_all_max_filter_opt--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_all_max_filter_opt--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_max_filter_opt--Results]": [],
     "test.test[blocks-combine_all_min--Analyze]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_all_min--Analyze_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_all_min--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_min--Debug]": [
         {
-            "checksum": "5274c4f64dfe518366a73434adceac71",
-            "size": 6116,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_all_min--Debug_/opt.yql_patched"
+            "checksum": "70a05f84d155683a6408a5495e6060f0",
+            "size": 6105,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_all_min--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_min--Plan]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_all_min--Plan_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_all_min--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_min--Results]": [],
     "test.test[blocks-combine_hashed_count--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_hashed_count--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_hashed_count--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_count--Debug]": [
         {
-            "checksum": "8aea9947fb4ad06de9e038a672b03693",
-            "size": 3355,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_hashed_count--Debug_/opt.yql_patched"
+            "checksum": "0c5b8444987399aa4ef63071f251f599",
+            "size": 3344,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_hashed_count--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_count--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-combine_hashed_count--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-combine_hashed_count--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_count--Results]": [],
@@ -602,9 +602,9 @@
     ],
     "test.test[blocks-minmax_tuple--Debug]": [
         {
-            "checksum": "fa2288006900f9e039633170fc0e7e94",
-            "size": 4689,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_blocks-minmax_tuple--Debug_/opt.yql_patched"
+            "checksum": "6eb2bebc4d1b00800931841d5d961e51",
+            "size": 4667,
+            "uri": "https://{canondata_backend}/1936947/e3a9b0b31d3aa968ac32ac6538d9fb1e7ba8e5d4/resource.tar.gz#test.test_blocks-minmax_tuple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-minmax_tuple--Plan]": [
@@ -1079,23 +1079,23 @@
     "test.test[in-in_ansi-default.txt-Results]": [],
     "test.test[in-in_ansi_join--Analyze]": [
         {
-            "checksum": "db15f1427906c8501a7ac939a3eca75b",
-            "size": 44204,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_in-in_ansi_join--Analyze_/plan.txt"
+            "checksum": "676943f123c6aba0d0234513938b2695",
+            "size": 43699,
+            "uri": "https://{canondata_backend}/1936842/2efaf15f30b906d1247f2ec0553f1f18fd6acee8/resource.tar.gz#test.test_in-in_ansi_join--Analyze_/plan.txt"
         }
     ],
     "test.test[in-in_ansi_join--Debug]": [
         {
-            "checksum": "071804a90070bc9123b98bd36299a7db",
-            "size": 14513,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_in-in_ansi_join--Debug_/opt.yql_patched"
+            "checksum": "9eca4e67f7d200a747ffc5e1b8886e96",
+            "size": 14480,
+            "uri": "https://{canondata_backend}/1936842/2efaf15f30b906d1247f2ec0553f1f18fd6acee8/resource.tar.gz#test.test_in-in_ansi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_ansi_join--Plan]": [
         {
-            "checksum": "db15f1427906c8501a7ac939a3eca75b",
-            "size": 44204,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_in-in_ansi_join--Plan_/plan.txt"
+            "checksum": "676943f123c6aba0d0234513938b2695",
+            "size": 43699,
+            "uri": "https://{canondata_backend}/1936842/2efaf15f30b906d1247f2ec0553f1f18fd6acee8/resource.tar.gz#test.test_in-in_ansi_join--Plan_/plan.txt"
         }
     ],
     "test.test[in-in_ansi_join--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
index a383c53148f7..73b90c16ff49 100644
--- a/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
@@ -427,23 +427,23 @@
     "test.test[bigdate-compare_big_big-default.txt-Results]": [],
     "test.test[blocks-combine_all_pg--Analyze]": [
         {
-            "checksum": "a2a6e66debfaab7eb150ab9eacf0347c",
-            "size": 6176,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_blocks-combine_all_pg--Analyze_/plan.txt"
+            "checksum": "47c82c4e3e7151597084628a6fdff498",
+            "size": 6075,
+            "uri": "https://{canondata_backend}/1936947/30d3e288b69d24ce83a46c28db27ec5da656c24e/resource.tar.gz#test.test_blocks-combine_all_pg--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_pg--Debug]": [
         {
-            "checksum": "1f2eaddbb7f70320f9b0f6f4a8803a1b",
-            "size": 8020,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_blocks-combine_all_pg--Debug_/opt.yql_patched"
+            "checksum": "fbbef8a7743e2f5d0d8227a8ffeccb94",
+            "size": 8009,
+            "uri": "https://{canondata_backend}/1936947/30d3e288b69d24ce83a46c28db27ec5da656c24e/resource.tar.gz#test.test_blocks-combine_all_pg--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_pg--Plan]": [
         {
-            "checksum": "a2a6e66debfaab7eb150ab9eacf0347c",
-            "size": 6176,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_blocks-combine_all_pg--Plan_/plan.txt"
+            "checksum": "47c82c4e3e7151597084628a6fdff498",
+            "size": 6075,
+            "uri": "https://{canondata_backend}/1936947/30d3e288b69d24ce83a46c28db27ec5da656c24e/resource.tar.gz#test.test_blocks-combine_all_pg--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_pg--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json
index 3dc24329ea2c..5d80cfaa318d 100644
--- a/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json
@@ -482,23 +482,23 @@
     "test.test[blocks-coalesce_complex-default.txt-Results]": [],
     "test.test[blocks-combine_all_count_filter_opt--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_blocks-combine_all_count_filter_opt--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1923547/b16db0b56512bffe4abfb44421d90f4fda46fb29/resource.tar.gz#test.test_blocks-combine_all_count_filter_opt--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_count_filter_opt--Debug]": [
         {
-            "checksum": "57dedcabbdc5938f0a33d39533d5c6fd",
-            "size": 2769,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_blocks-combine_all_count_filter_opt--Debug_/opt.yql_patched"
+            "checksum": "07874915e0dcfb011d72f7b84059ded3",
+            "size": 2758,
+            "uri": "https://{canondata_backend}/1923547/b16db0b56512bffe4abfb44421d90f4fda46fb29/resource.tar.gz#test.test_blocks-combine_all_count_filter_opt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_count_filter_opt--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_blocks-combine_all_count_filter_opt--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1923547/b16db0b56512bffe4abfb44421d90f4fda46fb29/resource.tar.gz#test.test_blocks-combine_all_count_filter_opt--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_count_filter_opt--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part18/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part18/canondata/result.json
index 6e6018b75122..92442be07d7c 100644
--- a/ydb/library/yql/tests/sql/dq_file/part18/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part18/canondata/result.json
@@ -434,23 +434,23 @@
     "test.test[blocks-add_uint64_opt2--Results]": [],
     "test.test[blocks-combine_all_min_filter--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_blocks-combine_all_min_filter--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/212715/2dd017acb97c0e01076153c822feae921cc4820c/resource.tar.gz#test.test_blocks-combine_all_min_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_min_filter--Debug]": [
         {
-            "checksum": "c5cd3d5425eb012d4ea7858558620783",
-            "size": 2430,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_blocks-combine_all_min_filter--Debug_/opt.yql_patched"
+            "checksum": "7d58ce09af458ea3cc78fb687e84fab5",
+            "size": 2419,
+            "uri": "https://{canondata_backend}/212715/2dd017acb97c0e01076153c822feae921cc4820c/resource.tar.gz#test.test_blocks-combine_all_min_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_min_filter--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_blocks-combine_all_min_filter--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/212715/2dd017acb97c0e01076153c822feae921cc4820c/resource.tar.gz#test.test_blocks-combine_all_min_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_min_filter--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
index a763b1479fb6..a65c9617027f 100644
--- a/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
@@ -532,23 +532,23 @@
     "test.test[blocks-add_uint64--Results]": [],
     "test.test[blocks-combine_hashed_max--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-combine_hashed_max--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-combine_hashed_max--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_max--Debug]": [
         {
-            "checksum": "aeb3ba7de6eded70193d0b84d4ec5192",
-            "size": 3140,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-combine_hashed_max--Debug_/opt.yql_patched"
+            "checksum": "31833efa6dedac5375a9cb2613b2b329",
+            "size": 3129,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-combine_hashed_max--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_max--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-combine_hashed_max--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-combine_hashed_max--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_max--Results]": [],
@@ -561,9 +561,9 @@
     ],
     "test.test[blocks-combine_hashed_sum_many_keys--Debug]": [
         {
-            "checksum": "79472a2d4d0269a3913c85c5e7190658",
-            "size": 10374,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-combine_hashed_sum_many_keys--Debug_/opt.yql_patched"
+            "checksum": "7dcb4213ccc934a17d4d0439e43c2543",
+            "size": 10319,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-combine_hashed_sum_many_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_sum_many_keys--Plan]": [
@@ -576,23 +576,23 @@
     "test.test[blocks-combine_hashed_sum_many_keys--Results]": [],
     "test.test[blocks-distinct_mixed_keys--Analyze]": [
         {
-            "checksum": "f004763430e66faaa440cf43989ee19a",
-            "size": 12602,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-distinct_mixed_keys--Analyze_/plan.txt"
+            "checksum": "ad3e608a00da227fb105f229e4ab8956",
+            "size": 12299,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-distinct_mixed_keys--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_mixed_keys--Debug]": [
         {
-            "checksum": "642df3dd69281e69767a83c7e03aba4b",
-            "size": 7868,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-distinct_mixed_keys--Debug_/opt.yql_patched"
+            "checksum": "3f5f5d88f8e32a273df8314fee3bc4ee",
+            "size": 7791,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-distinct_mixed_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-distinct_mixed_keys--Plan]": [
         {
-            "checksum": "f004763430e66faaa440cf43989ee19a",
-            "size": 12602,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_blocks-distinct_mixed_keys--Plan_/plan.txt"
+            "checksum": "ad3e608a00da227fb105f229e4ab8956",
+            "size": 12299,
+            "uri": "https://{canondata_backend}/1871182/a9fec6130ebf2c725dfb5b780cfaf44525bc35bf/resource.tar.gz#test.test_blocks-distinct_mixed_keys--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_mixed_keys--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json
index f5faeb5cf02f..886ae893413d 100644
--- a/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json
@@ -466,23 +466,23 @@
     "test.test[blocks-coalesce_bools--Results]": [],
     "test.test[blocks-combine_all_minmax_double--Analyze]": [
         {
-            "checksum": "5c09c7d91127d9f974d3fb43456f1885",
-            "size": 5942,
-            "uri": "https://{canondata_backend}/1903280/927f0adda78bba191400c48aa84923902c441ddf/resource.tar.gz#test.test_blocks-combine_all_minmax_double--Analyze_/plan.txt"
+            "checksum": "115460d3002bce37093ff28275b47d8b",
+            "size": 5841,
+            "uri": "https://{canondata_backend}/212715/634277b4ef6bfadfbe7095111ad31767e059bf7d/resource.tar.gz#test.test_blocks-combine_all_minmax_double--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_minmax_double--Debug]": [
         {
-            "checksum": "03165552e3b1319fb69ca8cf3e313407",
-            "size": 2537,
-            "uri": "https://{canondata_backend}/1871182/ec5e05fb20f82fd30fb0024d8692db23ea4e134e/resource.tar.gz#test.test_blocks-combine_all_minmax_double--Debug_/opt.yql_patched"
+            "checksum": "dfbefa6916c33a58c1f4fdcfc3055cea",
+            "size": 2526,
+            "uri": "https://{canondata_backend}/212715/634277b4ef6bfadfbe7095111ad31767e059bf7d/resource.tar.gz#test.test_blocks-combine_all_minmax_double--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_minmax_double--Plan]": [
         {
-            "checksum": "5c09c7d91127d9f974d3fb43456f1885",
-            "size": 5942,
-            "uri": "https://{canondata_backend}/1937001/441781d594b64769bedacb579efb911f22209130/resource.tar.gz#test.test_blocks-combine_all_minmax_double--Plan_/plan.txt"
+            "checksum": "115460d3002bce37093ff28275b47d8b",
+            "size": 5841,
+            "uri": "https://{canondata_backend}/212715/634277b4ef6bfadfbe7095111ad31767e059bf7d/resource.tar.gz#test.test_blocks-combine_all_minmax_double--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_minmax_double--Results]": [],
@@ -539,9 +539,9 @@
     ],
     "test.test[blocks-string_as_agg_key--Debug]": [
         {
-            "checksum": "f970da643d15cdd24c6ae3a597b5d56c",
-            "size": 3055,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_blocks-string_as_agg_key--Debug_/opt.yql_patched"
+            "checksum": "7c151f603a9d398e9f3d74a7a113d9d7",
+            "size": 3033,
+            "uri": "https://{canondata_backend}/212715/634277b4ef6bfadfbe7095111ad31767e059bf7d/resource.tar.gz#test.test_blocks-string_as_agg_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-string_as_agg_key--Plan]": [
@@ -2091,23 +2091,23 @@
     "test.test[pg-with-default.txt-Results]": [],
     "test.test[produce-process_streaming_inline_bash-default.txt-Analyze]": [
         {
-            "checksum": "f321b8fb6b412df628cd044a170404b8",
-            "size": 3931,
-            "uri": "https://{canondata_backend}/1942525/74bf94126143e9723be7f582af97f7e4178aca36/resource.tar.gz#test.test_produce-process_streaming_inline_bash-default.txt-Analyze_/plan.txt"
+            "checksum": "6162a55f00076c0fc59f3223b35424e8",
+            "size": 4030,
+            "uri": "https://{canondata_backend}/1936842/f15786b1a2c120b062d233a3acf6481caeba1cc1/resource.tar.gz#test.test_produce-process_streaming_inline_bash-default.txt-Analyze_/plan.txt"
         }
     ],
     "test.test[produce-process_streaming_inline_bash-default.txt-Debug]": [
         {
-            "checksum": "6e5e6901937ae42ce5bb33d8b9cf5750",
-            "size": 2187,
-            "uri": "https://{canondata_backend}/1903885/f67b2df03183908c071df71261aa1e75f9c28d83/resource.tar.gz#test.test_produce-process_streaming_inline_bash-default.txt-Debug_/opt.yql_patched"
+            "checksum": "adeac0502037d0ded3e9a5ceb45aaace",
+            "size": 2196,
+            "uri": "https://{canondata_backend}/1936842/f15786b1a2c120b062d233a3acf6481caeba1cc1/resource.tar.gz#test.test_produce-process_streaming_inline_bash-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[produce-process_streaming_inline_bash-default.txt-Plan]": [
         {
-            "checksum": "f321b8fb6b412df628cd044a170404b8",
-            "size": 3931,
-            "uri": "https://{canondata_backend}/937458/0064e8ff05bc3832d392001e1067a4b8e592ee57/resource.tar.gz#test.test_produce-process_streaming_inline_bash-default.txt-Plan_/plan.txt"
+            "checksum": "6162a55f00076c0fc59f3223b35424e8",
+            "size": 4030,
+            "uri": "https://{canondata_backend}/1936842/f15786b1a2c120b062d233a3acf6481caeba1cc1/resource.tar.gz#test.test_produce-process_streaming_inline_bash-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[produce-process_streaming_inline_bash-default.txt-Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
index ae3c217c85cc..4acee503288b 100644
--- a/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
@@ -442,45 +442,45 @@
     "test.test[binding-table_range_strict_binding-default.txt-Results]": [],
     "test.test[blocks-combine_all_sum_filter_opt--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937367/8e6ed09f9acc0e3323bc0508667d24a148793a51/resource.tar.gz#test.test_blocks-combine_all_sum_filter_opt--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1923547/998d5590be5c2a058a2425f9eb458714764160fb/resource.tar.gz#test.test_blocks-combine_all_sum_filter_opt--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_sum_filter_opt--Debug]": [
         {
-            "checksum": "c66f5bc4c930552da679bcfb3fb4c280",
-            "size": 2463,
-            "uri": "https://{canondata_backend}/1773845/6dfe1800e2f7305bcc37e79c52c3e31cc807ff46/resource.tar.gz#test.test_blocks-combine_all_sum_filter_opt--Debug_/opt.yql_patched"
+            "checksum": "f4a91313230b590429206f4989670016",
+            "size": 2452,
+            "uri": "https://{canondata_backend}/1923547/998d5590be5c2a058a2425f9eb458714764160fb/resource.tar.gz#test.test_blocks-combine_all_sum_filter_opt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_sum_filter_opt--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/937458/432610f205d490984e1977d219cad674f7aad6a5/resource.tar.gz#test.test_blocks-combine_all_sum_filter_opt--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1923547/998d5590be5c2a058a2425f9eb458714764160fb/resource.tar.gz#test.test_blocks-combine_all_sum_filter_opt--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_sum_filter_opt--Results]": [],
     "test.test[blocks-distinct_pure_all--Analyze]": [
         {
-            "checksum": "7b427dd3e47a306292648832f87457b0",
-            "size": 7726,
-            "uri": "https://{canondata_backend}/1937367/8e6ed09f9acc0e3323bc0508667d24a148793a51/resource.tar.gz#test.test_blocks-distinct_pure_all--Analyze_/plan.txt"
+            "checksum": "f8cfbf74b391ef2c46616fd258fdef09",
+            "size": 7524,
+            "uri": "https://{canondata_backend}/1923547/998d5590be5c2a058a2425f9eb458714764160fb/resource.tar.gz#test.test_blocks-distinct_pure_all--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_pure_all--Debug]": [
         {
-            "checksum": "ddd8bd7bdedfaa981851c42b0a69f40d",
-            "size": 3553,
-            "uri": "https://{canondata_backend}/1773845/6dfe1800e2f7305bcc37e79c52c3e31cc807ff46/resource.tar.gz#test.test_blocks-distinct_pure_all--Debug_/opt.yql_patched"
+            "checksum": "0d0f973089ea5c452abef72815e9ca11",
+            "size": 3531,
+            "uri": "https://{canondata_backend}/1923547/998d5590be5c2a058a2425f9eb458714764160fb/resource.tar.gz#test.test_blocks-distinct_pure_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-distinct_pure_all--Plan]": [
         {
-            "checksum": "7b427dd3e47a306292648832f87457b0",
-            "size": 7726,
-            "uri": "https://{canondata_backend}/937458/432610f205d490984e1977d219cad674f7aad6a5/resource.tar.gz#test.test_blocks-distinct_pure_all--Plan_/plan.txt"
+            "checksum": "f8cfbf74b391ef2c46616fd258fdef09",
+            "size": 7524,
+            "uri": "https://{canondata_backend}/1923547/998d5590be5c2a058a2425f9eb458714764160fb/resource.tar.gz#test.test_blocks-distinct_pure_all--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_pure_all--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
index fb6fe2f9018c..abce698865e0 100644
--- a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
@@ -509,23 +509,23 @@
     "test.test[blocks-bitcast_block--Results]": [],
     "test.test[blocks-combine_all_min_filter_opt--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937027/ec284f0d49e0f6e26fe5e8922028ffb903db3bc7/resource.tar.gz#test.test_blocks-combine_all_min_filter_opt--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1936947/054387985deb8808e39d6d8c67dda62dc1fed5c5/resource.tar.gz#test.test_blocks-combine_all_min_filter_opt--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_min_filter_opt--Debug]": [
         {
-            "checksum": "c66f5bc4c930552da679bcfb3fb4c280",
-            "size": 2463,
-            "uri": "https://{canondata_backend}/1936842/7ee2486a6845b4b7ffec39a73b004e1c45c04aba/resource.tar.gz#test.test_blocks-combine_all_min_filter_opt--Debug_/opt.yql_patched"
+            "checksum": "f4a91313230b590429206f4989670016",
+            "size": 2452,
+            "uri": "https://{canondata_backend}/1936947/054387985deb8808e39d6d8c67dda62dc1fed5c5/resource.tar.gz#test.test_blocks-combine_all_min_filter_opt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_min_filter_opt--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937027/17767c14f451959962681cf3d7fdbcfc98a6f63b/resource.tar.gz#test.test_blocks-combine_all_min_filter_opt--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1936947/054387985deb8808e39d6d8c67dda62dc1fed5c5/resource.tar.gz#test.test_blocks-combine_all_min_filter_opt--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_min_filter_opt--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
index 83b77fdafb4c..0ac48205a7ee 100644
--- a/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
@@ -522,67 +522,67 @@
     "test.test[blocks-boolean_ops--Results]": [],
     "test.test[blocks-combine_all_some--Analyze]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1784826/ae144ae65f45caf0cf861d9528ef4fc3e1c5e830/resource.tar.gz#test.test_blocks-combine_all_some--Analyze_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-combine_all_some--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_some--Debug]": [
         {
-            "checksum": "3ec7324ef756c747c9c704534798211a",
-            "size": 5996,
-            "uri": "https://{canondata_backend}/1942100/090fa9e99dfe7f43e6470439372ea4a84a495992/resource.tar.gz#test.test_blocks-combine_all_some--Debug_/opt.yql_patched"
+            "checksum": "483ab8f725b0b84870ff9f553d9a79ee",
+            "size": 5985,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-combine_all_some--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_some--Plan]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1775319/f824086f9aede9fe69b74b082af09c546782c449/resource.tar.gz#test.test_blocks-combine_all_some--Plan_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-combine_all_some--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_some--Results]": [],
     "test.test[blocks-combine_hashed_avg--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/995452/74d0ccad0e1211cb5c60c64be12b2c72c3abeff6/resource.tar.gz#test.test_blocks-combine_hashed_avg--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-combine_hashed_avg--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_avg--Debug]": [
         {
-            "checksum": "dfc7213cd846236b65b9268fc208a773",
-            "size": 3241,
-            "uri": "https://{canondata_backend}/1871182/2359e44c3e789d912e4aa3e550741b97e3a38bc6/resource.tar.gz#test.test_blocks-combine_hashed_avg--Debug_/opt.yql_patched"
+            "checksum": "8fa4d44739811d3d4340db6455472b35",
+            "size": 3230,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-combine_hashed_avg--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_avg--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/995452/74d0ccad0e1211cb5c60c64be12b2c72c3abeff6/resource.tar.gz#test.test_blocks-combine_hashed_avg--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-combine_hashed_avg--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_avg--Results]": [],
     "test.test[blocks-distinct_mixed_all--Analyze]": [
         {
-            "checksum": "8a3fd501613c09965494612a7e48680c",
-            "size": 8084,
-            "uri": "https://{canondata_backend}/1784826/ae144ae65f45caf0cf861d9528ef4fc3e1c5e830/resource.tar.gz#test.test_blocks-distinct_mixed_all--Analyze_/plan.txt"
+            "checksum": "311cfae3c61f4ff1f64980a9e9d2ff56",
+            "size": 7983,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-distinct_mixed_all--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_mixed_all--Debug]": [
         {
-            "checksum": "a24addd54b287ddd12d614d8f8aebf30",
-            "size": 4533,
-            "uri": "https://{canondata_backend}/1942100/090fa9e99dfe7f43e6470439372ea4a84a495992/resource.tar.gz#test.test_blocks-distinct_mixed_all--Debug_/opt.yql_patched"
+            "checksum": "61d099ff94dd07d5ad2954f445f54ee8",
+            "size": 4500,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-distinct_mixed_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-distinct_mixed_all--Plan]": [
         {
-            "checksum": "8a3fd501613c09965494612a7e48680c",
-            "size": 8084,
-            "uri": "https://{canondata_backend}/1775319/f824086f9aede9fe69b74b082af09c546782c449/resource.tar.gz#test.test_blocks-distinct_mixed_all--Plan_/plan.txt"
+            "checksum": "311cfae3c61f4ff1f64980a9e9d2ff56",
+            "size": 7983,
+            "uri": "https://{canondata_backend}/1923547/c08bfc384335550d3f2b1de86b21303aa3cfb8e5/resource.tar.gz#test.test_blocks-distinct_mixed_all--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_mixed_all--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json
index 152cfd3d6b28..262ea0e24138 100644
--- a/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json
@@ -413,45 +413,45 @@
     "test.test[blocks-add_int8--Results]": [],
     "test.test[blocks-combine_all_avg--Analyze]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1937367/43e9598c5fc4f9a8466e4891deda513069430997/resource.tar.gz#test.test_blocks-combine_all_avg--Analyze_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-combine_all_avg--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_avg--Debug]": [
         {
-            "checksum": "e2ff9f3b11cec5765e233516bc306316",
-            "size": 5795,
-            "uri": "https://{canondata_backend}/1942173/8cb2e9ff202d991f0139ff1a33caf9edebd9a1ef/resource.tar.gz#test.test_blocks-combine_all_avg--Debug_/opt.yql_patched"
+            "checksum": "ba50ea4806fc35587690ebb9391e5918",
+            "size": 5784,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-combine_all_avg--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_avg--Plan]": [
         {
-            "checksum": "a78f02942614a04ecd049392f5cd25cb",
-            "size": 5939,
-            "uri": "https://{canondata_backend}/1773845/d2141055cd31d948959dc44b2043b73e0eedb61e/resource.tar.gz#test.test_blocks-combine_all_avg--Plan_/plan.txt"
+            "checksum": "a54e2d8f26ae29ddf377a7cca0303054",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-combine_all_avg--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_avg--Results]": [],
     "test.test[blocks-combine_hashed_count_filter--Analyze]": [
         {
-            "checksum": "1214ef7678530dc58eda15bd2945b720",
-            "size": 6292,
-            "uri": "https://{canondata_backend}/1871182/efe0a2bc19f958c1da6e96c489104c687d90c810/resource.tar.gz#test.test_blocks-combine_hashed_count_filter--Analyze_/plan.txt"
+            "checksum": "85c41d83a2962dcbe8ae4f1c00976b78",
+            "size": 6191,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-combine_hashed_count_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_count_filter--Debug]": [
         {
-            "checksum": "22e13dd892b02d656770daf58274ff97",
-            "size": 2486,
-            "uri": "https://{canondata_backend}/1942100/df74de792696d481595c31cc2454767ac4c954a2/resource.tar.gz#test.test_blocks-combine_hashed_count_filter--Debug_/opt.yql_patched"
+            "checksum": "aa630f2e74b165484cebc8ef59597090",
+            "size": 2475,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-combine_hashed_count_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_count_filter--Plan]": [
         {
-            "checksum": "1214ef7678530dc58eda15bd2945b720",
-            "size": 6292,
-            "uri": "https://{canondata_backend}/1871182/efe0a2bc19f958c1da6e96c489104c687d90c810/resource.tar.gz#test.test_blocks-combine_hashed_count_filter--Plan_/plan.txt"
+            "checksum": "85c41d83a2962dcbe8ae4f1c00976b78",
+            "size": 6191,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-combine_hashed_count_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_count_filter--Results]": [],
@@ -479,23 +479,23 @@
     "test.test[blocks-div_uint64_opt2--Results]": [],
     "test.test[blocks-finalize_hashed_keys--Analyze]": [
         {
-            "checksum": "ad68f716f123f41e64c3c095bcfa6bf9",
-            "size": 6291,
-            "uri": "https://{canondata_backend}/1942173/065c2e1c245422f4597c247fe5aecfb5c9eb331e/resource.tar.gz#test.test_blocks-finalize_hashed_keys--Analyze_/plan.txt"
+            "checksum": "b7b788bd1da8778d9ccce81300fc69b3",
+            "size": 6190,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-finalize_hashed_keys--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-finalize_hashed_keys--Debug]": [
         {
-            "checksum": "d82b53f6e4fe103d3aac2eef513be3ed",
-            "size": 3748,
-            "uri": "https://{canondata_backend}/1784826/837b0487932600ba51f58ab5300b34e847536f72/resource.tar.gz#test.test_blocks-finalize_hashed_keys--Debug_/opt.yql_patched"
+            "checksum": "322bea35aa6c83858016215bd76008ed",
+            "size": 3737,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-finalize_hashed_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-finalize_hashed_keys--Plan]": [
         {
-            "checksum": "ad68f716f123f41e64c3c095bcfa6bf9",
-            "size": 6291,
-            "uri": "https://{canondata_backend}/1942173/065c2e1c245422f4597c247fe5aecfb5c9eb331e/resource.tar.gz#test.test_blocks-finalize_hashed_keys--Plan_/plan.txt"
+            "checksum": "b7b788bd1da8778d9ccce81300fc69b3",
+            "size": 6190,
+            "uri": "https://{canondata_backend}/1775319/92390f67c39a1ef94a630f10c0db4575d964399f/resource.tar.gz#test.test_blocks-finalize_hashed_keys--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-finalize_hashed_keys--Results]": [],
@@ -2241,23 +2241,23 @@
     "test.test[pg-tpch-q14-default.txt-Results]": [],
     "test.test[produce-process_with_assume--Analyze]": [
         {
-            "checksum": "d903397fc8e22a13c726a48ca898fd4e",
-            "size": 6598,
-            "uri": "https://{canondata_backend}/1937027/4364d9c1a2fd8a75275c0923dc5a39644d9937f2/resource.tar.gz#test.test_produce-process_with_assume--Analyze_/plan.txt"
+            "checksum": "3f29bef99abe4b5924e963f404f353a9",
+            "size": 6497,
+            "uri": "https://{canondata_backend}/1871002/59223ec2dccf492ad5e53d9cbcba19f9bfd55043/resource.tar.gz#test.test_produce-process_with_assume--Analyze_/plan.txt"
         }
     ],
     "test.test[produce-process_with_assume--Debug]": [
         {
-            "checksum": "d8078601560a5c572d04cc44d37f7de2",
-            "size": 2844,
-            "uri": "https://{canondata_backend}/1814674/64e60e91443ad3deb3ec9f35bbd96fa975cf27f9/resource.tar.gz#test.test_produce-process_with_assume--Debug_/opt.yql_patched"
+            "checksum": "6e6b8737af71b40a12e927f064996e5f",
+            "size": 2851,
+            "uri": "https://{canondata_backend}/1871002/59223ec2dccf492ad5e53d9cbcba19f9bfd55043/resource.tar.gz#test.test_produce-process_with_assume--Debug_/opt.yql_patched"
         }
     ],
     "test.test[produce-process_with_assume--Plan]": [
         {
-            "checksum": "d903397fc8e22a13c726a48ca898fd4e",
-            "size": 6598,
-            "uri": "https://{canondata_backend}/1871002/3950bb74c159b6b83e3bd9dfd38859b9e3f66858/resource.tar.gz#test.test_produce-process_with_assume--Plan_/plan.txt"
+            "checksum": "3f29bef99abe4b5924e963f404f353a9",
+            "size": 6497,
+            "uri": "https://{canondata_backend}/1871002/59223ec2dccf492ad5e53d9cbcba19f9bfd55043/resource.tar.gz#test.test_produce-process_with_assume--Plan_/plan.txt"
         }
     ],
     "test.test[produce-process_with_assume--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
index b07e9597bc6e..750357cf005a 100644
--- a/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
@@ -411,45 +411,45 @@
     ],
     "test.test[blocks-combine_all_count_filter--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937367/f0fc4d0046eeecd5aedc367d24e7c146f804556a/resource.tar.gz#test.test_blocks-combine_all_count_filter--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1871182/7da3c35b2fdcc3aee38700f812f0ed9f3fd6dd58/resource.tar.gz#test.test_blocks-combine_all_count_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_count_filter--Debug]": [
         {
-            "checksum": "fc1199b3d7c1f232151727c8029d8f76",
-            "size": 2736,
-            "uri": "https://{canondata_backend}/1923547/790a6b0249d542dbba70b1a6973edba84a764c61/resource.tar.gz#test.test_blocks-combine_all_count_filter--Debug_/opt.yql_patched"
+            "checksum": "02b4232cc1416f9bc331bdb7eb01c8d3",
+            "size": 2725,
+            "uri": "https://{canondata_backend}/1871182/7da3c35b2fdcc3aee38700f812f0ed9f3fd6dd58/resource.tar.gz#test.test_blocks-combine_all_count_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_count_filter--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1936997/7795d91e16dc8934afb9cac9de729a7e77d64422/resource.tar.gz#test.test_blocks-combine_all_count_filter--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1871182/7da3c35b2fdcc3aee38700f812f0ed9f3fd6dd58/resource.tar.gz#test.test_blocks-combine_all_count_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_count_filter--Results]": [],
     "test.test[blocks-combine_hashed_minmax_nested--Analyze]": [
         {
-            "checksum": "711a70869b508d0350ca4afc58b794de",
-            "size": 6284,
-            "uri": "https://{canondata_backend}/1889210/56dabc7e6c46a74b942b67fece3bf61cb9bf5077/resource.tar.gz#test.test_blocks-combine_hashed_minmax_nested--Analyze_/plan.txt"
+            "checksum": "02d398d8a9ca08b02b32ec3230b0144b",
+            "size": 6183,
+            "uri": "https://{canondata_backend}/1871182/7da3c35b2fdcc3aee38700f812f0ed9f3fd6dd58/resource.tar.gz#test.test_blocks-combine_hashed_minmax_nested--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_minmax_nested--Debug]": [
         {
-            "checksum": "78277271e4e449b685681c9631b8fb40",
-            "size": 2855,
-            "uri": "https://{canondata_backend}/1814674/00031a3d588b8cce11d04075eeb22d9258841a04/resource.tar.gz#test.test_blocks-combine_hashed_minmax_nested--Debug_/opt.yql_patched"
+            "checksum": "db84e2525eee3b817697848645c2134f",
+            "size": 2844,
+            "uri": "https://{canondata_backend}/1871182/7da3c35b2fdcc3aee38700f812f0ed9f3fd6dd58/resource.tar.gz#test.test_blocks-combine_hashed_minmax_nested--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_minmax_nested--Plan]": [
         {
-            "checksum": "711a70869b508d0350ca4afc58b794de",
-            "size": 6284,
-            "uri": "https://{canondata_backend}/1889210/56dabc7e6c46a74b942b67fece3bf61cb9bf5077/resource.tar.gz#test.test_blocks-combine_hashed_minmax_nested--Plan_/plan.txt"
+            "checksum": "02d398d8a9ca08b02b32ec3230b0144b",
+            "size": 6183,
+            "uri": "https://{canondata_backend}/1871182/7da3c35b2fdcc3aee38700f812f0ed9f3fd6dd58/resource.tar.gz#test.test_blocks-combine_hashed_minmax_nested--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_minmax_nested--Results]": [],
@@ -2129,23 +2129,23 @@
     "test.test[pg-tpcds-q93-default.txt-Results]": [],
     "test.test[produce-process_streaming-default.txt-Analyze]": [
         {
-            "checksum": "1f9a68e4f21d602dc69572c68fe74fcf",
-            "size": 4031,
-            "uri": "https://{canondata_backend}/1784826/01a49f49738931cb8fe58f887acf08cd22b8816f/resource.tar.gz#test.test_produce-process_streaming-default.txt-Analyze_/plan.txt"
+            "checksum": "9196a92b3d4445d0791d0aafd81f2a17",
+            "size": 4130,
+            "uri": "https://{canondata_backend}/1781765/79e3b478a7ff22ae5ad7d4f8b04d16d423583c5d/resource.tar.gz#test.test_produce-process_streaming-default.txt-Analyze_/plan.txt"
         }
     ],
     "test.test[produce-process_streaming-default.txt-Debug]": [
         {
-            "checksum": "f58f5d6e840021367760f1c5f4d0e23b",
-            "size": 2750,
-            "uri": "https://{canondata_backend}/1600758/9ba2749e7133500f3e648797f36fc4ed26bc9a79/resource.tar.gz#test.test_produce-process_streaming-default.txt-Debug_/opt.yql_patched"
+            "checksum": "01c2e1d0cdc82bf32970d80542b7cb11",
+            "size": 2743,
+            "uri": "https://{canondata_backend}/1781765/79e3b478a7ff22ae5ad7d4f8b04d16d423583c5d/resource.tar.gz#test.test_produce-process_streaming-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[produce-process_streaming-default.txt-Plan]": [
         {
-            "checksum": "1f9a68e4f21d602dc69572c68fe74fcf",
-            "size": 4031,
-            "uri": "https://{canondata_backend}/1925821/6aa17395400a3fafbb1eacfdd2dd26ec26994660/resource.tar.gz#test.test_produce-process_streaming-default.txt-Plan_/plan.txt"
+            "checksum": "9196a92b3d4445d0791d0aafd81f2a17",
+            "size": 4130,
+            "uri": "https://{canondata_backend}/1781765/79e3b478a7ff22ae5ad7d4f8b04d16d423583c5d/resource.tar.gz#test.test_produce-process_streaming-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[produce-process_streaming-default.txt-Results]": [],
@@ -2262,9 +2262,9 @@
     ],
     "test.test[select-exists_false-default.txt-Debug]": [
         {
-            "checksum": "4e48332c19161da5d89dc2560e7b46de",
-            "size": 1933,
-            "uri": "https://{canondata_backend}/995452/e78675a82a4300d32887a13f4b9e86cb1608f590/resource.tar.gz#test.test_select-exists_false-default.txt-Debug_/opt.yql_patched"
+            "checksum": "19379ebccbf5bc5faec4c6af82d2671a",
+            "size": 1922,
+            "uri": "https://{canondata_backend}/1781765/79e3b478a7ff22ae5ad7d4f8b04d16d423583c5d/resource.tar.gz#test.test_select-exists_false-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[select-exists_false-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
index 0938e0cc5652..89ceedb24bbd 100644
--- a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
@@ -616,67 +616,67 @@
     "test.test[blocks-coalesce_ints--Results]": [],
     "test.test[blocks-combine_all_avg_filter_opt--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/212715/05112758aa31c86216a47b30fa10eee1e52db258/resource.tar.gz#test.test_blocks-combine_all_avg_filter_opt--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_all_avg_filter_opt--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_avg_filter_opt--Debug]": [
         {
-            "checksum": "6729390dc8dfb74ecdd639ba20ea6b4d",
-            "size": 2728,
-            "uri": "https://{canondata_backend}/1689644/90acca9b171ecce398f65b70b237cc25e6006718/resource.tar.gz#test.test_blocks-combine_all_avg_filter_opt--Debug_/opt.yql_patched"
+            "checksum": "19feae322071f393e7088b6181bac68c",
+            "size": 2717,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_all_avg_filter_opt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_avg_filter_opt--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937429/21da85bae1b4363f9d35ac14bdb3122767615cb5/resource.tar.gz#test.test_blocks-combine_all_avg_filter_opt--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_all_avg_filter_opt--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_avg_filter_opt--Results]": [],
     "test.test[blocks-combine_all_max_filter--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/212715/05112758aa31c86216a47b30fa10eee1e52db258/resource.tar.gz#test.test_blocks-combine_all_max_filter--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_all_max_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_max_filter--Debug]": [
         {
-            "checksum": "0e69278ea5839364527db16d558ba557",
-            "size": 2430,
-            "uri": "https://{canondata_backend}/1689644/90acca9b171ecce398f65b70b237cc25e6006718/resource.tar.gz#test.test_blocks-combine_all_max_filter--Debug_/opt.yql_patched"
+            "checksum": "91756e3b5dcedf7d826972872725788d",
+            "size": 2419,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_all_max_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_max_filter--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937429/21da85bae1b4363f9d35ac14bdb3122767615cb5/resource.tar.gz#test.test_blocks-combine_all_max_filter--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_all_max_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_max_filter--Results]": [],
     "test.test[blocks-combine_hashed_some--Analyze]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1871102/97fc4bb329052eea459b99a9212d5fd9f5e3b882/resource.tar.gz#test.test_blocks-combine_hashed_some--Analyze_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_hashed_some--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_some--Debug]": [
         {
-            "checksum": "f4c1ab3082edc56508be387241a7a94c",
-            "size": 3152,
-            "uri": "https://{canondata_backend}/212715/0e4292247771ef99c03e98f51557169b30ec3ac7/resource.tar.gz#test.test_blocks-combine_hashed_some--Debug_/opt.yql_patched"
+            "checksum": "b95d87bbdcf8c600847d396d0a94652f",
+            "size": 3141,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_hashed_some--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_hashed_some--Plan]": [
         {
-            "checksum": "522ef6289aa4d54583c701d52584242e",
-            "size": 6285,
-            "uri": "https://{canondata_backend}/1871102/97fc4bb329052eea459b99a9212d5fd9f5e3b882/resource.tar.gz#test.test_blocks-combine_hashed_some--Plan_/plan.txt"
+            "checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
+            "size": 6184,
+            "uri": "https://{canondata_backend}/1880306/acc4424db02558241eb5db30a79a97893e87052f/resource.tar.gz#test.test_blocks-combine_hashed_some--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_hashed_some--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part9/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part9/canondata/result.json
index 39a95d33a3a7..38a4a7f510a7 100644
--- a/ydb/library/yql/tests/sql/dq_file/part9/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part9/canondata/result.json
@@ -395,45 +395,45 @@
     "test.test[bigdate-compare_big_small-default.txt-Results]": [],
     "test.test[blocks-combine_all_count--Analyze]": [
         {
-            "checksum": "35812d610de14e7b225de16a803ffd8b",
-            "size": 5969,
-            "uri": "https://{canondata_backend}/1937027/0366696fd0201dfaa1aecd3d2cb555d7273bb4cf/resource.tar.gz#test.test_blocks-combine_all_count--Analyze_/plan.txt"
+            "checksum": "b08931c7aa8e1842fc9f0ca8ec03f15c",
+            "size": 5868,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-combine_all_count--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_count--Debug]": [
         {
-            "checksum": "d0cd0669c6acb83b7d1cf95e91773c62",
-            "size": 3614,
-            "uri": "https://{canondata_backend}/1773845/a8743d46d6a422f39c74078a0a2da2d286cc02e1/resource.tar.gz#test.test_blocks-combine_all_count--Debug_/opt.yql_patched"
+            "checksum": "11e9a1571f1eb5655e166d33584016d2",
+            "size": 3603,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-combine_all_count--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_count--Plan]": [
         {
-            "checksum": "35812d610de14e7b225de16a803ffd8b",
-            "size": 5969,
-            "uri": "https://{canondata_backend}/1773845/4844b06fb73477a0ce945a8d2e558a686cbcbf98/resource.tar.gz#test.test_blocks-combine_all_count--Plan_/plan.txt"
+            "checksum": "b08931c7aa8e1842fc9f0ca8ec03f15c",
+            "size": 5868,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-combine_all_count--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_count--Results]": [],
     "test.test[blocks-combine_all_sum_filter--Analyze]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1937027/0366696fd0201dfaa1aecd3d2cb555d7273bb4cf/resource.tar.gz#test.test_blocks-combine_all_sum_filter--Analyze_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-combine_all_sum_filter--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_sum_filter--Debug]": [
         {
-            "checksum": "550ad9a1cce6a4cfc92d6618d32a8df5",
-            "size": 2430,
-            "uri": "https://{canondata_backend}/1773845/a8743d46d6a422f39c74078a0a2da2d286cc02e1/resource.tar.gz#test.test_blocks-combine_all_sum_filter--Debug_/opt.yql_patched"
+            "checksum": "2d8087e82389d151c7c95ac54f3a9e95",
+            "size": 2419,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-combine_all_sum_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-combine_all_sum_filter--Plan]": [
         {
-            "checksum": "3b810917db78e02e7b143f91a28a9c11",
-            "size": 5976,
-            "uri": "https://{canondata_backend}/1773845/4844b06fb73477a0ce945a8d2e558a686cbcbf98/resource.tar.gz#test.test_blocks-combine_all_sum_filter--Plan_/plan.txt"
+            "checksum": "f465fa6073c392ef44e4307515033931",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-combine_all_sum_filter--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-combine_all_sum_filter--Results]": [],
@@ -461,45 +461,45 @@
     "test.test[blocks-compare--Results]": [],
     "test.test[blocks-distinct_pure_keys--Analyze]": [
         {
-            "checksum": "c6c1dcb0136d0886f4bcca0ca63ec20d",
-            "size": 12449,
-            "uri": "https://{canondata_backend}/1597364/4fd790118cc9dd4384e4e24ff6720ae1bd037f49/resource.tar.gz#test.test_blocks-distinct_pure_keys--Analyze_/plan.txt"
+            "checksum": "5e1de58d0919160a3eb561a9fc51645d",
+            "size": 12146,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-distinct_pure_keys--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_pure_keys--Debug]": [
         {
-            "checksum": "688c2a48ddaa1db8d5f7f019c56b2096",
-            "size": 7161,
-            "uri": "https://{canondata_backend}/1784117/2ec3fa5042632ad5577d0eb6df5189fb4b34c0d3/resource.tar.gz#test.test_blocks-distinct_pure_keys--Debug_/opt.yql_patched"
+            "checksum": "8e19bd4c478f4e521c6612041e26ffe4",
+            "size": 7095,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-distinct_pure_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-distinct_pure_keys--Plan]": [
         {
-            "checksum": "c6c1dcb0136d0886f4bcca0ca63ec20d",
-            "size": 12449,
-            "uri": "https://{canondata_backend}/1597364/2656ba412a63d44e32e4bebf5594e865181de671/resource.tar.gz#test.test_blocks-distinct_pure_keys--Plan_/plan.txt"
+            "checksum": "5e1de58d0919160a3eb561a9fc51645d",
+            "size": 12146,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-distinct_pure_keys--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-distinct_pure_keys--Results]": [],
     "test.test[blocks-group_by_complex_key--Analyze]": [
         {
-            "checksum": "ffa7ee6645c7b657b521457f550a6f40",
-            "size": 6655,
-            "uri": "https://{canondata_backend}/1784117/2ec3fa5042632ad5577d0eb6df5189fb4b34c0d3/resource.tar.gz#test.test_blocks-group_by_complex_key--Analyze_/plan.txt"
+            "checksum": "18574cd0858bb929cf8769841bcd54f7",
+            "size": 6554,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-group_by_complex_key--Analyze_/plan.txt"
         }
     ],
     "test.test[blocks-group_by_complex_key--Debug]": [
         {
-            "checksum": "39d122e7d69247aa1ab471c81ac7be5f",
-            "size": 3402,
-            "uri": "https://{canondata_backend}/1784117/2ec3fa5042632ad5577d0eb6df5189fb4b34c0d3/resource.tar.gz#test.test_blocks-group_by_complex_key--Debug_/opt.yql_patched"
+            "checksum": "fd44da7c1b357bd22b75edb2e0f5f7f6",
+            "size": 3391,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-group_by_complex_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[blocks-group_by_complex_key--Plan]": [
         {
-            "checksum": "ffa7ee6645c7b657b521457f550a6f40",
-            "size": 6655,
-            "uri": "https://{canondata_backend}/1925842/47670c9d4278f49c6c2c221526bfa17be0641e20/resource.tar.gz#test.test_blocks-group_by_complex_key--Plan_/plan.txt"
+            "checksum": "18574cd0858bb929cf8769841bcd54f7",
+            "size": 6554,
+            "uri": "https://{canondata_backend}/1937429/1763173b0cec14ad78c3b1decd4a6cde577193ac/resource.tar.gz#test.test_blocks-group_by_complex_key--Plan_/plan.txt"
         }
     ],
     "test.test[blocks-group_by_complex_key--Results]": [],