Added support for PG into CBO (#2399)

57 files changed, 3853 insertions, 2310 deletions

diff --git a/ydb/core/kqp/opt/kqp_query_plan.cpp b/ydb/core/kqp/opt/kqp_query_plan.cpp
index 08d8428db73..42ca14165d8 100644
--- a/ydb/core/kqp/opt/kqp_query_plan.cpp
+++ b/ydb/core/kqp/opt/kqp_query_plan.cpp
@@ -1394,6 +1394,7 @@ private:
 
         TOperator op;
         op.Properties["Name"] = name;
+        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames());
 
         auto operatorId = AddOperator(planNode, name, std::move(op));
 
@@ -1409,7 +1410,7 @@ private:
 
         TOperator op;
         op.Properties["Name"] = name;
-
+        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames());
         AddOptimizerEstimates(op, join);
 
         return AddOperator(planNode, name, std::move(op));
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_log_join.cpp b/ydb/core/kqp/opt/logical/kqp_opt_log_join.cpp
index 47affa3e19b..68c64cef1de 100644
--- a/ydb/core/kqp/opt/logical/kqp_opt_log_join.cpp
+++ b/ydb/core/kqp/opt/logical/kqp_opt_log_join.cpp
@@ -147,6 +147,11 @@ bool IsKqlPureExpr(const TExprBase& expr) {
 TDqJoin FlipLeftSemiJoin(const TDqJoin& join, TExprContext& ctx) {
     Y_DEBUG_ABORT_UNLESS(join.JoinType().Value() == "LeftSemi");
 
+    TVector<TCoAtom> leftJoinKeyNames;
+    leftJoinKeyNames.reserve(join.JoinKeys().Size());
+    TVector<TCoAtom> rightJoinKeyNames;
+    rightJoinKeyNames.reserve(join.JoinKeys().Size());
+
     auto joinKeysBuilder = Build<TDqJoinKeyTupleList>(ctx, join.Pos());
     for (const auto& keys : join.JoinKeys()) {
         joinKeysBuilder.Add<TDqJoinKeyTuple>()
@@ -155,6 +160,8 @@ TDqJoin FlipLeftSemiJoin(const TDqJoin& join, TExprContext& ctx) {
             .RightLabel(keys.LeftLabel())
             .RightColumn(keys.LeftColumn())
             .Build();
+        leftJoinKeyNames.emplace_back(keys.RightColumn());
+        rightJoinKeyNames.emplace_back(keys.LeftColumn());
     }
 
     return Build<TDqJoin>(ctx, join.Pos())
@@ -164,6 +171,10 @@ TDqJoin FlipLeftSemiJoin(const TDqJoin& join, TExprContext& ctx) {
         .RightLabel(join.LeftLabel())
         .JoinType().Build("RightSemi")
         .JoinKeys(joinKeysBuilder.Done())
+        .LeftJoinKeyNames()
+            .Add(leftJoinKeyNames).Build()
+        .RightJoinKeyNames()
+            .Add(rightJoinKeyNames).Build()
         .Done();
 }
 
@@ -835,6 +846,8 @@ TMaybeNode<TExprBase> KqpJoinToIndexLookupImpl(const TDqJoin& join, TExprContext
         .RightLabel(join.RightLabel())
         .JoinType(join.JoinType())
         .JoinKeys(join.JoinKeys())
+        .LeftJoinKeyNames(join.LeftJoinKeyNames())
+        .RightJoinKeyNames(join.RightJoinKeyNames())
         .Done();
 }
 
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_log_sqlin_compact.cpp b/ydb/core/kqp/opt/logical/kqp_opt_log_sqlin_compact.cpp
index 5c4cc7b39ff..20d1871741f 100644
--- a/ydb/core/kqp/opt/logical/kqp_opt_log_sqlin_compact.cpp
+++ b/ydb/core/kqp/opt/logical/kqp_opt_log_sqlin_compact.cpp
@@ -120,6 +120,12 @@ TExprBase KqpRewriteSqlInCompactToJoin(const TExprBase& node, TExprContext& ctx)
         .Value(leftLabelStr)
         .Done().Ptr();
 
+    TVector<TCoAtom> leftJoinKeyNames;
+    TVector<TCoAtom> rightJoinKeyNames;
+
+    leftJoinKeyNames.emplace_back(leftColumn);
+    rightJoinKeyNames.emplace_back(rightColumn);
+
     auto joinKeys = Build<TDqJoinKeyTupleList>(ctx, node.Pos())
         .Add<TDqJoinKeyTuple>()
             .LeftLabel(leftLabel)
@@ -149,6 +155,12 @@ TExprBase KqpRewriteSqlInCompactToJoin(const TExprBase& node, TExprContext& ctx)
             .Value("LeftSemi")
             .Build()
         .JoinKeys(joinKeys)
+        .LeftJoinKeyNames()
+            .Add(leftJoinKeyNames)
+            .Build()
+        .RightJoinKeyNames()
+            .Add(rightJoinKeyNames)
+            .Build()
         .Done();
 
     // Convert column names back, i.e. leftLabel.ColumnName -> ColumnName
diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.cpp b/ydb/core/kqp/ut/common/kqp_ut_common.cpp
index aae707cd630..d38cf385a17 100644
--- a/ydb/core/kqp/ut/common/kqp_ut_common.cpp
+++ b/ydb/core/kqp/ut/common/kqp_ut_common.cpp
@@ -70,6 +70,7 @@ SIMPLE_MODULE(TTestUdfsModule, TTestFilter, TTestFilterTerminate, TRandString);
 NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateJson2Module();
 NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateRe2Module();
 NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateStringModule();
+NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateDateTime2Module();
 
 NMiniKQL::IFunctionRegistry* UdfFrFactory(const NScheme::TTypeRegistry& typeRegistry) {
     Y_UNUSED(typeRegistry);
@@ -78,6 +79,7 @@ NMiniKQL::IFunctionRegistry* UdfFrFactory(const NScheme::TTypeRegistry& typeRegi
     funcRegistry->AddModule("", "Json2", CreateJson2Module());
     funcRegistry->AddModule("", "Re2", CreateRe2Module());
     funcRegistry->AddModule("", "String", CreateStringModule());
+    funcRegistry->AddModule("", "DateTime", CreateDateTime2Module());
     NKikimr::NMiniKQL::FillStaticModules(*funcRegistry);
     return funcRegistry.Release();
 }
diff --git a/ydb/core/kqp/ut/join/kqp_join_order_ut.cpp b/ydb/core/kqp/ut/join/kqp_join_order_ut.cpp
index 227ec78d615..96a43569ffe 100644
--- a/ydb/core/kqp/ut/join/kqp_join_order_ut.cpp
+++ b/ydb/core/kqp/ut/join/kqp_join_order_ut.cpp
@@ -176,6 +176,552 @@ CREATE TABLE `/Root/supplier` (
 )
 ;)").GetValueSync().IsSuccess());
 
+    UNIT_ASSERT(session.ExecuteSchemeQuery(R"(
+create table `/Root/test/ds/customer_address`
+(
+    ca_address_sk             Int64               not null,
+    ca_address_id             String              not null,
+    ca_street_number          String                      ,
+    ca_street_name            String                   ,
+    ca_street_type            String                      ,
+    ca_suite_number           String                      ,
+    ca_city                   String                   ,
+    ca_county                 String                   ,
+    ca_state                  String                       ,
+    ca_zip                    String                      ,
+    ca_country                String                   ,
+    ca_gmt_offset             Double                  ,
+    ca_location_type          String                      ,
+    primary key (ca_address_sk)
+);
+
+create table `/Root/test/ds/customer_demographics`
+(
+    cd_demo_sk                Int64               not null,
+    cd_gender                 String                       ,
+    cd_marital_status         String                       ,
+    cd_education_status       String                      ,
+    cd_purchase_estimate      Int64                       ,
+    cd_credit_rating          String                      ,
+    cd_dep_count              Int64                       ,
+    cd_dep_employed_count     Int64                       ,
+    cd_dep_college_count      Int64                       ,
+    primary key (cd_demo_sk)
+);
+
+create table `/Root/test/ds/date_dim`
+(
+    d_date_sk                 Int64               not null,
+    d_date_id                 String              not null,
+    d_date                    Date                          ,
+    d_month_seq               Int64                       ,
+    d_week_seq                Int64                       ,
+    d_quarter_seq             Int64                       ,
+    d_year                    Int64                       ,
+    d_dow                     Int64                       ,
+    d_moy                     Int64                       ,
+    d_dom                     Int64                       ,
+    d_qoy                     Int64                       ,
+    d_fy_year                 Int64                       ,
+    d_fy_quarter_seq          Int64                       ,
+    d_fy_week_seq             Int64                       ,
+    d_day_name                String                       ,
+    d_quarter_name            String                       ,
+    d_holiday                 String                       ,
+    d_weekend                 String                       ,
+    d_following_holiday       String                       ,
+    d_first_dom               Int64                       ,
+    d_last_dom                Int64                       ,
+    d_same_day_ly             Int64                       ,
+    d_same_day_lq             Int64                       ,
+    d_current_day             String                       ,
+    d_current_week            String                       ,
+    d_current_month           String                       ,
+    d_current_quarter         String                       ,
+    d_current_year            String                       ,
+    primary key (d_date_sk)
+);
+
+create table `/Root/test/ds/warehouse`
+(
+    w_warehouse_sk            Int64               not null,
+    w_warehouse_id            String              not null,
+    w_warehouse_name          String                   ,
+    w_warehouse_sq_ft         Int64                       ,
+    w_street_number           String                      ,
+    w_street_name             String                   ,
+    w_street_type             String                      ,
+    w_suite_number            String                      ,
+    w_city                    String                   ,
+    w_county                  String                   ,
+    w_state                   String                       ,
+    w_zip                     String                      ,
+    w_country                 String                   ,
+    w_gmt_offset              Double                  ,
+    primary key (w_warehouse_sk)
+);
+
+create table `/Root/test/ds/ship_mode`
+(
+    sm_ship_mode_sk           Int64               not null,
+    sm_ship_mode_id           String              not null,
+    sm_type                   String                      ,
+    sm_code                   String                      ,
+    sm_carrier                String                      ,
+    sm_contract               String                      ,
+    primary key (sm_ship_mode_sk)
+);
+
+create table `/Root/test/ds/time_dim`
+(
+    t_time_sk                 Int64               not null,
+    t_time_id                 String              not null,
+    t_time                    Int64                       ,
+    t_hour                    Int64                       ,
+    t_minute                  Int64                       ,
+    t_second                  Int64                       ,
+    t_am_pm                   String                       ,
+    t_shift                   String                      ,
+    t_sub_shift               String                      ,
+    t_meal_time               String                      ,
+    primary key (t_time_sk)
+);
+
+create table `/Root/test/ds/reason`
+(
+    r_reason_sk               Int64               not null,
+    r_reason_id               String              not null,
+    r_reason_desc             String                     ,
+    primary key (r_reason_sk)
+);
+
+create table `/Root/test/ds/income_band`
+(
+    ib_income_band_sk         Int64               not null,
+    ib_lower_bound            Int64                       ,
+    ib_upper_bound            Int64                       ,
+    primary key (ib_income_band_sk)
+);
+
+create table `/Root/test/ds/item`
+(
+    i_item_sk                 Int64               not null,
+    i_item_id                 String              not null,
+    i_rec_start_date          Date                          ,
+    i_rec_end_date            Date                          ,
+    i_item_desc               String                  ,
+    i_current_price           Double                  ,
+    i_wholesale_cost          Double                  ,
+    i_brand_id                Int64                       ,
+    i_brand                   String                      ,
+    i_class_id                Int64                       ,
+    i_class                   String                      ,
+    i_category_id             Int64                       ,
+    i_category                String                      ,
+    i_manufact_id             Int64                       ,
+    i_manufact                String                      ,
+    i_size                    String                      ,
+    i_formulation             String                      ,
+    i_color                   String                      ,
+    i_units                   String                      ,
+    i_container               String                      ,
+    i_manager_id              Int64                       ,
+    i_product_name            String                      ,
+    primary key (i_item_sk)
+);
+
+create table `/Root/test/ds/store`
+(
+    s_store_sk                Int64               not null,
+    s_store_id                String              not null,
+    s_rec_start_date          Date                          ,
+    s_rec_end_date            Date                          ,
+    s_closed_date_sk          Int64                       ,
+    s_store_name              String                   ,
+    s_number_employees        Int64                       ,
+    s_floor_space             Int64                       ,
+    s_hours                   String                      ,
+    s_manager                 String                   ,
+    s_market_id               Int64                       ,
+    s_geography_class         String                  ,
+    s_market_desc             String                  ,
+    s_market_manager          String                   ,
+    s_division_id             Int64                       ,
+    s_division_name           String                   ,
+    s_company_id              Int64                       ,
+    s_company_name            String                   ,
+    s_street_number           String                   ,
+    s_street_name             String                   ,
+    s_street_type             String                      ,
+    s_suite_number            String                      ,
+    s_city                    String                   ,
+    s_county                  String                   ,
+    s_state                   String                       ,
+    s_zip                     String                      ,
+    s_country                 String                   ,
+    s_gmt_offset              Double                  ,
+    s_tax_precentage          Double                  ,
+    primary key (s_store_sk)
+);
+
+create table `/Root/test/ds/call_center`
+(
+    cc_call_center_sk         Int64               not null,
+    cc_call_center_id         String              not null,
+    cc_rec_start_date         Date                          ,
+    cc_rec_end_date           Date                          ,
+    cc_closed_date_sk         Int64                       ,
+    cc_open_date_sk           Int64                       ,
+    cc_name                   String                   ,
+    cc_class                  String                   ,
+    cc_employees              Int64                       ,
+    cc_sq_ft                  Int64                       ,
+    cc_hours                  String                      ,
+    cc_manager                String                   ,
+    cc_mkt_id                 Int64                       ,
+    cc_mkt_class              String                      ,
+    cc_mkt_desc               String                  ,
+    cc_market_manager         String                   ,
+    cc_division               Int64                       ,
+    cc_division_name          String                   ,
+    cc_company                Int64                       ,
+    cc_company_name           String                      ,
+    cc_street_number          String                      ,
+    cc_street_name            String                   ,
+    cc_street_type            String                      ,
+    cc_suite_number           String                      ,
+    cc_city                   String                   ,
+    cc_county                 String                   ,
+    cc_state                  String                       ,
+    cc_zip                    String                      ,
+    cc_country                String                   ,
+    cc_gmt_offset             Double                  ,
+    cc_tax_percentage         Double                  ,
+    primary key (cc_call_center_sk)
+);
+
+create table `/Root/test/ds/customer`
+(
+    c_customer_sk             Int64               not null,
+    c_customer_id             String              not null,
+    c_current_cdemo_sk        Int64                       ,
+    c_current_hdemo_sk        Int64                       ,
+    c_current_addr_sk         Int64                       ,
+    c_first_shipto_date_sk    Int64                       ,
+    c_first_sales_date_sk     Int64                       ,
+    c_salutation              String                      ,
+    c_first_name              String                      ,
+    c_last_name               String                      ,
+    c_preferred_cust_flag     String                       ,
+    c_birth_day               Int64                       ,
+    c_birth_month             Int64                       ,
+    c_birth_year              Int64                       ,
+    c_birth_country           String                   ,
+    c_login                   String                      ,
+    c_email_address           String                      ,
+    c_last_review_date        String                      ,
+    primary key (c_customer_sk)
+);
+
+create table `/Root/test/ds/web_site`
+(
+    web_site_sk               Int64               not null,
+    web_site_id               String              not null,
+    web_rec_start_date        Date                          ,
+    web_rec_end_date          Date                          ,
+    web_name                  String                   ,
+    web_open_date_sk          Int64                       ,
+    web_close_date_sk         Int64                       ,
+    web_class                 String                   ,
+    web_manager               String                   ,
+    web_mkt_id                Int64                       ,
+    web_mkt_class             String                   ,
+    web_mkt_desc              String                  ,
+    web_market_manager        String                   ,
+    web_company_id            Int64                       ,
+    web_company_name          String                      ,
+    web_street_number         String                      ,
+    web_street_name           String                   ,
+    web_street_type           String                      ,
+    web_suite_number          String                      ,
+    web_city                  String                   ,
+    web_county                String                   ,
+    web_state                 String                       ,
+    web_zip                   String                      ,
+    web_country               String                   ,
+    web_gmt_offset            Double                  ,
+    web_tax_percentage        Double                  ,
+    primary key (web_site_sk)
+);
+
+create table `/Root/test/ds/store_returns`
+(
+    sr_returned_date_sk       Int64                       ,
+    sr_return_time_sk         Int64                       ,
+    sr_item_sk                Int64               not null,
+    sr_customer_sk            Int64                       ,
+    sr_cdemo_sk               Int64                       ,
+    sr_hdemo_sk               Int64                       ,
+    sr_addr_sk                Int64                       ,
+    sr_store_sk               Int64                       ,
+    sr_reason_sk              Int64                       ,
+    sr_ticket_number          Int64               not null,
+    sr_return_quantity        Int64                       ,
+    sr_return_amt             Double                  ,
+    sr_return_tax             Double                  ,
+    sr_return_amt_inc_tax     Double                  ,
+    sr_fee                    Double                  ,
+    sr_return_ship_cost       Double                  ,
+    sr_refunded_cash          Double                  ,
+    sr_reversed_charge        Double                  ,
+    sr_store_credit           Double                  ,
+    sr_net_loss               Double                  ,
+    primary key (sr_item_sk, sr_ticket_number)
+);
+
+create table `/Root/test/ds/household_demographics`
+(
+    hd_demo_sk                Int64               not null,
+    hd_income_band_sk         Int64                       ,
+    hd_buy_potential          String                      ,
+    hd_dep_count              Int64                       ,
+    hd_vehicle_count          Int64                       ,
+    primary key (hd_demo_sk)
+);
+
+create table `/Root/test/ds/web_page`
+(
+    wp_web_page_sk            Int64               not null,
+    wp_web_page_id            String              not null,
+    wp_rec_start_date         Date                          ,
+    wp_rec_end_date           Date                          ,
+    wp_creation_date_sk       Int64                       ,
+    wp_access_date_sk         Int64                       ,
+    wp_autogen_flag           String                       ,
+    wp_customer_sk            Int64                       ,
+    wp_url                    String                  ,
+    wp_type                   String                      ,
+    wp_char_count             Int64                       ,
+    wp_link_count             Int64                       ,
+    wp_image_count            Int64                       ,
+    wp_max_ad_count           Int64                       ,
+    primary key (wp_web_page_sk)
+);
+
+create table `/Root/test/ds/promotion`
+(
+    p_promo_sk                Int64               not null,
+    p_promo_id                String              not null,
+    p_start_date_sk           Int64                       ,
+    p_end_date_sk             Int64                       ,
+    p_item_sk                 Int64                       ,
+    p_cost                    Double                 ,
+    p_response_target         Int64                       ,
+    p_promo_name              String                      ,
+    p_channel_dmail           String                       ,
+    p_channel_email           String                       ,
+    p_channel_catalog         String                       ,
+    p_channel_tv              String                       ,
+    p_channel_radio           String                       ,
+    p_channel_press           String                       ,
+    p_channel_event           String                       ,
+    p_channel_demo            String                       ,
+    p_channel_details         String                  ,
+    p_purpose                 String                      ,
+    p_discount_active         String                       ,
+    primary key (p_promo_sk)
+);
+
+create table `/Root/test/ds/catalog_page`
+(
+    cp_catalog_page_sk        Int64               not null,
+    cp_catalog_page_id        String              not null,
+    cp_start_date_sk          Int64                       ,
+    cp_end_date_sk            Int64                       ,
+    cp_department             String                   ,
+    cp_catalog_number         Int64                       ,
+    cp_catalog_page_number    Int64                       ,
+    cp_description            String                  ,
+    cp_type                   String                  ,
+    primary key (cp_catalog_page_sk)
+);
+
+create table `/Root/test/ds/inventory`
+(
+    inv_date_sk               Int64               not null,
+    inv_item_sk               Int64               not null,
+    inv_warehouse_sk          Int64               not null,
+    inv_quantity_on_hand      Int64                       ,
+    primary key (inv_date_sk, inv_item_sk, inv_warehouse_sk)
+);
+
+create table `/Root/test/ds/catalog_returns`
+(
+    cr_returned_date_sk       Int64                       ,
+    cr_returned_time_sk       Int64                       ,
+    cr_item_sk                Int64               not null,
+    cr_refunded_customer_sk   Int64                       ,
+    cr_refunded_cdemo_sk      Int64                       ,
+    cr_refunded_hdemo_sk      Int64                       ,
+    cr_refunded_addr_sk       Int64                       ,
+    cr_returning_customer_sk  Int64                       ,
+    cr_returning_cdemo_sk     Int64                       ,
+    cr_returning_hdemo_sk     Int64                       ,
+    cr_returning_addr_sk      Int64                       ,
+    cr_call_center_sk         Int64                       ,
+    cr_catalog_page_sk        Int64                       ,
+    cr_ship_mode_sk           Int64                       ,
+    cr_warehouse_sk           Int64                       ,
+    cr_reason_sk              Int64                       ,
+    cr_order_number           Int64               not null,
+    cr_return_quantity        Int64                       ,
+    cr_return_amount          Double                  ,
+    cr_return_tax             Double                  ,
+    cr_return_amt_inc_tax     Double                  ,
+    cr_fee                    Double                  ,
+    cr_return_ship_cost       Double                  ,
+    cr_refunded_cash          Double                  ,
+    cr_reversed_charge        Double                  ,
+    cr_store_credit           Double                  ,
+    cr_net_loss               Double                  ,
+    primary key (cr_item_sk, cr_order_number)
+);
+
+create table `/Root/test/ds/web_returns`
+(
+    wr_returned_date_sk       Int64                       ,
+    wr_returned_time_sk       Int64                       ,
+    wr_item_sk                Int64               not null,
+    wr_refunded_customer_sk   Int64                       ,
+    wr_refunded_cdemo_sk      Int64                       ,
+    wr_refunded_hdemo_sk      Int64                       ,
+    wr_refunded_addr_sk       Int64                       ,
+    wr_returning_customer_sk  Int64                       ,
+    wr_returning_cdemo_sk     Int64                       ,
+    wr_returning_hdemo_sk     Int64                       ,
+    wr_returning_addr_sk      Int64                       ,
+    wr_web_page_sk            Int64                       ,
+    wr_reason_sk              Int64                       ,
+    wr_order_number           Int64               not null,
+    wr_return_quantity        Int64                       ,
+    wr_return_amt             Double                  ,
+    wr_return_tax             Double                  ,
+    wr_return_amt_inc_tax     Double                  ,
+    wr_fee                    Double                  ,
+    wr_return_ship_cost       Double                  ,
+    wr_refunded_cash          Double                  ,
+    wr_reversed_charge        Double                  ,
+    wr_account_credit         Double                  ,
+    wr_net_loss               Double                  ,
+    primary key (wr_item_sk, wr_order_number)
+);
+
+create table `/Root/test/ds/web_sales`
+(
+    ws_sold_date_sk           Int64                       ,
+    ws_sold_time_sk           Int64                       ,
+    ws_ship_date_sk           Int64                       ,
+    ws_item_sk                Int64               not null,
+    ws_bill_customer_sk       Int64                       ,
+    ws_bill_cdemo_sk          Int64                       ,
+    ws_bill_hdemo_sk          Int64                       ,
+    ws_bill_addr_sk           Int64                       ,
+    ws_ship_customer_sk       Int64                       ,
+    ws_ship_cdemo_sk          Int64                       ,
+    ws_ship_hdemo_sk          Int64                       ,
+    ws_ship_addr_sk           Int64                       ,
+    ws_web_page_sk            Int64                       ,
+    ws_web_site_sk            Int64                       ,
+    ws_ship_mode_sk           Int64                       ,
+    ws_warehouse_sk           Int64                       ,
+    ws_promo_sk               Int64                       ,
+    ws_order_number           Int64               not null,
+    ws_quantity               Int64                       ,
+    ws_wholesale_cost         Double                  ,
+    ws_list_price             Double                  ,
+    ws_sales_price            Double                  ,
+    ws_ext_discount_amt       Double                  ,
+    ws_ext_sales_price        Double                  ,
+    ws_ext_wholesale_cost     Double                  ,
+    ws_ext_list_price         Double                  ,
+    ws_ext_tax                Double                  ,
+    ws_coupon_amt             Double                  ,
+    ws_ext_ship_cost          Double                  ,
+    ws_net_paid               Double                  ,
+    ws_net_paid_inc_tax       Double                  ,
+    ws_net_paid_inc_ship      Double                  ,
+    ws_net_paid_inc_ship_tax  Double                  ,
+    ws_net_profit             Double                  ,
+    primary key (ws_item_sk, ws_order_number)
+);
+
+create table `/Root/test/ds/catalog_sales`
+(
+    cs_sold_date_sk           Int64                       ,
+    cs_sold_time_sk           Int64                       ,
+    cs_ship_date_sk           Int64                       ,
+    cs_bill_customer_sk       Int64                       ,
+    cs_bill_cdemo_sk          Int64                       ,
+    cs_bill_hdemo_sk          Int64                       ,
+    cs_bill_addr_sk           Int64                       ,
+    cs_ship_customer_sk       Int64                       ,
+    cs_ship_cdemo_sk          Int64                       ,
+    cs_ship_hdemo_sk          Int64                       ,
+    cs_ship_addr_sk           Int64                       ,
+    cs_call_center_sk         Int64                       ,
+    cs_catalog_page_sk        Int64                       ,
+    cs_ship_mode_sk           Int64                       ,
+    cs_warehouse_sk           Int64                       ,
+    cs_item_sk                Int64               not null,
+    cs_promo_sk               Int64                       ,
+    cs_order_number           Int64               not null,
+    cs_quantity               Int64                       ,
+    cs_wholesale_cost         Double                  ,
+    cs_list_price             Double                  ,
+    cs_sales_price            Double                  ,
+    cs_ext_discount_amt       Double                  ,
+    cs_ext_sales_price        Double                  ,
+    cs_ext_wholesale_cost     Double                  ,
+    cs_ext_list_price         Double                  ,
+    cs_ext_tax                Double                  ,
+    cs_coupon_amt             Double                  ,
+    cs_ext_ship_cost          Double                  ,
+    cs_net_paid               Double                  ,
+    cs_net_paid_inc_tax       Double                  ,
+    cs_net_paid_inc_ship      Double                  ,
+    cs_net_paid_inc_ship_tax  Double                  ,
+    cs_net_profit             Double                  ,
+    primary key (cs_item_sk, cs_order_number)
+);
+
+create table `/Root/test/ds/store_sales`
+(
+    ss_sold_date_sk           Int64                       ,
+    ss_sold_time_sk           Int64                       ,
+    ss_item_sk                Int64               not null,
+    ss_customer_sk            Int64                       ,
+    ss_cdemo_sk               Int64                       ,
+    ss_hdemo_sk               Int64                       ,
+    ss_addr_sk                Int64                       ,
+    ss_store_sk               Int64                       ,
+    ss_promo_sk               Int64                       ,
+    ss_ticket_number          Int64               not null,
+    ss_quantity               Int64                       ,
+    ss_wholesale_cost         Double                  ,
+    ss_list_price             Double                  ,
+    ss_sales_price            Double                  ,
+    ss_ext_discount_amt       Double                  ,
+    ss_ext_sales_price        Double                  ,
+    ss_ext_wholesale_cost     Double                  ,
+    ss_ext_list_price         Double                  ,
+    ss_ext_tax                Double                  ,
+    ss_coupon_amt             Double                  ,
+    ss_net_paid               Double                  ,
+    ss_net_paid_inc_tax       Double                  ,
+    ss_net_profit             Double                  ,
+    primary key (ss_item_sk, ss_ticket_number)
+);)").GetValueSync().IsSuccess());
+
 }
 
 static TKikimrRunner GetKikimrWithJoinSettings(){
@@ -184,13 +730,17 @@ static TKikimrRunner GetKikimrWithJoinSettings(){
     NKikimrKqp::TKqpSetting setting;
    
     setting.SetName("CostBasedOptimizationLevel");
-    setting.SetValue("1");
+    setting.SetValue("2");
     settings.push_back(setting);
 
     setting.SetName("OptEnableConstantFolding");
     setting.SetValue("true");
     settings.push_back(setting);
 
+    //setting.SetName("HashJoinMode");
+    //setting.SetValue("grace");
+    //settings.push_back(setting);
+
     return TKikimrRunner(settings);
 }
 
@@ -562,6 +1112,248 @@ Y_UNIT_TEST_SUITE(KqpJoinOrder) {
         }
     }
 
+    Y_UNIT_TEST(TPCH2) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+PRAGMA ydb.HashJoinMode='grace';
+
+-- TPC-H/TPC-R Minimum Cost Supplier Query (Q2)
+-- using 1680793381 as a seed to the RNG
+
+$r = (select r_regionkey from
+    `/Root/region`
+where r_name='AMERICA');
+
+$j1 = (select n_name,n_nationkey
+    from `/Root/nation` as n
+    join $r as r on
+    n.n_regionkey = r.r_regionkey);
+
+$j2 = (select s_acctbal,s_name,s_address,s_phone,s_comment,n_name,s_suppkey
+    from `/Root/supplier` as s
+    join $j1 as j on
+    s.s_nationkey = j.n_nationkey
+);
+
+$j3 = (select ps_partkey,ps_supplycost,s_acctbal,s_name,s_address,s_phone,s_comment,n_name
+    from `/Root/partsupp` as ps
+    join $j2 as j on
+    ps.ps_suppkey = j.s_suppkey
+);
+
+$min_ps_supplycost = (select min(ps_supplycost) as min_ps_supplycost,ps_partkey
+    from $j3
+    group by ps_partkey
+);
+
+$p = (select p_partkey,p_mfgr
+    from `/Root/part`
+    where
+    p_size = 10
+    and p_type like '%COPPER'
+);
+
+$j4 = (select s_acctbal,
+    s_name,
+    n_name,
+    p_partkey,
+    p_mfgr,
+    s_address,
+    s_phone,
+    s_comment
+    from $p as p
+    join $j3 as j on p.p_partkey = j.ps_partkey
+    join $min_ps_supplycost as m on p.p_partkey = m.ps_partkey
+    where min_ps_supplycost=ps_supplycost
+);
+
+select
+    s_acctbal,
+    s_name,
+    n_name,
+    p_partkey,
+    p_mfgr,
+    s_address,
+    s_phone,
+    s_comment
+from $j4
+order by
+    s_acctbal desc,
+    n_name,
+    s_name,
+    p_partkey
+limit 100;
+)");
+
+            TStreamExecScanQuerySettings settings;
+            settings.Explain(true);
+
+            auto it = kikimr.GetTableClient().StreamExecuteScanQuery(query, settings).ExtractValueSync();
+            auto res = CollectStreamResult(it);
+
+            Cout << *res.PlanJson;
+        }
+    }
+
+    Y_UNIT_TEST(TPCH9) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+PRAGMA ydb.HashJoinMode='grace';
+
+$p = (select p_partkey, p_name
+from
+    `/Root/part`
+where FIND(p_name, 'rose') IS NOT NULL);
+
+$j1 = (select ps_partkey, ps_suppkey, ps_supplycost
+from
+    `/Root/partsupp` as ps
+join $p as p
+on ps.ps_partkey = p.p_partkey);
+
+$j2 = (select l_suppkey, l_partkey, l_orderkey, l_extendedprice, l_discount, ps_supplycost, l_quantity
+from
+    `/Root/lineitem` as l
+join $j1 as j
+on l.l_suppkey = j.ps_suppkey AND l.l_partkey = j.ps_partkey);
+
+$j3 = (select l_orderkey, s_nationkey, l_extendedprice, l_discount, ps_supplycost, l_quantity
+from
+    `/Root/supplier` as s
+join $j2 as j
+on j.l_suppkey = s.s_suppkey);
+
+$j4 = (select o_orderdate, l_extendedprice, l_discount, ps_supplycost, l_quantity, s_nationkey
+from
+    `/Root/orders` as o
+join $j3 as j
+on o.o_orderkey = j.l_orderkey);
+
+$j5 = (select n_name, o_orderdate, l_extendedprice, l_discount, ps_supplycost, l_quantity
+from
+    `/Root/nation` as n
+join $j4 as j
+on j.s_nationkey = n.n_nationkey
+);
+
+$profit = (select 
+    n_name as nation,
+    DateTime::GetYear(cast(o_orderdate as timestamp)) as o_year,
+    l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity as amount
+from $j5);
+
+select
+    nation,
+    o_year,
+    sum(amount) as sum_profit
+from $profit
+group by
+    nation,
+    o_year
+order by
+    nation,
+    o_year desc;
+    )");
+
+            TStreamExecScanQuerySettings settings;
+            settings.Explain(true);
+
+            auto it = kikimr.GetTableClient().StreamExecuteScanQuery(query, settings).ExtractValueSync();
+            auto res = CollectStreamResult(it);
+
+            Cout << *res.PlanJson;
+        }
+    }
+
+    Y_UNIT_TEST(TPCH3) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+                $join1 = (
+select
+    c.c_mktsegment as c_mktsegment,
+    o.o_orderdate as o_orderdate,
+    o.o_shippriority as o_shippriority,
+    o.o_orderkey as o_orderkey
+from
+     `/Root/customer` as c
+join
+     `/Root/orders` as o
+on
+    c.c_custkey = o.o_custkey
+);
+
+$join2 = (
+select
+    j1.c_mktsegment as c_mktsegment,
+    j1.o_orderdate as o_orderdate,
+    j1.o_shippriority as o_shippriority,
+    l.l_orderkey as l_orderkey,
+    l.l_discount as l_discount,
+    l.l_shipdate as l_shipdate,
+    l.l_extendedprice as l_extendedprice
+from
+    $join1 as j1
+join
+    `/Root/lineitem` as l
+on
+    l.l_orderkey = j1.o_orderkey
+);
+
+select
+    l_orderkey,
+    sum(l_extendedprice * (1 - l_discount)) as revenue,
+    o_orderdate,
+    o_shippriority
+from
+    $join2
+where
+    c_mktsegment = 'MACHINERY'
+    and CAST(o_orderdate AS Timestamp) < Date('1995-03-08')
+    and CAST(l_shipdate AS Timestamp) > Date('1995-03-08')
+group by
+    l_orderkey,
+    o_orderdate,
+    o_shippriority
+order by
+    revenue desc,
+    o_orderdate
+limit 10;
+                )");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }
+    }
+
     Y_UNIT_TEST(TPCH21) {
 
         auto kikimr = GetKikimrWithJoinSettings();
@@ -949,6 +1741,498 @@ order by
             Cout << result.GetPlan();
         }        
     }
+
+    Y_UNIT_TEST(TPCDS16) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+
+-- NB: Subquerys
+$orders_with_several_warehouses = (
+    select cs_order_number
+    from `/Root/test/ds/catalog_sales`
+    group by cs_order_number
+    having count(distinct cs_warehouse_sk) > 1
+);
+
+-- start query 1 in stream 0 using template query16.tpl and seed 171719422
+select
+   count(distinct cs1.cs_order_number) as `order count`
+  ,sum(cs_ext_ship_cost) as `total shipping cost`
+  ,sum(cs_net_profit) as `total net profit`
+from
+   `/Root/test/ds/catalog_sales` cs1
+  cross join `/Root/test/ds/date_dim`
+  cross join `/Root/test/ds/customer_address`
+  cross join `/Root/test/ds/call_center`
+  left semi join $orders_with_several_warehouses cs2 on cs1.cs_order_number = cs2.cs_order_number
+  left only join `/Root/test/ds/catalog_returns` cr1 on cs1.cs_order_number = cr1.cr_order_number
+where
+    cast(d_date as date) between cast('1999-4-01' as date) and
+           (cast('1999-4-01' as date) + DateTime::IntervalFromDays(60))
+and cs1.cs_ship_date_sk = d_date_sk
+and cs1.cs_ship_addr_sk = ca_address_sk
+and ca_state = 'IL'
+and cs1.cs_call_center_sk = cc_call_center_sk
+and cc_county in ('Richland County','Bronx County','Maverick County','Mesa County',
+                  'Raleigh County'
+)
+order by `order count`
+limit 100;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
+    Y_UNIT_TEST(TPCDS61) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+
+-- NB: Subquerys
+-- start query 1 in stream 0 using template query61.tpl and seed 1930872976
+select  promotions,total,cast(promotions as float)/cast(total as float)*100
+from
+  (select sum(ss_ext_sales_price) promotions
+   from  store_sales
+        cross join store
+        cross join promotion
+        cross join date_dim
+        cross join customer
+        cross join customer_address
+        cross join item
+   where ss_sold_date_sk = d_date_sk
+   and   ss_store_sk = s_store_sk
+   and   ss_promo_sk = p_promo_sk
+   and   ss_customer_sk= c_customer_sk
+   and   ca_address_sk = c_current_addr_sk
+   and   ss_item_sk = i_item_sk
+   and   ca_gmt_offset = -6
+   and   i_category = 'Sports'
+   and   (p_channel_dmail = 'Y' or p_channel_email = 'Y' or p_channel_tv = 'Y')
+   and   s_gmt_offset = -6
+   and   d_year = 2001
+   and   d_moy  = 12) promotional_sales cross join
+  (select sum(ss_ext_sales_price) total
+   from  store_sales
+        cross join store
+        cross join date_dim
+        cross join customer
+        cross join customer_address
+        cross join item
+   where ss_sold_date_sk = d_date_sk
+   and   ss_store_sk = s_store_sk
+   and   ss_customer_sk= c_customer_sk
+   and   ca_address_sk = c_current_addr_sk
+   and   ss_item_sk = i_item_sk
+   and   ca_gmt_offset = -6
+   and   i_category = 'Sports'
+   and   s_gmt_offset = -6
+   and   d_year = 2001
+   and   d_moy  = 12) all_sales
+order by promotions, total
+limit 100;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+    
+    Y_UNIT_TEST(TPCDS92) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+
+$bla = (
+         SELECT
+         web_sales.ws_item_sk bla_item_sk,
+            avg(ws_ext_discount_amt)  bla_ext_discount_amt
+         FROM
+            web_sales
+           cross join date_dim
+         WHERE
+        cast(d_date as date) between cast('2001-03-12' as date) and
+                             (cast('2001-03-12' as date) + DateTime::IntervalFromDays(90))
+          and d_date_sk = ws_sold_date_sk
+          group by web_sales.ws_item_sk
+      );
+
+-- start query 1 in stream 0 using template query92.tpl and seed 2031708268
+select
+   sum(ws_ext_discount_amt)  as `Excess Discount Amount`
+from
+    web_sales
+   cross join item
+   cross join date_dim
+   join $bla bla on (item.i_item_sk = bla.bla_item_sk)
+where
+i_manufact_id = 356
+and i_item_sk = ws_item_sk
+and cast(d_date as date) between cast('2001-03-12' as date) and
+        (cast('2001-03-12' as date) + DateTime::IntervalFromDays(90))
+and d_date_sk = ws_sold_date_sk
+and ws_ext_discount_amt
+     > 1.3 * bla.bla_ext_discount_amt
+order by `Excess Discount Amount`
+limit 100;
+
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
+    Y_UNIT_TEST(TPCDS94) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+
+-- NB: Subquerys
+$bla1 = (select ws_order_number
+            from web_sales
+              group by ws_order_number
+              having COUNT(DISTINCT ws_warehouse_sk) > 1);
+
+-- start query 1 in stream 0 using template query94.tpl and seed 2031708268
+select
+   count(distinct ws1.ws_order_number) as `order count`
+  ,sum(ws_ext_ship_cost) as `total shipping cost`
+  ,sum(ws_net_profit) as `total net profit`
+from
+   web_sales ws1
+  cross join date_dim
+  cross join customer_address
+  cross join web_site
+  left semi join $bla1 bla1 on (ws1.ws_order_number = bla1.ws_order_number)
+  left only join web_returns on (ws1.ws_order_number = web_returns.wr_order_number)
+where
+    cast(d_date as date) between cast('1999-4-01' as date) and
+           (cast('1999-4-01' as date) + DateTime::IntervalFromDays(60))
+and ws1.ws_ship_date_sk = d_date_sk
+and ws1.ws_ship_addr_sk = ca_address_sk
+and ca_state = 'NE'
+and ws1.ws_web_site_sk = web_site_sk
+and web_company_name = 'pri'
+order by `order count`
+limit 100;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
+    Y_UNIT_TEST(TPCDS95) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+-- NB: Subquerys
+$ws_wh =
+(select ws1.ws_order_number ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from web_sales ws1 cross join web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk);
+-- start query 1 in stream 0 using template query95.tpl and seed 2031708268
+ select
+   count(distinct ws1.ws_order_number) as `order count`
+  ,sum(ws_ext_ship_cost) as `total shipping cost`
+  ,sum(ws_net_profit) as `total net profit`
+from
+   web_sales ws1
+  cross join date_dim
+  cross join customer_address
+  cross join web_site
+where
+    cast(d_date as date) between cast('2002-4-01' as date) and
+           (cast('2002-4-01' as date) + DateTime::IntervalFromDays(60))
+and ws1.ws_ship_date_sk = d_date_sk
+and ws1.ws_ship_addr_sk = ca_address_sk
+and ca_state = 'AL'
+and ws1.ws_web_site_sk = web_site_sk
+and web_company_name = 'pri'
+and ws1.ws_order_number in (select ws_order_number
+                            from $ws_wh)
+and ws1.ws_order_number in (select wr_order_number
+                            from web_returns cross join $ws_wh ws_wh
+                            where wr_order_number = ws_wh.ws_order_number)
+order by `order count`
+limit 100;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
+    Y_UNIT_TEST(TPCDS96) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+-- NB: Subquerys
+-- start query 1 in stream 0 using template query96.tpl and seed 1819994127
+select  count(*) bla
+from store_sales
+    cross join household_demographics
+    cross join time_dim cross join store
+where ss_sold_time_sk = time_dim.t_time_sk
+    and ss_hdemo_sk = household_demographics.hd_demo_sk
+    and ss_store_sk = s_store_sk
+    and time_dim.t_hour = 16
+    and time_dim.t_minute >= 30
+    and household_demographics.hd_dep_count = 6
+    and store.s_store_name = 'ese'
+order by bla
+limit 100;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
+    Y_UNIT_TEST(TPCDS88) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+-- NB: Subquerys
+-- start query 1 in stream 0 using template query88.tpl and seed 318176889
+select  *
+from
+ (select count(*) h8_30_to_9
+ from store_sales cross join household_demographics cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 8
+     and time_dim.t_minute >= 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s1 cross join
+ (select count(*) h9_to_9_30
+ from store_sales cross join household_demographics cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 9
+     and time_dim.t_minute < 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s2 cross join
+ (select count(*) h9_30_to_10
+ from store_sales cross join household_demographics cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 9
+     and time_dim.t_minute >= 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s3 cross join
+ (select count(*) h10_to_10_30
+ from store_sales cross join household_demographics cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 10
+     and time_dim.t_minute < 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s4 cross join
+ (select count(*) h10_30_to_11
+ from store_sales cross join household_demographics  cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 10
+     and time_dim.t_minute >= 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s5 cross join
+ (select count(*) h11_to_11_30
+ from store_sales cross join household_demographics cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 11
+     and time_dim.t_minute < 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s6 cross join
+ (select count(*) h11_30_to_12
+ from store_sales cross join household_demographics cross join time_dim cross join store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 11
+     and time_dim.t_minute >= 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s7 cross join
+ (select count(*) h12_to_12_30
+ from store_sales cross join household_demographics cross join time_dim cross join  store
+ where ss_sold_time_sk = time_dim.t_time_sk
+     and ss_hdemo_sk = household_demographics.hd_demo_sk
+     and ss_store_sk = s_store_sk
+     and time_dim.t_hour = 12
+     and time_dim.t_minute < 30
+     and ((household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or
+          (household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or
+          (household_demographics.hd_dep_count = 3 and household_demographics.hd_vehicle_count<=3+2))
+     and store.s_store_name = 'ese') s8
+;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
+    Y_UNIT_TEST(TPCDS90) {
+
+        auto kikimr = GetKikimrWithJoinSettings();
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        CreateSampleTable(session);
+
+        /* join with parameters */
+        {
+            const TString query = Q_(R"(
+pragma TablePathPrefix = "/Root/test/ds/";
+-- NB: Subquerys
+-- start query 1 in stream 0 using template query90.tpl and seed 2031708268
+select  cast(amc as decimal(15,4))/cast(pmc as decimal(15,4)) am_pm_ratio
+ from ( select count(*) amc
+       from web_sales cross join household_demographics cross join time_dim cross join web_page
+       where ws_sold_time_sk = time_dim.t_time_sk
+         and ws_ship_hdemo_sk = household_demographics.hd_demo_sk
+         and ws_web_page_sk = web_page.wp_web_page_sk
+         and time_dim.t_hour between 9 and 9+1
+         and household_demographics.hd_dep_count = 3
+         and web_page.wp_char_count between 5000 and 5200) at cross join
+      ( select count(*) pmc
+       from web_sales cross join household_demographics cross join time_dim cross join web_page
+       where ws_sold_time_sk = time_dim.t_time_sk
+         and ws_ship_hdemo_sk = household_demographics.hd_demo_sk
+         and ws_web_page_sk = web_page.wp_web_page_sk
+         and time_dim.t_hour between 16 and 16+1
+         and household_demographics.hd_dep_count = 3
+         and web_page.wp_char_count between 5000 and 5200) pt
+ order by am_pm_ratio
+ limit 100;
+)");
+
+            auto result = session.ExplainDataQuery(query).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
+
+            NJson::TJsonValue plan;
+            NJson::ReadJsonTree(result.GetPlan(), &plan, true);
+            Cout << result.GetPlan();
+        }        
+    }
+
 }
 }
 }
diff --git a/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json b/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json
index bfd51393f3a..eaff205f767 100644
--- a/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json
+++ b/ydb/library/yql/core/expr_nodes/yql_expr_nodes.json
@@ -1585,7 +1585,9 @@
                 {"Index": 4, "Name": "RightKeysColumns", "Type": "TCoAtomList"},
                 {"Index": 5, "Name": "LeftRenames", "Type": "TCoAtomList"},
                 {"Index": 6, "Name": "RightRenames", "Type": "TCoAtomList"},
-                {"Index": 7, "Name": "Flags", "Type": "TCoAtomList"}
+                {"Index": 7, "Name": "LeftKeysColumnNames", "Type": "TCoAtomList"},
+                {"Index": 8, "Name": "RightKeysColumnNames", "Type": "TCoAtomList"},  
+                {"Index": 9, "Name": "Flags", "Type": "TCoAtomList"}
             ]
         },
         {
@@ -1599,7 +1601,9 @@
                 {"Index": 3, "Name": "RightKeysColumns", "Type": "TCoAtomList"},
                 {"Index": 4, "Name": "LeftRenames", "Type": "TCoAtomList"},
                 {"Index": 5, "Name": "RightRenames", "Type": "TCoAtomList"},
-                {"Index": 6, "Name": "Flags", "Type": "TCoAtomList"}
+                {"Index": 6, "Name": "LeftKeysColumnNames", "Type": "TCoAtomList"},
+                {"Index": 7, "Name": "RightKeysColumnNames", "Type": "TCoAtomList"}, 
+                {"Index": 8, "Name": "Flags", "Type": "TCoAtomList"}
             ]
         },
         {
diff --git a/ydb/library/yql/core/type_ann/type_ann_join.cpp b/ydb/library/yql/core/type_ann/type_ann_join.cpp
index cfe98decdae..4b380cf621d 100644
--- a/ydb/library/yql/core/type_ann/type_ann_join.cpp
+++ b/ydb/library/yql/core/type_ann/type_ann_join.cpp
@@ -632,7 +632,7 @@ namespace NTypeAnnImpl {
     }
 
     IGraphTransformer::TStatus GraceJoinCoreWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx) {
-        if (!EnsureArgsCount(*input, 8, ctx.Expr)) {
+        if (!EnsureArgsCount(*input, 10, ctx.Expr)) {
             return IGraphTransformer::TStatus::Error;
         }
 
@@ -662,7 +662,7 @@ namespace NTypeAnnImpl {
     }
 
     IGraphTransformer::TStatus GraceSelfJoinCoreWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx) {
-        if (!EnsureArgsCount(*input, 7, ctx.Expr)) {
+        if (!EnsureArgsCount(*input, 9, ctx.Expr)) {
             return IGraphTransformer::TStatus::Error;
         }
 
diff --git a/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp b/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp
index 6055c3b46b9..f3421a50fb6 100644
--- a/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp
+++ b/ydb/library/yql/core/ut/yql_expr_constraint_ut.cpp
@@ -1699,7 +1699,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'Inner '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '()))
+    (let join (GraceJoinCore flow1 flow2 'Inner '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lk lv rk rs rv) (AsStruct '('lk lk) '('lv lv) '('rk rk) '('rs rs) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -1742,7 +1742,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'Left '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '()))
+    (let join (GraceJoinCore flow1 flow2 'Left '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lk lv rk rs rv) (AsStruct '('lk lk) '('lv lv) '('rk rk) '('rs rs) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -1785,7 +1785,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'Full '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '()))
+    (let join (GraceJoinCore flow1 flow2 'Full '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lk lv rk rs rv) (AsStruct '('lk lk) '('lv lv) '('rk rk) '('rs rs) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -1828,7 +1828,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'Right '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '()))
+    (let join (GraceJoinCore flow1 flow2 'Right '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lk lv rk rs rv) (AsStruct '('lk lk) '('lv lv) '('rk rk) '('rs rs) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -1871,7 +1871,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'Exclusion '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '()))
+    (let join (GraceJoinCore flow1 flow2 'Exclusion '('0 '1) '('0 '1) '('0 '0 '2 '1) '('0 '2 '1 '3 '2 '4) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lk lv rk rs rv) (AsStruct '('lk lk) '('lv lv) '('rk rk) '('rs rs) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -1914,7 +1914,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'LeftSemi '('0 '1) '('0 '1) '('0 '2 '1 '1 '2 '0) '() '()))
+    (let join (GraceJoinCore flow1 flow2 'LeftSemi '('0 '1) '('0 '1) '('0 '2 '1 '1 '2 '0) '() '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lv ls lk) (AsStruct '('lk lk) '('lv lv) '('ls ls))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -1957,7 +1957,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'LeftOnly '('0 '1) '('0 '1) '('0 '1 '2 '0) '() '()))
+    (let join (GraceJoinCore flow1 flow2 'LeftOnly '('0 '1) '('0 '1) '('0 '1 '2 '0) '() '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(lv lk) (AsStruct '('lk lk) '('lv lv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2001,7 +2001,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'RightOnly '('0 '1) '('0 '1) '() '('0 '2 '1 '1 '2 '0) '()))
+    (let join (GraceJoinCore flow1 flow2 'RightOnly '('0 '1) '('0 '1) '() '('0 '2 '1 '1 '2 '0) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(rv rs rk) (AsStruct '('rk rk) '('rv rv) '('rs rs))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2044,7 +2044,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'RightSemi '('0 '1) '('0 '1) '() '('0 '1 '2 '0) '()))
+    (let join (GraceJoinCore flow1 flow2 'RightSemi '('0 '1) '('0 '1) '() '('0 '1 '2 '0) '() '() '()))
     (let list (Collect (NarrowMap join (lambda '(rv rk) (AsStruct '('rk rk) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
@@ -2087,7 +2087,7 @@ Y_UNIT_TEST_SUITE(TYqlExprConstraints) {
     (let flow1 (ExpandMap (ToFlow list1) (lambda '(item) (Member item 'key1) (Member item 'subkey1) (Member item 'value1))))
     (let flow2 (ExpandMap (ToFlow list2) (lambda '(item) (Member item 'key2) (Member item 'subkey2) (Member item 'value2))))
 
-    (let join (GraceJoinCore flow1 flow2 'Inner '('0 '1) '('0 '1) '('0 '0 '1 '1 '2 '2) '('0 '3 '1 '4 '2 '5) '('LeftAny 'RightAny)))
+    (let join (GraceJoinCore flow1 flow2 'Inner '('0 '1) '('0 '1) '('0 '0 '1 '1 '2 '2) '('0 '3 '1 '4 '2 '5) '() '() '('LeftAny 'RightAny)))
     (let list (Collect (NarrowMap join (lambda '(lk ls lv rk rs rv) (AsStruct '('lk lk) '('ls ls) '('lv lv) '('rk rk) '('rs rs) '('rv rv))))))
 
     (let res_sink (DataSink 'yt (quote plato)))
diff --git a/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.json b/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.json
index 0f65090e45f..10856e7a8f8 100644
--- a/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.json
+++ b/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.json
@@ -33,7 +33,9 @@
             {"Index": 3, "Name": "RightLabel", "Type": "TExprBase",
                 "NB": "Atom - if right is real table, Void - otherwise"},
             {"Index": 4, "Name": "JoinType", "Type": "TCoAtom"},
-            {"Index": 5, "Name": "JoinKeys", "Type": "TDqJoinKeyTupleList"}
+            {"Index": 5, "Name": "JoinKeys", "Type": "TDqJoinKeyTupleList"},
+            {"Index": 6, "Name": "LeftJoinKeyNames", "Type": "TCoAtomList"},
+            {"Index": 7, "Name": "RightJoinKeyNames", "Type": "TCoAtomList"}
         ]
     },
     {
@@ -41,7 +43,7 @@
         "Base": "TDqJoinBase",
         "Match": {"Type": "Callable", "Name": "DqJoin"},
         "Children": [
-            {"Index": 6, "Name": "Flags", "Type": "TCoAtomList", "Optional": true}
+            {"Index": 8, "Name": "Flags", "Type": "TCoAtomList", "Optional": true}
         ]
     },
     {
diff --git a/ydb/library/yql/dq/opt/dq_opt_join.cpp b/ydb/library/yql/dq/opt/dq_opt_join.cpp
index 5e08072f012..84b8e999ec4 100644
--- a/ydb/library/yql/dq/opt/dq_opt_join.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_join.cpp
@@ -167,6 +167,11 @@ TMaybe<TJoinInputDesc> BuildDqJoin(const TCoEquiJoinTuple& joinTuple,
     leftJoinKeys.reserve(joinKeysCount);
     TVector<TCoAtom> rightJoinKeys;
     rightJoinKeys.reserve(joinKeysCount);
+    TVector<TCoAtom> leftJoinKeyNames;
+    leftJoinKeyNames.reserve(joinKeysCount);
+    TVector<TCoAtom> rightJoinKeyNames;
+    rightJoinKeyNames.reserve(joinKeysCount);
+
     auto joinKeysBuilder = Build<TDqJoinKeyTupleList>(ctx, left->Input.Pos());
 
     for (size_t i = 0; i < joinKeysCount; ++i) {
@@ -197,6 +202,9 @@ TMaybe<TJoinInputDesc> BuildDqJoin(const TCoEquiJoinTuple& joinTuple,
 
         leftJoinKeys.emplace_back(leftKey);
         rightJoinKeys.emplace_back(rightKey);
+
+        leftJoinKeyNames.emplace_back(leftColumnAtom);
+        rightJoinKeyNames.emplace_back(rightColumnAtom);
     }
 
     if (EHashJoinMode::Off == mode || EHashJoinMode::Map == mode || !(leftAny || rightAny)) {
@@ -207,6 +215,12 @@ TMaybe<TJoinInputDesc> BuildDqJoin(const TCoEquiJoinTuple& joinTuple,
             .RightLabel(rightTableLabel)
             .JoinType(joinTuple.Type())
             .JoinKeys(joinKeysBuilder.Done())
+            .LeftJoinKeyNames()
+                .Add(leftJoinKeyNames)
+                .Build()
+            .RightJoinKeyNames()
+                .Add(rightJoinKeyNames)
+                .Build()
             .Done();
         return TJoinInputDesc(Nothing(), dqJoin, std::move(resultKeys));
     } else {
@@ -223,6 +237,12 @@ TMaybe<TJoinInputDesc> BuildDqJoin(const TCoEquiJoinTuple& joinTuple,
             .RightLabel(rightTableLabel)
             .JoinType(joinTuple.Type())
             .JoinKeys(joinKeysBuilder.Done())
+            .LeftJoinKeyNames()
+                .Add(leftJoinKeyNames)
+                .Build()
+            .RightJoinKeyNames()
+                .Add(rightJoinKeyNames)
+                .Build()
             .Flags().Add(std::move(flags)).Build()
             .Done();
         return TJoinInputDesc(Nothing(), dqJoin, std::move(resultKeys));
@@ -325,6 +345,8 @@ TDqPhyMapJoin DqMakePhyMapJoin(const TDqJoin& join, const TExprBase& leftInput,
         .RightLabel(join.RightLabel())
         .JoinType(join.JoinType())
         .JoinKeys(join.JoinKeys())
+        .LeftJoinKeyNames(join.LeftJoinKeyNames())
+        .RightJoinKeyNames(join.RightJoinKeyNames())
         .Done();
 }
 
@@ -501,6 +523,8 @@ TExprBase DqRewriteRightJoinToLeft(const TExprBase node, TExprContext& ctx) {
             .Value(RotateRightJoinType(dqJoin.JoinType().Value()))
             .Build()
         .JoinKeys(joinKeysBuilder.Done())
+        .LeftJoinKeyNames(dqJoin.LeftJoinKeyNames())
+        .RightJoinKeyNames(dqJoin.RightJoinKeyNames())
         .Flags(newFlags)
         .Done();
 }
@@ -561,7 +585,9 @@ TExprBase DqRewriteLeftPureJoin(const TExprBase node, TExprContext& ctx, const T
         .InitFrom(join)
         .LeftInput(leftConnection)
         .JoinType().Build(joinType)
-        .Done();
+        .LeftJoinKeyNames(join.LeftJoinKeyNames())
+        .RightJoinKeyNames(join.RightJoinKeyNames())
+        .Done();  
 }
 
 TExprBase DqBuildPhyJoin(const TDqJoin& join, bool pushLeftStage, TExprContext& ctx, IOptimizationContext& optCtx) {
@@ -708,6 +734,8 @@ TExprBase DqBuildPhyJoin(const TDqJoin& join, bool pushLeftStage, TExprContext&
             .RightLabel(join.RightLabel())
             .JoinType(join.JoinType())
             .JoinKeys(join.JoinKeys())
+            .LeftJoinKeyNames(join.LeftJoinKeyNames())
+            .RightJoinKeyNames(join.RightJoinKeyNames())
             .Done();
     }
 
@@ -812,6 +840,8 @@ TExprBase DqBuildJoinDict(const TDqJoin& join, TExprContext& ctx) {
             .RightLabel(join.RightLabel())
             .JoinType(join.JoinType())
             .JoinKeys(join.JoinKeys())
+            .LeftJoinKeyNames(join.LeftJoinKeyNames())
+            .RightJoinKeyNames(join.RightJoinKeyNames())
             .Done();
 
         joinStage = Build<TDqStage>(ctx, join.Pos())
@@ -845,6 +875,8 @@ TExprBase DqBuildJoinDict(const TDqJoin& join, TExprContext& ctx) {
             .RightLabel(join.RightLabel())
             .JoinType(join.JoinType())
             .JoinKeys(join.JoinKeys())
+            .LeftJoinKeyNames(join.LeftJoinKeyNames())
+            .RightJoinKeyNames(join.RightJoinKeyNames())
             .Done();
 
         joinStage = Build<TDqStage>(ctx, join.Pos())
@@ -877,6 +909,8 @@ TExprBase DqBuildJoinDict(const TDqJoin& join, TExprContext& ctx) {
             .RightLabel(join.RightLabel())
             .JoinType(join.JoinType())
             .JoinKeys(join.JoinKeys())
+            .LeftJoinKeyNames(join.LeftJoinKeyNames())
+            .RightJoinKeyNames(join.RightJoinKeyNames())
             .Done();
 
         joinStage = Build<TDqStage>(ctx, join.Pos())
@@ -1316,7 +1350,9 @@ TExprBase DqBuildHashJoin(const TDqJoin& join, EHashJoinMode mode, TExprContext&
                             return parent;
                         })
                     .Seal()
-                    .List(shift + 5).Add(std::move(flags)).Seal()
+                    .List(shift + 5).Add(join.LeftJoinKeyNames().Ref().ChildrenList()).Seal()
+                    .List(shift + 6).Add(join.RightJoinKeyNames().Ref().ChildrenList()).Seal()
+                    .List(shift + 7).Add(std::move(flags)).Seal()
                 .Seal()
                 .Build();
             break;
diff --git a/ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp b/ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp
index b23d38ea001..33f2ce70d4c 100644
--- a/ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp
@@ -57,9 +57,29 @@ struct TEdge {
         }
 
     void BuildCondVectors() {
+        LeftJoinKeys.clear();
+        RightJoinKeys.clear();
+
         for (auto [left, right] : JoinConditions) {
-            LeftJoinKeys.emplace_back(left.AttributeName);
-            RightJoinKeys.emplace_back(right.AttributeName);
+            auto leftKey = left.AttributeName;
+            auto rightKey = right.AttributeName;
+
+            for (size_t i = leftKey.size() - 1; i>0; i--) {
+                if (leftKey[i]=='.') {
+                    leftKey = leftKey.substr(i+1);
+                    break;
+                }
+            }
+
+            for (size_t i = rightKey.size() - 1; i>0; i--) {
+                if (rightKey[i]=='.') {
+                    rightKey = rightKey.substr(i+1);
+                    break;
+                }
+            }
+
+            LeftJoinKeys.emplace_back(leftKey);
+            RightJoinKeys.emplace_back(rightKey);
         }
     }
 
@@ -506,12 +526,19 @@ struct TGraph {
                         AddEdge(TEdge(leftNodeId,rightNodeId,std::make_pair(left, right)));
                     } else {
                         Y_ABORT_UNLESS(maybeEdge1 != Edges.end() && maybeEdge2 != Edges.end());
-                        maybeEdge1->JoinConditions.emplace(left, right);
-                        maybeEdge2->JoinConditions.emplace(right, left);
-                        maybeEdge1->LeftJoinKeys.emplace_back(left.AttributeName);
-                        maybeEdge1->RightJoinKeys.emplace_back(right.AttributeName);
-                        maybeEdge2->LeftJoinKeys.emplace_back(right.AttributeName);
-                        maybeEdge2->RightJoinKeys.emplace_back(left.AttributeName);
+                        auto edge1 = *maybeEdge1;
+                        auto edge2 = *maybeEdge2;
+
+                        edge1.JoinConditions.emplace(left, right);
+                        edge2.JoinConditions.emplace(right, left);
+                        edge1.BuildCondVectors();
+                        edge2.BuildCondVectors();
+
+                        Edges.erase(maybeEdge1);
+                        Edges.erase(maybeEdge2);
+
+                        Edges.emplace(edge1);
+                        Edges.emplace(edge2);
                     }
                 }
             }
@@ -536,6 +563,14 @@ struct TGraph {
                     << p.second.RelName << "."
                     << p.second.AttributeName << "\n";
             }
+            for (auto l : e.LeftJoinKeys) {
+                stream << l << ",";
+            }
+            stream << "=";
+            for (auto r : e.RightJoinKeys) {
+                stream << r << ",";
+            }
+            stream << "\n";
         }
     }
 };
@@ -1215,7 +1250,7 @@ std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinO
         joinGraph.AddEdge(TEdge(fromNode, toNode, cond));
     }
 
-     if (NYql::NLog::YqlLogger().NeedToLog(NYql::NLog::EComponent::ProviderKqp, NYql::NLog::ELevel::TRACE)) {
+     if (NYql::NLog::YqlLogger().NeedToLog(NYql::NLog::EComponent::CoreDq, NYql::NLog::ELevel::TRACE)) {
         std::stringstream str;
         str << "Initial join graph:\n";
         joinGraph.PrintGraph(str);
@@ -1225,7 +1260,7 @@ std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinO
     // make a transitive closure of the graph and reorder the graph via BFS
     joinGraph.ComputeTransitiveClosure(joinConditions);
 
-    if (NYql::NLog::YqlLogger().NeedToLog(NYql::NLog::EComponent::ProviderKqp, NYql::NLog::ELevel::TRACE)) {
+    if (NYql::NLog::YqlLogger().NeedToLog(NYql::NLog::EComponent::CoreDq, NYql::NLog::ELevel::TRACE)) {
         std::stringstream str;
         str << "Join graph after transitive closure:\n";
         joinGraph.PrintGraph(str);
@@ -1244,7 +1279,7 @@ std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinO
     // feed the graph to DPccp algorithm
     auto result = solver.Solve();
 
-    if (NYql::NLog::YqlLogger().NeedToLog(NYql::NLog::EComponent::ProviderKqp, NYql::NLog::ELevel::TRACE)) {
+    if (NYql::NLog::YqlLogger().NeedToLog(NYql::NLog::EComponent::CoreDq, NYql::NLog::ELevel::TRACE)) {
         std::stringstream str;
         str << "Join tree after cost based optimization:\n";
         result->Print(str);
diff --git a/ydb/library/yql/dq/opt/dq_opt_peephole.cpp b/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
index 958c610d9f4..06224da1555 100644
--- a/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_peephole.cpp
@@ -581,6 +581,8 @@ NNodes::TExprBase DqPeepholeRewritePureJoin(const NNodes::TExprBase& node, TExpr
                 .RightLabel(join.RightLabel())
                 .JoinType(join.JoinType())
                 .JoinKeys(join.JoinKeys())
+                .LeftJoinKeyNames(join.LeftJoinKeyNames())
+                .RightJoinKeyNames(join.RightJoinKeyNames())
                 .Build()
             .Done();
     } else {
@@ -596,6 +598,8 @@ NNodes::TExprBase DqPeepholeRewritePureJoin(const NNodes::TExprBase& node, TExpr
                 .RightLabel(join.RightLabel())
                 .JoinType(join.JoinType())
                 .JoinKeys(join.JoinKeys())
+                .LeftJoinKeyNames(join.LeftJoinKeyNames())
+                .RightJoinKeyNames(join.RightJoinKeyNames())
                 .Build()
             .Done();
     }
diff --git a/ydb/library/yql/dq/opt/dq_opt_phy.cpp b/ydb/library/yql/dq/opt/dq_opt_phy.cpp
index d82f33eb877..c8c0837959a 100644
--- a/ydb/library/yql/dq/opt/dq_opt_phy.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_phy.cpp
@@ -2646,6 +2646,8 @@ TMaybeNode<TDqJoin> DqFlipJoin(const TDqJoin& join, TExprContext& ctx) {
         .RightLabel(join.LeftLabel())
         .JoinType().Build(joinType)
         .JoinKeys(joinKeysBuilder.Done())
+        .LeftJoinKeyNames(join.RightJoinKeyNames())
+        .RightJoinKeyNames(join.LeftJoinKeyNames())
         .Done();
 }
 
diff --git a/ydb/library/yql/dq/opt/dq_opt_predicate_selectivity.cpp b/ydb/library/yql/dq/opt/dq_opt_predicate_selectivity.cpp
index 22cd83863e0..6a17763c284 100644
--- a/ydb/library/yql/dq/opt/dq_opt_predicate_selectivity.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_predicate_selectivity.cpp
@@ -8,6 +8,11 @@ using namespace NYql::NNodes;
 
 namespace {
 
+    using namespace NYql::NDq;
+
+    THashSet<TString> PgInequalityPreds = {
+        "<", "<=", ">", ">="};
+
     /**
      * Check if a callable is an attribute of some table
      * Currently just return a boolean and cover only basic cases
@@ -22,10 +27,79 @@ namespace {
             return IsAttribute(ifPresent.Cast().Optional(), attributeName);
         } else if (auto just = input.Maybe<TCoJust>()) {
             return IsAttribute(just.Cast().Input(), attributeName);
+        } else if (input.Ptr()->IsCallable("PgCast")) {
+            auto child = TExprBase(input.Ptr()->ChildRef(0));
+            return IsAttribute(child, attributeName);
+        } else if (input.Ptr()->IsCallable("FromPg")) {
+            auto child = TExprBase(input.Ptr()->ChildRef(0));
+            return IsAttribute(child, attributeName);
         }
 
         return false;
     }
+
+    double ComputeEqualitySelectivity(TExprBase& left, TExprBase& right, const std::shared_ptr<TOptimizerStatistics>& stats) {
+
+        TString attributeName;
+
+        if (IsAttribute(right, attributeName) && IsConstantExpr(left.Ptr())) {
+            std::swap(left, right);
+        }
+        
+        if (IsAttribute(left, attributeName)) {
+            // In case both arguments refer to an attribute, return 0.2
+            TString rightAttributeName;
+            if (IsAttribute(right, rightAttributeName)) {
+                return 0.3;
+            }
+            // In case the right side is a constant that can be extracted, compute the selectivity using statistics
+            // Currently, with the basic statistics we just return 1/nRows
+
+            else if (IsConstantExpr(right.Ptr())) {
+                if (stats->KeyColumns.size()==1 && attributeName==stats->KeyColumns[0]) {
+                    if (stats->Nrows > 1) {
+                        return 1.0 / stats->Nrows;
+                    }
+                    else {
+                        return 1.0;
+                    }
+                } else {
+                    if (stats->Nrows > 1) {
+                        return 0.1;
+                    }
+                    else {
+                        return 1.0;
+                    }
+                }
+            }
+        }
+
+        return 1.0;
+    }
+
+    double ComputeComparisonSelectivity(TExprBase& left, TExprBase& right, const std::shared_ptr<TOptimizerStatistics>& stats) {
+
+        Y_UNUSED(stats);
+
+        TString attributeName;
+        if (IsAttribute(right, attributeName) && IsConstantExpr(left.Ptr())) {
+            std::swap(left, right);
+        }
+
+        if (IsAttribute(left, attributeName)) {
+            // In case both arguments refer to an attribute, return 0.2
+            if (IsAttribute(right, attributeName)) {
+                return 0.3;
+            }
+            // In case the right side is a constant that can be extracted, compute the selectivity using statistics
+            // Currently, with the basic statistics we just return 0.5
+            else if (IsConstantExpr(right.Ptr())) {
+                return 0.5;
+            }
+        }
+
+        return 1.0;
+    }
 }
 
 /**
@@ -44,6 +118,26 @@ double NYql::NDq::ComputePredicateSelectivity(const TExprBase& input, const std:
         result = ComputePredicateSelectivity(coalesce.Cast().Predicate(), stats);
     }
 
+    else if (input.Ptr()->IsCallable("FromPg")) {
+        auto child = TExprBase(input.Ptr()->ChildRef(0));
+        result = ComputePredicateSelectivity(child, stats);
+    }
+
+    else if (input.Ptr()->IsCallable("Exists")) {
+        auto child = TExprBase(input.Ptr()->ChildRef(0));
+        result = ComputePredicateSelectivity(child, stats);
+    }
+
+    else if(input.Ptr()->IsCallable("Find") || input.Ptr()->IsCallable("StringContains")) {
+        auto member =  TExprBase(input.Ptr()->ChildRef(0));
+        auto stringPred = TExprBase(input.Ptr()->ChildRef(1));
+
+        TString attributeName;
+        if (IsAttribute(member, attributeName) && IsConstantExpr(stringPred.Ptr())) {
+            result = 0.1;
+        }
+    }
+
     // Process AND, OR and NOT logical operators.
     // In case of AND we multiply the selectivities, since we assume them to be independent
     // In case of OR we sum them up, again assuming independence and disjointness, but make sure its at most 1.0
@@ -62,7 +156,8 @@ double NYql::NDq::ComputePredicateSelectivity(const TExprBase& input, const std:
         }
         result = std::max(res, 1.0);
     } else if (auto notNode = input.Maybe<TCoNot>()) {
-        result = 1.0 - ComputePredicateSelectivity(notNode.Cast().Value(), stats);
+        double argSel = ComputePredicateSelectivity(notNode.Cast().Value(), stats);
+        result = 1.0 - (argSel == 1.0 ? 0.95 : argSel);
     }
 
     // Process the equality predicate
@@ -70,41 +165,31 @@ double NYql::NDq::ComputePredicateSelectivity(const TExprBase& input, const std:
         auto left = equality.Cast().Left();
         auto right = equality.Cast().Right();
 
-        TString attributeName;
+        result = ComputeEqualitySelectivity(left, right, stats);
+    }
 
-        if (IsAttribute(right, attributeName) && IsConstantExpr(left.Ptr())) {
-            std::swap(left, right);
-        }
+    else if (input.Ptr()->IsCallable("PgResolvedOp") && input.Ptr()->ChildPtr(0)->Content()=="=") {
+        auto left = TExprBase(input.Ptr()->ChildPtr(2));
+        auto right = TExprBase(input.Ptr()->ChildPtr(3));
 
-        
-        if (IsAttribute(left, attributeName)) {
-            // In case both arguments refer to an attribute, return 0.2
-            TString rightAttributeName;
-            if (IsAttribute(right, rightAttributeName)) {
-                result = 0.3;
-            }
-            // In case the right side is a constant that can be extracted, compute the selectivity using statistics
-            // Currently, with the basic statistics we just return 1/nRows
+        result = ComputeEqualitySelectivity(left, right, stats);
+    }
 
-            else if (IsConstantExpr(right.Ptr())) {
-                if (stats->KeyColumns.size()==1 && attributeName==stats->KeyColumns[0]) {
-                    if (stats->Nrows > 1) {
-                        result = 1.0 / stats->Nrows;
-                    }
-                    else {
-                        result = 1.0;
-                    }
-                } else {
-                    if (stats->Nrows > 1) {
-                        result = 0.1;
-                    }
-                    else {
-                        result = 1.0;
-                    }
-                }
-            }
-        }
+    // Process the not equal predicate
+    else if (auto equality = input.Maybe<TCoCmpNotEqual>()) {
+        auto left = equality.Cast().Left();
+        auto right = equality.Cast().Right();
 
+        double eqSel = ComputeEqualitySelectivity(left, right, stats);
+        result = 1.0 - (eqSel == 1.0 ? 0.95 : eqSel);
+    }
+
+    else if (input.Ptr()->IsCallable("PgResolvedOp") && input.Ptr()->ChildPtr(0)->Content()=="<>") {
+        auto left = TExprBase(input.Ptr()->ChildPtr(2));
+        auto right = TExprBase(input.Ptr()->ChildPtr(3));
+
+        double eqSel = ComputeEqualitySelectivity(left, right, stats);
+        result = 1.0 - (eqSel == 1.0 ? 0.95 : eqSel);
     }
 
     // Process all other comparison predicates
@@ -112,20 +197,36 @@ double NYql::NDq::ComputePredicateSelectivity(const TExprBase& input, const std:
         auto left = comparison.Cast().Left();
         auto right = comparison.Cast().Right();
 
+        result = ComputeComparisonSelectivity(left, right, stats);
+    }
+
+    else if (input.Ptr()->IsCallable("PgResolvedOp") && PgInequalityPreds.contains(input.Ptr()->ChildPtr(0)->Content())){
+        auto left = TExprBase(input.Ptr()->ChildPtr(2));
+        auto right = TExprBase(input.Ptr()->ChildPtr(3));
+
+        result = ComputeComparisonSelectivity(left, right, stats);
+    }
+
+    // Process SqlIn
+    else if(input.Ptr()->IsCallable("SqlIn")) {
+        auto left = TExprBase(input.Ptr()->ChildPtr(0));
+        auto right = TExprBase(input.Ptr()->ChildPtr(1));
+
         TString attributeName;
+
         if (IsAttribute(right, attributeName) && IsConstantExpr(left.Ptr())) {
             std::swap(left, right);
         }
 
-        if (IsAttribute(left, attributeName)) {
-            // In case both arguments refer to an attribute, return 0.2
-            if (IsAttribute(right, attributeName)) {
-                result = 0.3;
-            }
-            // In case the right side is a constant that can be extracted, compute the selectivity using statistics
-            // Currently, with the basic statistics we just return 0.5
-            else if (IsConstantExpr(right.Ptr())) {
-                result = 0.5;
+        if (IsAttribute(left, attributeName) && IsConstantExpr(right.Ptr())) {
+            if (right.Ptr()->IsCallable("AsList")) {
+                auto size = right.Ptr()->Child(0)->ChildrenSize();
+                if (stats->KeyColumns.size()==1 && attributeName==stats->KeyColumns[0]) {
+                    result = size / stats->Nrows;
+                } else {
+                    result = 0.1 + 0.2 / (1 + std::exp(size));
+                }
+
             }
         }
     }
diff --git a/ydb/library/yql/dq/opt/dq_opt_stat.cpp b/ydb/library/yql/dq/opt/dq_opt_stat.cpp
index aed5076e9e3..a638f1acf34 100644
--- a/ydb/library/yql/dq/opt/dq_opt_stat.cpp
+++ b/ydb/library/yql/dq/opt/dq_opt_stat.cpp
@@ -16,8 +16,21 @@ namespace {
      * All other callables will not be evaluated
      */
     THashSet<TString> constantFoldingWhiteList = {
-        "Concat", "Just", "Optional","SafeCast",
+        "Concat", "Just", "Optional", "SafeCast", "AsList",
         "+", "-", "*", "/", "%"};
+
+    THashSet<TString> pgConstantFoldingWhiteList = {
+        "PgResolvedOp", "PgResolvedCall", "PgCast", "PgConst", "PgArray", "PgType"};
+
+
+    TString RemoveAliases(TString attributeName) {
+        for (size_t i = attributeName.size() - 1; i>0; i--) {
+            if (attributeName[i]=='.') {
+                return attributeName.substr(i+1);
+            }
+        }
+        return attributeName;
+    }
 }
 
 bool NeedCalc(NNodes::TExprBase node) {
@@ -60,6 +73,33 @@ bool NeedCalc(NNodes::TExprBase node) {
     return !node.Maybe<TCoDataCtor>();
 }
 
+bool IsConstantExprPg(const TExprNode::TPtr& input) {
+    if (input->GetTypeAnn()->GetKind() == ETypeAnnotationKind::Pg) {
+        if (input->IsCallable("PgConst")) {
+            return true;
+        }
+    }
+
+    if (TMaybeNode<TCoAtom>(input)) {
+        return true;
+    }
+
+    if (input->IsCallable(pgConstantFoldingWhiteList) || input->IsList()) {
+        for (size_t i = 0; i < input->ChildrenSize(); i++) {
+            auto callableInput = input->Child(i);
+            if (callableInput->IsLambda() && !IsConstantExprPg(callableInput->Child(1))) {
+                return false;
+            }
+            if (!callableInput->IsCallable("PgType") && !IsConstantExprPg(callableInput)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    return false;
+}
+
 /***
  * Check if the expression is a constant expression
  * Its type annotation need to specify that its a data type, and then we check:
@@ -68,6 +108,10 @@ bool NeedCalc(NNodes::TExprBase node) {
  *   - If one of the child is a type expression, it also passes the check
  */
 bool IsConstantExpr(const TExprNode::TPtr& input) {
+    if (input->GetTypeAnn()->GetKind() == ETypeAnnotationKind::Pg) {
+        return IsConstantExprPg(input);
+    }
+
     if (!IsDataOrOptionalOfData(input->GetTypeAnn())) {
         return false;
     }
@@ -111,10 +155,10 @@ void InferStatisticsForMapJoin(const TExprNode::TPtr& input, TTypeAnnotationCont
     TVector<TString> rightJoinKeys;
 
     for (size_t i=0; i<join.LeftKeysColumns().Size(); i++) {
-        leftJoinKeys.push_back(join.LeftKeysColumns().Item(i).StringValue());
+        leftJoinKeys.push_back(RemoveAliases(join.LeftKeysColumns().Item(i).StringValue()));
     }
     for (size_t i=0; i<join.RightKeysColumns().Size(); i++) {
-        rightJoinKeys.push_back(join.RightKeysColumns().Item(i).StringValue());
+        rightJoinKeys.push_back(RemoveAliases(join.RightKeysColumns().Item(i).StringValue()));
     }
 
     typeCtx->SetStats(join.Raw(), std::make_shared<TOptimizerStatistics>(
@@ -142,11 +186,11 @@ void InferStatisticsForGraceJoin(const TExprNode::TPtr& input, TTypeAnnotationCo
     TVector<TString> leftJoinKeys;
     TVector<TString> rightJoinKeys;
 
-    for (size_t i=0; i<join.LeftKeysColumns().Size(); i++) {
-        leftJoinKeys.push_back(join.LeftKeysColumns().Item(i).StringValue());
+    for (size_t i=0; i<join.LeftKeysColumnNames().Size(); i++) {
+        leftJoinKeys.push_back(RemoveAliases(join.LeftKeysColumnNames().Item(i).StringValue()));
     }
-    for (size_t i=0; i<join.RightKeysColumns().Size(); i++) {
-        rightJoinKeys.push_back(join.RightKeysColumns().Item(i).StringValue());
+    for (size_t i=0; i<join.RightKeysColumnNames().Size(); i++) {
+        rightJoinKeys.push_back(RemoveAliases(join.RightKeysColumnNames().Item(i).StringValue()));
     }
 
     typeCtx->SetStats(join.Raw(), std::make_shared<TOptimizerStatistics>(
@@ -194,6 +238,9 @@ void InferStatisticsForFlatMap(const TExprNode::TPtr& input, TTypeAnnotationCont
 
         double selectivity = ComputePredicateSelectivity(flatmap.Lambda().Body(), inputStats);
 
+        YQL_CLOG(TRACE, CoreDq) << "Selectivity = " << selectivity << ", Predicate: " << flatmap.Lambda().Body().Ptr()->Dump();
+
+
         auto outputStats = TOptimizerStatistics(inputStats->Type, inputStats->Nrows * selectivity, inputStats->Ncols, inputStats->Cost, inputStats->KeyColumns );
 
         typeCtx->SetStats(input.Get(), std::make_shared<TOptimizerStatistics>(outputStats) );
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 f5395ccd102..a1555f45582 100644
--- a/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
+++ b/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
@@ -421,7 +421,7 @@ const TStructExprType* GetDqJoinResultType(TPositionHandle pos, const TStructExp
 
 template <bool IsMapJoin>
 const TStructExprType* GetDqJoinResultType(const TExprNode::TPtr& input, bool stream, TExprContext& ctx) {
-    if (!EnsureMinMaxArgsCount(*input, 6, 7, ctx)) {
+    if (!EnsureMinMaxArgsCount(*input, 8, 9, ctx)) {
         return nullptr;
     }
 
@@ -495,7 +495,7 @@ const TStructExprType* GetDqJoinResultType(const TExprNode::TPtr& input, bool st
         ? join.RightLabel().Cast<TCoAtom>().Value()
         : TStringBuf("");
 
-    if (input->ChildrenSize() > 6U) {
+    if (input->ChildrenSize() > 8U) {
         for (auto i = 0U; i < input->Tail().ChildrenSize(); ++i) {
             if (const auto& flag = *input->Tail().Child(i); !flag.IsAtom({"LeftAny", "RightAny"})) {
                 ctx.AddError(TIssue(ctx.GetPosition(flag.Pos()), TStringBuilder() << "Unsupported DQ join option: " << flag.Content()));
diff --git a/ydb/library/yql/mount/lib/yql/aggregate.yql b/ydb/library/yql/mount/lib/yql/aggregate.yql
index b2450bf2390..b2450bf2390 100644..100755
--- a/ydb/library/yql/mount/lib/yql/aggregate.yql
+++ b/ydb/library/yql/mount/lib/yql/aggregate.yql
diff --git a/ydb/library/yql/mount/lib/yql/core.yql b/ydb/library/yql/mount/lib/yql/core.yql
index 9fd5be23fac..9fd5be23fac 100644..100755
--- a/ydb/library/yql/mount/lib/yql/core.yql
+++ b/ydb/library/yql/mount/lib/yql/core.yql
diff --git a/ydb/library/yql/mount/lib/yql/id.yql b/ydb/library/yql/mount/lib/yql/id.yql
index 726ae3dcfa3..726ae3dcfa3 100644..100755
--- a/ydb/library/yql/mount/lib/yql/id.yql
+++ b/ydb/library/yql/mount/lib/yql/id.yql
diff --git a/ydb/library/yql/mount/lib/yql/sqr.yql b/ydb/library/yql/mount/lib/yql/sqr.yql
index 7e87ab204b0..7e87ab204b0 100644..100755
--- a/ydb/library/yql/mount/lib/yql/sqr.yql
+++ b/ydb/library/yql/mount/lib/yql/sqr.yql
diff --git a/ydb/library/yql/mount/lib/yql/walk_folders.yql b/ydb/library/yql/mount/lib/yql/walk_folders.yql
index 1cf37bc31f4..1cf37bc31f4 100644..100755
--- a/ydb/library/yql/mount/lib/yql/walk_folders.yql
+++ b/ydb/library/yql/mount/lib/yql/walk_folders.yql
diff --git a/ydb/library/yql/mount/lib/yql/window.yql b/ydb/library/yql/mount/lib/yql/window.yql
index 9c60e0dbbc5..9c60e0dbbc5 100644..100755
--- a/ydb/library/yql/mount/lib/yql/window.yql
+++ b/ydb/library/yql/mount/lib/yql/window.yql
diff --git a/ydb/library/yql/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yql b/ydb/library/yql/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yql
index 4707d6a8c5c..da309347a4b 100644
--- a/ydb/library/yql/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yql
@@ -12,7 +12,7 @@
 (let joinInner (GraceJoinCore
 (ExpandMap (ToFlow list1) (lambda '(m)(Member m 'key1)))
 (ExpandMap (ToFlow list2) (lambda '(m)(Member m 'key2)))
-'Inner  '('0) '('0) '('0 '0) '('0 '1) '()))
+'Inner  '('0) '('0) '('0 '0) '('0 '1) '('key1) '('key2) '()))
 
 (let res_sink (DataSink 'result))
 
diff --git a/ydb/library/yql/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yql b/ydb/library/yql/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yql
index 804a25fca9b..e184b34935d 100644
--- a/ydb/library/yql/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yql
+++ b/ydb/library/yql/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yql
@@ -7,7 +7,7 @@
 
 (let joinInner (GraceSelfJoinCore
 (ExpandMap (ToFlow list1) (lambda '(m)(Member m 'key1)))
-'Inner  '('0) '('0) '('0 '0) '('0 '1) '()))
+'Inner  '('0) '('0) '('0 '0) '('0 '1) '('key1) '('key1) '()))
 
 (let res_sink (DataSink 'result))
 
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json
index ecba97e5958..6895eddd3ce 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part4/canondata/result.json
@@ -2583,9 +2583,9 @@
     ],
     "test.test[GraceJoin-GraceJoinCore_Flow-Debug]": [
         {
-            "checksum": "1f0ddfaa727f597bb55967a1e07a649d",
-            "size": 1698,
-            "uri": "https://{canondata_backend}/1942415/4acfbe5e06722c23d8071c1dc3bfe75a66f1dc8b/resource.tar.gz#test.test_GraceJoin-GraceJoinCore_Flow-Debug_/opt.yql"
+            "checksum": "d9536a7d75487aefb0032d8afa6b9cc0",
+            "size": 1716,
+            "uri": "https://{canondata_backend}/1942671/4175e538954725c2d05e2b14c7642941d662c8b1/resource.tar.gz#test.test_GraceJoin-GraceJoinCore_Flow-Debug_/opt.yql"
         }
     ],
     "test.test[GraceJoin-GraceJoinCore_Flow-Plan]": [
diff --git a/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json b/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json
index 2d580d277e8..802d570240f 100644
--- a/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/s-expressions/yt_native_file/part7/canondata/result.json
@@ -2582,9 +2582,9 @@
     ],
     "test.test[GraceJoin-SelfJoinCore_Flow-Debug]": [
         {
-            "checksum": "b4a8a2020b8e32b89dc5db47cadd891c",
-            "size": 1091,
-            "uri": "https://{canondata_backend}/1814674/16833135d6fdfeda3233b369f40d79fd037645a9/resource.tar.gz#test.test_GraceJoin-SelfJoinCore_Flow-Debug_/opt.yql"
+            "checksum": "51aa399853f5d897224eea02a9292f43",
+            "size": 1118,
+            "uri": "https://{canondata_backend}/1937367/543fd17d41777bed0429df78293a95a5db603654/resource.tar.gz#test.test_GraceJoin-SelfJoinCore_Flow-Debug_/opt.yql"
         }
     ],
     "test.test[GraceJoin-SelfJoinCore_Flow-Plan]": [
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 316fca2b514..eccb78c3fcc 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
@@ -376,9 +376,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_qualified-default.txt-Debug]": [
         {
-            "checksum": "58ae481d26ff559022b24700c2b21190",
-            "size": 6276,
-            "uri": "https://{canondata_backend}/1889210/f053f10d689490bf5100a7fbf8cc00cf1b09e227/resource.tar.gz#test.test_aggregate-group_by_ru_join_qualified-default.txt-Debug_/opt.yql_patched"
+            "checksum": "31a298ea601ddc6e0ff0628b7aee9511",
+            "size": 6282,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_aggregate-group_by_ru_join_qualified-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_qualified-default.txt-Plan]": [
@@ -902,9 +902,9 @@
     ],
     "test.test[in-in_sorted--Debug]": [
         {
-            "checksum": "80b8a6c8042a09ffeabf7dbcb2eb6eda",
-            "size": 2665,
-            "uri": "https://{canondata_backend}/1923547/def548b9ff2bd71ce7cc874ef88a5c5bfd5f70c2/resource.tar.gz#test.test_in-in_sorted--Debug_/opt.yql_patched"
+            "checksum": "b1e55bf54e3ecff87b3d6421d2715da6",
+            "size": 2673,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_in-in_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_sorted--Plan]": [
@@ -1106,9 +1106,9 @@
     ],
     "test.test[join-anyjoin_common_nodup--Debug]": [
         {
-            "checksum": "551f9df10ae8808fc00cb959b3e91bc7",
-            "size": 5149,
-            "uri": "https://{canondata_backend}/1130705/6ffd9ee62f7f1ead96b9e0706567eed65aef89a0/resource.tar.gz#test.test_join-anyjoin_common_nodup--Debug_/opt.yql_patched"
+            "checksum": "0ce1dc055d6a000617901875069267eb",
+            "size": 5181,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-anyjoin_common_nodup--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_nodup--Plan]": [
@@ -1156,9 +1156,9 @@
     ],
     "test.test[join-equi_join_three_asterisk_eval--Debug]": [
         {
-            "checksum": "b3d865262293abd9faea35ccde5767c8",
-            "size": 4432,
-            "uri": "https://{canondata_backend}/1923547/def548b9ff2bd71ce7cc874ef88a5c5bfd5f70c2/resource.tar.gz#test.test_join-equi_join_three_asterisk_eval--Debug_/opt.yql_patched"
+            "checksum": "64879c8a5d85625ee6c84eeb7538eae3",
+            "size": 4462,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-equi_join_three_asterisk_eval--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_asterisk_eval--Plan]": [
@@ -1178,9 +1178,9 @@
     ],
     "test.test[join-equi_join_two_mult_keys--Debug]": [
         {
-            "checksum": "9620b899e4d02855b0b39a4d7542d434",
-            "size": 2335,
-            "uri": "https://{canondata_backend}/1923547/def548b9ff2bd71ce7cc874ef88a5c5bfd5f70c2/resource.tar.gz#test.test_join-equi_join_two_mult_keys--Debug_/opt.yql_patched"
+            "checksum": "ab0c026f90eddc2d26629092f4f13b90",
+            "size": 2343,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-equi_join_two_mult_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_two_mult_keys--Plan]": [
@@ -1200,9 +1200,9 @@
     ],
     "test.test[join-equi_join_two_mult_keys-off-Debug]": [
         {
-            "checksum": "d17f650eadb14a7735cd0fc1ce7f2451",
-            "size": 2167,
-            "uri": "https://{canondata_backend}/937458/e5719cd256fe3fd898e8ebe6df280521ffd29040/resource.tar.gz#test.test_join-equi_join_two_mult_keys-off-Debug_/opt.yql_patched"
+            "checksum": "0d8aa2642dcf7c17d59eaa5c8ed04fec",
+            "size": 2205,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-equi_join_two_mult_keys-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_two_mult_keys-off-Plan]": [
@@ -1228,9 +1228,9 @@
     ],
     "test.test[join-flatten_columns1--Debug]": [
         {
-            "checksum": "05360a7bcd5f4375a2ee8ce13d1a1908",
-            "size": 2879,
-            "uri": "https://{canondata_backend}/1946324/c4e3e08799ff2867f35fb0960060a07338ecc49d/resource.tar.gz#test.test_join-flatten_columns1--Debug_/opt.yql_patched"
+            "checksum": "2459a63383ac0832156b17d04839ee3f",
+            "size": 2887,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-flatten_columns1--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-flatten_columns1--Plan]": [
@@ -1250,9 +1250,9 @@
     ],
     "test.test[join-flatten_columns1-off-Debug]": [
         {
-            "checksum": "7cd418c29fc5ffbfab6146b35ca20d07",
-            "size": 2668,
-            "uri": "https://{canondata_backend}/1946324/c4e3e08799ff2867f35fb0960060a07338ecc49d/resource.tar.gz#test.test_join-flatten_columns1-off-Debug_/opt.yql_patched"
+            "checksum": "3091ffd5285f41da83d0cd2958242157",
+            "size": 2698,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-flatten_columns1-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-flatten_columns1-off-Plan]": [
@@ -1278,9 +1278,9 @@
     ],
     "test.test[join-full_join-off-Debug]": [
         {
-            "checksum": "637d27c1aca0e375e077680d97c6b1e2",
-            "size": 3002,
-            "uri": "https://{canondata_backend}/937458/e5719cd256fe3fd898e8ebe6df280521ffd29040/resource.tar.gz#test.test_join-full_join-off-Debug_/opt.yql_patched"
+            "checksum": "39db9feb52b533779fab4e8e705d1306",
+            "size": 3038,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-full_join-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_join-off-Plan]": [
@@ -1306,9 +1306,9 @@
     ],
     "test.test[join-inner_with_select--Debug]": [
         {
-            "checksum": "a06e7bda17e23724be1bade1b3d6bb64",
-            "size": 2829,
-            "uri": "https://{canondata_backend}/1946324/c4e3e08799ff2867f35fb0960060a07338ecc49d/resource.tar.gz#test.test_join-inner_with_select--Debug_/opt.yql_patched"
+            "checksum": "552a0e4ea591df3d21795b45f8e8f626",
+            "size": 2837,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-inner_with_select--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_with_select--Plan]": [
@@ -1328,9 +1328,9 @@
     ],
     "test.test[join-join_key_cmp_udf--Debug]": [
         {
-            "checksum": "6555ee6a12a5cab37e1d49390a90952e",
-            "size": 2937,
-            "uri": "https://{canondata_backend}/1937027/a3de41ffd24fbd15ac4a4f974e41beecda0f1147/resource.tar.gz#test.test_join-join_key_cmp_udf--Debug_/opt.yql_patched"
+            "checksum": "6b331e6812849d51bd72da97a7c7c156",
+            "size": 2971,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-join_key_cmp_udf--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_key_cmp_udf--Plan]": [
@@ -1350,9 +1350,9 @@
     ],
     "test.test[join-left_all--Debug]": [
         {
-            "checksum": "f53e351caa71c096dd5dee48f1a4655c",
-            "size": 2343,
-            "uri": "https://{canondata_backend}/1923547/def548b9ff2bd71ce7cc874ef88a5c5bfd5f70c2/resource.tar.gz#test.test_join-left_all--Debug_/opt.yql_patched"
+            "checksum": "32b3b055bdf2e8a409209f3b30632ae3",
+            "size": 2351,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-left_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_all--Plan]": [
@@ -1372,9 +1372,9 @@
     ],
     "test.test[join-lookupjoin_not_selected-off-Debug]": [
         {
-            "checksum": "a6550d8b73d8b74ba3fe98e6b0e01610",
-            "size": 2848,
-            "uri": "https://{canondata_backend}/937458/e5719cd256fe3fd898e8ebe6df280521ffd29040/resource.tar.gz#test.test_join-lookupjoin_not_selected-off-Debug_/opt.yql_patched"
+            "checksum": "1eb8a6950b576ff3d8886c96ca51845b",
+            "size": 2862,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-lookupjoin_not_selected-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_not_selected-off-Plan]": [
@@ -1403,9 +1403,9 @@
     ],
     "test.test[join-mergejoin_force_align3-off-Debug]": [
         {
-            "checksum": "719c9aafd70a428240f480409fed506a",
-            "size": 3989,
-            "uri": "https://{canondata_backend}/1942173/bf351a1a8ee8d6c0b6502a57775b3dee11ed5877/resource.tar.gz#test.test_join-mergejoin_force_align3-off-Debug_/opt.yql_patched"
+            "checksum": "160c4ec4958fddcfd0164cedbc90bb51",
+            "size": 4025,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-mergejoin_force_align3-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_align3-off-Plan]": [
@@ -1431,9 +1431,9 @@
     ],
     "test.test[join-mergejoin_force_per_link-off-Debug]": [
         {
-            "checksum": "c98bf5a2396830338d1ecda1d8ee2983",
-            "size": 3357,
-            "uri": "https://{canondata_backend}/937458/e5719cd256fe3fd898e8ebe6df280521ffd29040/resource.tar.gz#test.test_join-mergejoin_force_per_link-off-Debug_/opt.yql_patched"
+            "checksum": "9a40e68152739a5fcf5caaf3963afa7b",
+            "size": 3391,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-mergejoin_force_per_link-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_per_link-off-Plan]": [
@@ -1459,9 +1459,9 @@
     ],
     "test.test[join-mergejoin_narrows_output_sort-off-Debug]": [
         {
-            "checksum": "ad84f08c7708d743308e6b0f0d5dd6b5",
-            "size": 4481,
-            "uri": "https://{canondata_backend}/937458/e5719cd256fe3fd898e8ebe6df280521ffd29040/resource.tar.gz#test.test_join-mergejoin_narrows_output_sort-off-Debug_/opt.yql_patched"
+            "checksum": "186276ff0bbf7870ab40b9d106d1929d",
+            "size": 4538,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-mergejoin_narrows_output_sort-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_narrows_output_sort-off-Plan]": [
@@ -1487,9 +1487,9 @@
     ],
     "test.test[join-premap_common_cross--Debug]": [
         {
-            "checksum": "df37ec994b23d492ff44b147d21fba01",
-            "size": 2716,
-            "uri": "https://{canondata_backend}/1903280/76ac83783dd253263cbbfa647528ead00c7b0238/resource.tar.gz#test.test_join-premap_common_cross--Debug_/opt.yql_patched"
+            "checksum": "1eba85c2cc33dfffb715b309e5af43da",
+            "size": 2724,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-premap_common_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_cross--Plan]": [
@@ -1509,9 +1509,9 @@
     ],
     "test.test[join-premap_common_inner_filter-off-Debug]": [
         {
-            "checksum": "5bdbdbc64fdd2272ad63711acbebb0e9",
-            "size": 2775,
-            "uri": "https://{canondata_backend}/937458/e5719cd256fe3fd898e8ebe6df280521ffd29040/resource.tar.gz#test.test_join-premap_common_inner_filter-off-Debug_/opt.yql_patched"
+            "checksum": "2caa105d9a5e61181d965d88be379995",
+            "size": 2805,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-premap_common_inner_filter-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner_filter-off-Plan]": [
@@ -1537,9 +1537,9 @@
     ],
     "test.test[join-pullup_cross--Debug]": [
         {
-            "checksum": "5858902df379de6ac597ef6ffe17ebaa",
-            "size": 2693,
-            "uri": "https://{canondata_backend}/1903280/76ac83783dd253263cbbfa647528ead00c7b0238/resource.tar.gz#test.test_join-pullup_cross--Debug_/opt.yql_patched"
+            "checksum": "51f794709742e408979fc03108e188ac",
+            "size": 2701,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-pullup_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_cross--Plan]": [
@@ -1559,9 +1559,9 @@
     ],
     "test.test[join-pullup_exclusion--Debug]": [
         {
-            "checksum": "9f87592d5f9781d7f164c7049dff2a47",
-            "size": 3695,
-            "uri": "https://{canondata_backend}/1946324/c4e3e08799ff2867f35fb0960060a07338ecc49d/resource.tar.gz#test.test_join-pullup_exclusion--Debug_/opt.yql_patched"
+            "checksum": "36740c5e0c22743f51700a165c40d645",
+            "size": 3703,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-pullup_exclusion--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_exclusion--Plan]": [
@@ -1581,9 +1581,9 @@
     ],
     "test.test[join-pullup_inner-off-Debug]": [
         {
-            "checksum": "5fb1c5250f609c11a1fd4db4caef3bad",
-            "size": 2691,
-            "uri": "https://{canondata_backend}/1946324/c4e3e08799ff2867f35fb0960060a07338ecc49d/resource.tar.gz#test.test_join-pullup_inner-off-Debug_/opt.yql_patched"
+            "checksum": "06df01614c0cc2fe51a8e078df782714",
+            "size": 2721,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-pullup_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_inner-off-Plan]": [
@@ -1612,9 +1612,9 @@
     ],
     "test.test[join-yql-14829_left-off-Debug]": [
         {
-            "checksum": "f1b18f0f6d31490df7fd4000cf47dbc9",
-            "size": 5816,
-            "uri": "https://{canondata_backend}/1942173/bf351a1a8ee8d6c0b6502a57775b3dee11ed5877/resource.tar.gz#test.test_join-yql-14829_left-off-Debug_/opt.yql_patched"
+            "checksum": "cdf74a621ecc7bf6e63a0632cf4ec649",
+            "size": 5828,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_join-yql-14829_left-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14829_left-off-Plan]": [
@@ -2490,9 +2490,9 @@
     ],
     "test.test[pg-tpch-q05-default.txt-Debug]": [
         {
-            "checksum": "95e1e8153b8fb5a7c3506b43b7adb69a",
-            "size": 14773,
-            "uri": "https://{canondata_backend}/1903280/aac3bb7fea1b9e626c8a2f8b2c0b58154f82de99/resource.tar.gz#test.test_pg-tpch-q05-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1503b12c21cbe005e88e6e147457b5b2",
+            "size": 14977,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_pg-tpch-q05-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q05-default.txt-Plan]": [
@@ -2644,9 +2644,9 @@
     ],
     "test.test[sampling-bind_join_right-default.txt-Debug]": [
         {
-            "checksum": "f03809b93c932b340b718b335eaa69d1",
-            "size": 2449,
-            "uri": "https://{canondata_backend}/1937027/a3de41ffd24fbd15ac4a4f974e41beecda0f1147/resource.tar.gz#test.test_sampling-bind_join_right-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3e278cb06609c76e837f726b34915fbf",
+            "size": 2455,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_sampling-bind_join_right-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-bind_join_right-default.txt-Plan]": [
@@ -2945,9 +2945,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Debug]": [
         {
-            "checksum": "e3d378a7cade6323697f591b6141b708",
-            "size": 2354,
-            "uri": "https://{canondata_backend}/1937027/a3de41ffd24fbd15ac4a4f974e41beecda0f1147/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Debug_/opt.yql_patched"
+            "checksum": "745699f8b092422291c51fa68f149e5f",
+            "size": 2360,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Plan]": [
@@ -2989,9 +2989,9 @@
     ],
     "test.test[tpch-q13-default.txt-Debug]": [
         {
-            "checksum": "f23c6b060913e5276c5090e38f755e7e",
-            "size": 7090,
-            "uri": "https://{canondata_backend}/1937492/51a71aafa8cb13b76649da16b674299ed9af1c87/resource.tar.gz#test.test_tpch-q13-default.txt-Debug_/opt.yql_patched"
+            "checksum": "fb23af1bf230e720e9f3766f753722db",
+            "size": 7112,
+            "uri": "https://{canondata_backend}/1871182/4d40c08aee85fb231923402132a00b2ae47137cc/resource.tar.gz#test.test_tpch-q13-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q13-default.txt-Plan]": [
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 6eec21da133..69d342666d0 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
@@ -496,9 +496,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_simple--Debug]": [
         {
-            "checksum": "b9a50fac6ddab368e0c8787aa3bc2d3f",
-            "size": 6105,
-            "uri": "https://{canondata_backend}/1600758/9e9cf9ad74719660b06ae9b80895ed924aaa6da3/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple--Debug_/opt.yql_patched"
+            "checksum": "787b64e14cc87775d20587f924ca1f00",
+            "size": 6111,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_simple--Plan]": [
@@ -890,9 +890,9 @@
     ],
     "test.test[expr-double_join_with_list_from_range--Debug]": [
         {
-            "checksum": "799693fb0df755630d924829f37b8676",
-            "size": 2745,
-            "uri": "https://{canondata_backend}/1942173/faa0388e8ff65e27dc14e716b65cbd83441fd698/resource.tar.gz#test.test_expr-double_join_with_list_from_range--Debug_/opt.yql_patched"
+            "checksum": "b3db6051555cc4f7d724f381bd6eaa8f",
+            "size": 2804,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_expr-double_join_with_list_from_range--Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-double_join_with_list_from_range--Plan]": [
@@ -1206,9 +1206,9 @@
     ],
     "test.test[join-convert_key--Debug]": [
         {
-            "checksum": "c1a35e916e374a6b356afeafdbcb886d",
-            "size": 2943,
-            "uri": "https://{canondata_backend}/1937027/591a1ceca790d81eaf524a7a3e730722b0d7bdb7/resource.tar.gz#test.test_join-convert_key--Debug_/opt.yql_patched"
+            "checksum": "aa9bdf728e8d22bad0f8c43e81ac44f2",
+            "size": 2963,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-convert_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-convert_key--Plan]": [
@@ -1228,9 +1228,9 @@
     ],
     "test.test[join-convert_key-off-Debug]": [
         {
-            "checksum": "56fa61dcbc6ca1acbaa3d04f433ace00",
-            "size": 2392,
-            "uri": "https://{canondata_backend}/1937027/591a1ceca790d81eaf524a7a3e730722b0d7bdb7/resource.tar.gz#test.test_join-convert_key-off-Debug_/opt.yql_patched"
+            "checksum": "3ed93431ca2c87661cdc4ba7205a53d6",
+            "size": 2427,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-convert_key-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-convert_key-off-Plan]": [
@@ -1256,9 +1256,9 @@
     ],
     "test.test[join-join_with_duplicate_keys_on_sorted-off-Debug]": [
         {
-            "checksum": "906dacc9531037033459228647d43e53",
-            "size": 3207,
-            "uri": "https://{canondata_backend}/1917492/11f230eb792116e595ab03312b67142ea47d20e0/resource.tar.gz#test.test_join-join_with_duplicate_keys_on_sorted-off-Debug_/opt.yql_patched"
+            "checksum": "cf9071239f93b72ca31ccde94f3c2c24",
+            "size": 3224,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-join_with_duplicate_keys_on_sorted-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_with_duplicate_keys_on_sorted-off-Plan]": [
@@ -1287,9 +1287,9 @@
     ],
     "test.test[join-join_without_correlation_and_dict_access--Debug]": [
         {
-            "checksum": "d616c12f1f8cee15ec65aa3cd81e7a3b",
-            "size": 4252,
-            "uri": "https://{canondata_backend}/1777230/783a2910c4d77e5aa8c5d6ad3e840bc965864783/resource.tar.gz#test.test_join-join_without_correlation_and_dict_access--Debug_/opt.yql_patched"
+            "checksum": "50bf7b6c15bf74a90cc30c497310beba",
+            "size": 4272,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-join_without_correlation_and_dict_access--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_and_dict_access--Plan]": [
@@ -1316,9 +1316,9 @@
     ],
     "test.test[join-join_without_correlation_and_dict_access-off-Debug]": [
         {
-            "checksum": "9b29e6931e465d8e3265e27bfd98e279",
-            "size": 3695,
-            "uri": "https://{canondata_backend}/1903280/fbbb08f81e8431c873a84474187acbd073ef4018/resource.tar.gz#test.test_join-join_without_correlation_and_dict_access-off-Debug_/opt.yql_patched"
+            "checksum": "4774970de4a36a54e87ff3419af8bfcc",
+            "size": 3718,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-join_without_correlation_and_dict_access-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_and_dict_access-off-Plan]": [
@@ -1347,9 +1347,9 @@
     ],
     "test.test[join-left_join_null_column-off-Debug]": [
         {
-            "checksum": "44b0966a43b31a4e15f61f9246655de5",
-            "size": 2095,
-            "uri": "https://{canondata_backend}/1917492/11f230eb792116e595ab03312b67142ea47d20e0/resource.tar.gz#test.test_join-left_join_null_column-off-Debug_/opt.yql_patched"
+            "checksum": "caec46d2422053a772d83323cad11214",
+            "size": 2113,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-left_join_null_column-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_join_null_column-off-Plan]": [
@@ -1378,9 +1378,9 @@
     ],
     "test.test[join-lookupjoin_bug7646_subst-off-Debug]": [
         {
-            "checksum": "7f0cb61d7c27f22387e1b2ffc6351477",
-            "size": 5718,
-            "uri": "https://{canondata_backend}/1942100/72a92167d580e34a66a471ffefa0527d367c0a13/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst-off-Debug_/opt.yql_patched"
+            "checksum": "8fab16f789373dfa7a63ac61bbdc431a",
+            "size": 5788,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug7646_subst-off-Plan]": [
@@ -1406,9 +1406,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o2o--Debug]": [
         {
-            "checksum": "33135704ce8719a943ad420f0a32b62c",
-            "size": 4088,
-            "uri": "https://{canondata_backend}/1917492/52877e4bffaecef8e641d59b7acd2e3b20826f08/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o--Debug_/opt.yql_patched"
+            "checksum": "d8b036fabfce9d73497abc8a1ca15882",
+            "size": 4092,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_1o2o--Plan]": [
@@ -1428,9 +1428,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite-off-Debug]": [
         {
-            "checksum": "868ebf72be35ee3f8dfb12e048c40b19",
-            "size": 2543,
-            "uri": "https://{canondata_backend}/1937027/591a1ceca790d81eaf524a7a3e730722b0d7bdb7/resource.tar.gz#test.test_join-mapjoin_early_rewrite-off-Debug_/opt.yql_patched"
+            "checksum": "3621856563d2d26a919c9ac1de8e7ec7",
+            "size": 2580,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-mapjoin_early_rewrite-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite-off-Plan]": [
@@ -1456,9 +1456,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names-off-Debug]": [
         {
-            "checksum": "60ec51ba48c86d0befbb112dab616504",
-            "size": 5122,
-            "uri": "https://{canondata_backend}/937458/ea9bb2a5f9f6868f4e251937f810b7466fb20b69/resource.tar.gz#test.test_join-mergejoin_with_different_key_names-off-Debug_/opt.yql_patched"
+            "checksum": "814b7e11f7020902ed2f76b480d5b2f7",
+            "size": 5167,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-mergejoin_with_different_key_names-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names-off-Plan]": [
@@ -1484,9 +1484,9 @@
     ],
     "test.test[join-mergejoin_with_table_range-off-Debug]": [
         {
-            "checksum": "49e7975158dd7ffedd3c20449e6968a8",
-            "size": 3025,
-            "uri": "https://{canondata_backend}/1917492/11f230eb792116e595ab03312b67142ea47d20e0/resource.tar.gz#test.test_join-mergejoin_with_table_range-off-Debug_/opt.yql_patched"
+            "checksum": "48da308897659a5a3fda0ec9da8eb95d",
+            "size": 3031,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-mergejoin_with_table_range-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_table_range-off-Plan]": [
@@ -1512,9 +1512,9 @@
     ],
     "test.test[join-nopushdown_filter_with_depends_on--Debug]": [
         {
-            "checksum": "3e8842bceab87f1453ceba4780bf376b",
-            "size": 2712,
-            "uri": "https://{canondata_backend}/1917492/52877e4bffaecef8e641d59b7acd2e3b20826f08/resource.tar.gz#test.test_join-nopushdown_filter_with_depends_on--Debug_/opt.yql_patched"
+            "checksum": "2aec55e11669027bd97ce399e9ca79aa",
+            "size": 2720,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-nopushdown_filter_with_depends_on--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nopushdown_filter_with_depends_on--Plan]": [
@@ -1533,9 +1533,9 @@
     ],
     "test.test[join-premap_map_semi--Debug]": [
         {
-            "checksum": "7a25ce07ec651d264909b5bb84064eb9",
-            "size": 3258,
-            "uri": "https://{canondata_backend}/1917492/52877e4bffaecef8e641d59b7acd2e3b20826f08/resource.tar.gz#test.test_join-premap_map_semi--Debug_/opt.yql_patched"
+            "checksum": "ed8cdddb2502fad654ab0edd85d09d71",
+            "size": 3280,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-premap_map_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_semi--Plan]": [
@@ -1555,9 +1555,9 @@
     ],
     "test.test[join-pullup_context_dep--Debug]": [
         {
-            "checksum": "cdbc9b3c3ce518567c606e0a30fb3886",
-            "size": 2978,
-            "uri": "https://{canondata_backend}/1917492/52877e4bffaecef8e641d59b7acd2e3b20826f08/resource.tar.gz#test.test_join-pullup_context_dep--Debug_/opt.yql_patched"
+            "checksum": "824e0c71abe08241398393b5a46ca92f",
+            "size": 2986,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-pullup_context_dep--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_context_dep--Plan]": [
@@ -1577,9 +1577,9 @@
     ],
     "test.test[join-simple_columns_partial-off-Debug]": [
         {
-            "checksum": "4e86b2be4a81b483732fe7d86a8b69dc",
-            "size": 4171,
-            "uri": "https://{canondata_backend}/1937027/591a1ceca790d81eaf524a7a3e730722b0d7bdb7/resource.tar.gz#test.test_join-simple_columns_partial-off-Debug_/opt.yql_patched"
+            "checksum": "e0d08436c16fbda8a2975e7ae67a529c",
+            "size": 4217,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-simple_columns_partial-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-simple_columns_partial-off-Plan]": [
@@ -1605,9 +1605,9 @@
     ],
     "test.test[join-split_to_list_as_key-off-Debug]": [
         {
-            "checksum": "0c02cbe903d6b4b8e00429d702bcb532",
-            "size": 3226,
-            "uri": "https://{canondata_backend}/1937027/502be9b2221df7059e5fbde22bcd40d093d89380/resource.tar.gz#test.test_join-split_to_list_as_key-off-Debug_/opt.yql_patched"
+            "checksum": "bd97fafbada42e19dadddc47c2a227e5",
+            "size": 3252,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_join-split_to_list_as_key-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-split_to_list_as_key-off-Plan]": [
@@ -1875,9 +1875,9 @@
     ],
     "test.test[pg-select_alias_partial-default.txt-Debug]": [
         {
-            "checksum": "fc8ea9e1ad31c8372cca31f5b124f2a2",
-            "size": 2772,
-            "uri": "https://{canondata_backend}/937458/b4627e6d6be4f5c698896c8236ab5f6f65070d11/resource.tar.gz#test.test_pg-select_alias_partial-default.txt-Debug_/opt.yql_patched"
+            "checksum": "56a2ceea25fb347d79b3e90bf5567753",
+            "size": 2780,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_pg-select_alias_partial-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_alias_partial-default.txt-Plan]": [
@@ -2073,9 +2073,9 @@
     ],
     "test.test[pg-select_subquery2_qstar-default.txt-Debug]": [
         {
-            "checksum": "5c507d4a811dfda5045c19690dde06ea",
-            "size": 3200,
-            "uri": "https://{canondata_backend}/937458/b4627e6d6be4f5c698896c8236ab5f6f65070d11/resource.tar.gz#test.test_pg-select_subquery2_qstar-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3090537fa40aecdbd267bb3ca0827b56",
+            "size": 3208,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_pg-select_subquery2_qstar-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_subquery2_qstar-default.txt-Plan]": [
@@ -2271,9 +2271,9 @@
     ],
     "test.test[pg-tpch-q17-default.txt-Debug]": [
         {
-            "checksum": "92e004e093416657d9b26ba05f95f7a3",
-            "size": 12728,
-            "uri": "https://{canondata_backend}/1775059/9eedb4082a9c5687ea48a927cccd2bd29c8dcfea/resource.tar.gz#test.test_pg-tpch-q17-default.txt-Debug_/opt.yql_patched"
+            "checksum": "e52f11b95712c5c609b1546bec440123",
+            "size": 12768,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_pg-tpch-q17-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q17-default.txt-Plan]": [
@@ -2293,9 +2293,9 @@
     ],
     "test.test[pg-tpch-q22-default.txt-Debug]": [
         {
-            "checksum": "b6e296abe8ebac82424aa92de82e6dd8",
-            "size": 12634,
-            "uri": "https://{canondata_backend}/1903280/fbbb08f81e8431c873a84474187acbd073ef4018/resource.tar.gz#test.test_pg-tpch-q22-default.txt-Debug_/opt.yql_patched"
+            "checksum": "281c10acc4bd98161d9fa8360dd9c208",
+            "size": 12666,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_pg-tpch-q22-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q22-default.txt-Plan]": [
@@ -2427,9 +2427,9 @@
     ],
     "test.test[sampling-join_right_sample-default.txt-Debug]": [
         {
-            "checksum": "714458eb4f639eb0eac281b3289d8757",
-            "size": 2178,
-            "uri": "https://{canondata_backend}/1917492/52877e4bffaecef8e641d59b7acd2e3b20826f08/resource.tar.gz#test.test_sampling-join_right_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "7d022df4967459e1f506629952a03b25",
+            "size": 2186,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_sampling-join_right_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-join_right_sample-default.txt-Plan]": [
@@ -2448,9 +2448,9 @@
     ],
     "test.test[sampling-orderedjoin_left_sample-default.txt-Debug]": [
         {
-            "checksum": "aeb68cb35f2b10692183ec71bc4a8dcd",
-            "size": 2283,
-            "uri": "https://{canondata_backend}/1917492/52877e4bffaecef8e641d59b7acd2e3b20826f08/resource.tar.gz#test.test_sampling-orderedjoin_left_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "b8d00c842d6108695ca9219c7aea644a",
+            "size": 2291,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_sampling-orderedjoin_left_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-orderedjoin_left_sample-default.txt-Plan]": [
@@ -2684,9 +2684,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key-default.txt-Debug]": [
         {
-            "checksum": "d9b936978c99f15d1905f5861f60cb03",
-            "size": 2780,
-            "uri": "https://{canondata_backend}/1937027/591a1ceca790d81eaf524a7a3e730722b0d7bdb7/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1967fa00f2c757086f28bf0771646232",
+            "size": 2786,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key-default.txt-Plan]": [
@@ -2754,9 +2754,9 @@
     ],
     "test.test[tpch-q12-default.txt-Debug]": [
         {
-            "checksum": "9b8f9e49542eb189959a7182c726983f",
-            "size": 6741,
-            "uri": "https://{canondata_backend}/1946324/c35c8a7ff9d6443345783e92fcfd03c7ec5af0c7/resource.tar.gz#test.test_tpch-q12-default.txt-Debug_/opt.yql_patched"
+            "checksum": "d9a5d2d92048d3758427858599f3ef33",
+            "size": 6764,
+            "uri": "https://{canondata_backend}/1924537/f2f8ec82f021dbf4a5216de80284759c6b6f6a8d/resource.tar.gz#test.test_tpch-q12-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q12-default.txt-Plan]": [
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 f05da57529a..980221fdcf0 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
@@ -935,9 +935,9 @@
     ],
     "test.test[flatten_by-flatten_with_join--Debug]": [
         {
-            "checksum": "cb49d7acaba06fed209065032caa016c",
-            "size": 4010,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_flatten_by-flatten_with_join--Debug_/opt.yql_patched"
+            "checksum": "cea610983d24d84d06889cfaa64985ab",
+            "size": 4030,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_flatten_by-flatten_with_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[flatten_by-flatten_with_join--Plan]": [
@@ -1005,9 +1005,9 @@
     ],
     "test.test[in-in_sorted_by_tuple--Debug]": [
         {
-            "checksum": "dd222d63e772e2567a0b7946001a0a50",
-            "size": 6153,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_in-in_sorted_by_tuple--Debug_/opt.yql_patched"
+            "checksum": "a77c29b1f2916eb64225b570bb609fc4",
+            "size": 6161,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_in-in_sorted_by_tuple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_sorted_by_tuple--Plan]": [
@@ -1108,9 +1108,9 @@
     ],
     "test.test[join-equi_join_three_asterisk--Debug]": [
         {
-            "checksum": "f6f76b8999fc1bb6a9cd3657446610e5",
-            "size": 4043,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-equi_join_three_asterisk--Debug_/opt.yql_patched"
+            "checksum": "35f13a37d65e6faf90b582fb4f0ecf97",
+            "size": 4059,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-equi_join_three_asterisk--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_asterisk--Plan]": [
@@ -1130,9 +1130,9 @@
     ],
     "test.test[join-equi_join_three_asterisk-off-Debug]": [
         {
-            "checksum": "c4cd9c108263b7ec13c68d0348fe6738",
-            "size": 3402,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-equi_join_three_asterisk-off-Debug_/opt.yql_patched"
+            "checksum": "a9ea335e60dc1488fc40a46a9cf6167c",
+            "size": 3478,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-equi_join_three_asterisk-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_asterisk-off-Plan]": [
@@ -1158,9 +1158,9 @@
     ],
     "test.test[join-inner_all-off-Debug]": [
         {
-            "checksum": "5098b0573087b45498ebc66ffcc47408",
-            "size": 2100,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-inner_all-off-Debug_/opt.yql_patched"
+            "checksum": "4acf72d47925db15f17b99b35ec9917a",
+            "size": 2156,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-inner_all-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_all-off-Plan]": [
@@ -1194,9 +1194,9 @@
     ],
     "test.test[join-join_without_correlation_and_struct_access--Debug]": [
         {
-            "checksum": "3d6d99eb912bdbf7437d38eb396593d8",
-            "size": 3507,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-join_without_correlation_and_struct_access--Debug_/opt.yql_patched"
+            "checksum": "2a77bd557da7223bdae0c7e8da89b396",
+            "size": 3541,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-join_without_correlation_and_struct_access--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_and_struct_access--Plan]": [
@@ -1220,9 +1220,9 @@
     ],
     "test.test[join-left_trivial--Debug]": [
         {
-            "checksum": "ac9cf6c882cc75a2464b36f4d4f890af",
-            "size": 2626,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-left_trivial--Debug_/opt.yql_patched"
+            "checksum": "95a0be0a9559653066b2fce0edeab0e6",
+            "size": 2634,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-left_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_trivial--Plan]": [
@@ -1242,9 +1242,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o-off-Debug]": [
         {
-            "checksum": "a92e44b639919efa6acb6b8538e1f10a",
-            "size": 3022,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-lookupjoin_inner_1o-off-Debug_/opt.yql_patched"
+            "checksum": "17018fa0f461aa92589148f6dc6675b1",
+            "size": 3028,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-lookupjoin_inner_1o-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_1o-off-Plan]": [
@@ -1270,9 +1270,9 @@
     ],
     "test.test[join-mergejoin_big_primary--Debug]": [
         {
-            "checksum": "8e9534a5e6c28cb574b399d20a4f7b28",
-            "size": 3455,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-mergejoin_big_primary--Debug_/opt.yql_patched"
+            "checksum": "913a4fbb331572f446be1fff23de9bad",
+            "size": 3491,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-mergejoin_big_primary--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_big_primary--Plan]": [
@@ -1295,9 +1295,9 @@
     ],
     "test.test[join-mergejoin_force_align1-off-Debug]": [
         {
-            "checksum": "33c9d200c3615d2e6b1db9185a359cd2",
-            "size": 6601,
-            "uri": "https://{canondata_backend}/1600758/355a697506f4007ca3fcd5fef0049412eb61f38b/resource.tar.gz#test.test_join-mergejoin_force_align1-off-Debug_/opt.yql_patched"
+            "checksum": "c7d5ac4efd18afdd4a2af60a059fda52",
+            "size": 6667,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-mergejoin_force_align1-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_align1-off-Plan]": [
@@ -1323,9 +1323,9 @@
     ],
     "test.test[join-pullup_left--Debug]": [
         {
-            "checksum": "608f0e7c24d076cf95e4032e08bd76f4",
-            "size": 3125,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-pullup_left--Debug_/opt.yql_patched"
+            "checksum": "5d4d7ef6d423889b57f1229c4e7dd9ac",
+            "size": 3133,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-pullup_left--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_left--Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-pullup_left-off-Debug]": [
         {
-            "checksum": "3ba72ff607f01033197b7bf04d5a3679",
-            "size": 2997,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-pullup_left-off-Debug_/opt.yql_patched"
+            "checksum": "0e4a59bd6870cdba711343fcfc46d4d3",
+            "size": 3027,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-pullup_left-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_left-off-Plan]": [
@@ -1368,14 +1368,14 @@
         {
             "checksum": "21b1cefd30e1410fbfbfcdbe51647898",
             "size": 7016,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-pullup_renaming--Analyze_/plan.txt"
+            "uri": "https://{canondata_backend}/1946324/be96ad9cdb7bebb78c68ecc4a7b291982b0e9f1e/resource.tar.gz#test.test_join-pullup_renaming--Analyze_/plan.txt"
         }
     ],
     "test.test[join-pullup_renaming--Debug]": [
         {
-            "checksum": "f8cd11ac51b4a82e869dc9c556ae3c60",
-            "size": 3238,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-pullup_renaming--Debug_/opt.yql_patched"
+            "checksum": "b15310dd84f175ec7427c8e2f330e891",
+            "size": 3252,
+            "uri": "https://{canondata_backend}/1946324/be96ad9cdb7bebb78c68ecc4a7b291982b0e9f1e/resource.tar.gz#test.test_join-pullup_renaming--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_renaming--Plan]": [
@@ -1395,9 +1395,9 @@
     ],
     "test.test[join-pullup_renaming-off-Debug]": [
         {
-            "checksum": "8452c44fb0931a5d8bf9f6462010942d",
-            "size": 3130,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-pullup_renaming-off-Debug_/opt.yql_patched"
+            "checksum": "d485fd5d28ab0132249fb98c11b46614",
+            "size": 3174,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-pullup_renaming-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_renaming-off-Plan]": [
@@ -1423,9 +1423,9 @@
     ],
     "test.test[join-right_trivial--Debug]": [
         {
-            "checksum": "1112e480cb5a640971865a70916436c0",
-            "size": 2955,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-right_trivial--Debug_/opt.yql_patched"
+            "checksum": "49cc9373f453ac6dcaf3d934fa26815d",
+            "size": 2963,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-right_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-right_trivial--Plan]": [
@@ -1445,9 +1445,9 @@
     ],
     "test.test[join-star_join_inners_vk_sorted--Debug]": [
         {
-            "checksum": "22383e3a17ddf332fdcdcd1ad17729d8",
-            "size": 6341,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-star_join_inners_vk_sorted--Debug_/opt.yql_patched"
+            "checksum": "842425e803ee8fdfbf39e106664aa4a9",
+            "size": 6411,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-star_join_inners_vk_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners_vk_sorted--Plan]": [
@@ -1470,9 +1470,9 @@
     ],
     "test.test[join-yql-14829_leftonly-off-Debug]": [
         {
-            "checksum": "4934ec0dadec85b8b4c9bd7ae4942366",
-            "size": 4715,
-            "uri": "https://{canondata_backend}/1600758/355a697506f4007ca3fcd5fef0049412eb61f38b/resource.tar.gz#test.test_join-yql-14829_leftonly-off-Debug_/opt.yql_patched"
+            "checksum": "6c3714a334b1b4c621ddcd3b154b2e5f",
+            "size": 4727,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-yql-14829_leftonly-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14829_leftonly-off-Plan]": [
@@ -1498,9 +1498,9 @@
     ],
     "test.test[join-yql-4275-off-Debug]": [
         {
-            "checksum": "70fed8ae9d3deb93d51e4359f0092422",
-            "size": 2235,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_join-yql-4275-off-Debug_/opt.yql_patched"
+            "checksum": "b7728570d91f893a8546dfa86eedb71c",
+            "size": 2241,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_join-yql-4275-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-4275-off-Plan]": [
@@ -2124,9 +2124,9 @@
     ],
     "test.test[pg-tpch-q03-default.txt-Debug]": [
         {
-            "checksum": "1814f0ef408faa9f34d78170bec5d61a",
-            "size": 10322,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_pg-tpch-q03-default.txt-Debug_/opt.yql_patched"
+            "checksum": "e29261548e03cc2f0206438849341d48",
+            "size": 10403,
+            "uri": "https://{canondata_backend}/1773845/6b405142992a5c77db0614b3fc396504b6ca928a/resource.tar.gz#test.test_pg-tpch-q03-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q03-default.txt-Plan]": [
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 083df5c3e63..6f54ab6f2b4 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
@@ -300,9 +300,9 @@
     ],
     "test.test[aggregate-group_by_expr_only_join--Debug]": [
         {
-            "checksum": "afb4bfe278267265cf8243e9403332b0",
-            "size": 3364,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_aggregate-group_by_expr_only_join--Debug_/opt.yql_patched"
+            "checksum": "61c209ace3254c01e31425aaf81d5674",
+            "size": 3370,
+            "uri": "https://{canondata_backend}/1814674/20f3129ea615ab84719eb3b5b8d166befc8c02aa/resource.tar.gz#test.test_aggregate-group_by_expr_only_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_expr_only_join--Plan]": [
@@ -681,9 +681,9 @@
     ],
     "test.test[distinct-distinct_and_join--Debug]": [
         {
-            "checksum": "cce1b46a9e0fb4429225f3eb7e7ecca5",
-            "size": 2837,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_distinct-distinct_and_join--Debug_/opt.yql_patched"
+            "checksum": "ced76ed3b8ea032d6fd83e5924fff0f9",
+            "size": 2871,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_distinct-distinct_and_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[distinct-distinct_and_join--Plan]": [
@@ -1020,9 +1020,9 @@
     ],
     "test.test[join-bush_dis_in--Debug]": [
         {
-            "checksum": "a35a492c4800319f1c7ab93e25afce7d",
-            "size": 6172,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-bush_dis_in--Debug_/opt.yql_patched"
+            "checksum": "d605fe7605bbf4b77811feb075d18dd7",
+            "size": 6223,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-bush_dis_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in--Plan]": [
@@ -1042,9 +1042,9 @@
     ],
     "test.test[join-bush_dis_in-off-Debug]": [
         {
-            "checksum": "c4cce17411f29c27a5b41f774259e255",
-            "size": 5304,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-bush_dis_in-off-Debug_/opt.yql_patched"
+            "checksum": "9287ac36a478251f443d4ce8d5724259",
+            "size": 5372,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-bush_dis_in-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in-off-Plan]": [
@@ -1070,9 +1070,9 @@
     ],
     "test.test[join-bush_in_in-off-Debug]": [
         {
-            "checksum": "ee13f97af71832ca97d7eab8d73b7d98",
-            "size": 4107,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-bush_in_in-off-Debug_/opt.yql_patched"
+            "checksum": "8e23e09d6b2dba2ce3fdf4d3fcb2622b",
+            "size": 4192,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-bush_in_in-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in_in-off-Plan]": [
@@ -1098,9 +1098,9 @@
     ],
     "test.test[join-count_bans-off-Debug]": [
         {
-            "checksum": "0604af957523e3264cf16ebeddf5c473",
-            "size": 4581,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-count_bans-off-Debug_/opt.yql_patched"
+            "checksum": "357fb57bb3577cc173f797a96a184792",
+            "size": 4618,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-count_bans-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-count_bans-off-Plan]": [
@@ -1126,9 +1126,9 @@
     ],
     "test.test[join-flatten_columns2--Debug]": [
         {
-            "checksum": "ea12238365e51aff08cd5c94327c1cf5",
-            "size": 2855,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-flatten_columns2--Debug_/opt.yql_patched"
+            "checksum": "2efd03fbcce99b67d13b9ea2ba183771",
+            "size": 2863,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-flatten_columns2--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-flatten_columns2--Plan]": [
@@ -1148,9 +1148,9 @@
     ],
     "test.test[join-grace_join1-grace-Debug]": [
         {
-            "checksum": "c2161d1ad0893e8e06278d1215c698df",
-            "size": 2985,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-grace_join1-grace-Debug_/opt.yql_patched"
+            "checksum": "b90e5dc268dc30f89c66bf8b83570a56",
+            "size": 2993,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-grace_join1-grace-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-grace_join1-grace-Plan]": [
@@ -1198,9 +1198,9 @@
     ],
     "test.test[join-inner_all_right--Debug]": [
         {
-            "checksum": "24fa8706e3a1ead36415542821942c51",
-            "size": 2379,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-inner_all_right--Debug_/opt.yql_patched"
+            "checksum": "46890a5ae6af31d5be72f253bc7f31c9",
+            "size": 2387,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-inner_all_right--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_all_right--Plan]": [
@@ -1220,9 +1220,9 @@
     ],
     "test.test[join-inner_grouped_by_expr-off-Debug]": [
         {
-            "checksum": "8c47bc802540719092a26b6be0a0fdcf",
-            "size": 3444,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-inner_grouped_by_expr-off-Debug_/opt.yql_patched"
+            "checksum": "2467c2f4ded5d11bc1594eb40772325f",
+            "size": 3466,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-inner_grouped_by_expr-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_grouped_by_expr-off-Plan]": [
@@ -1276,9 +1276,9 @@
     ],
     "test.test[join-left_only_with_other--Debug]": [
         {
-            "checksum": "dca60a7be345e1d082e24cb5450175b4",
-            "size": 3598,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-left_only_with_other--Debug_/opt.yql_patched"
+            "checksum": "953135885bad3edd88c5ddd8f8709419",
+            "size": 3610,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-left_only_with_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_only_with_other--Plan]": [
@@ -1298,9 +1298,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_star--Debug]": [
         {
-            "checksum": "bfa2e6f26790de98bbabef8f5f4c070f",
-            "size": 2980,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star--Debug_/opt.yql_patched"
+            "checksum": "4a2e44688402ea2368a8938594321c06",
+            "size": 3001,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_star--Plan]": [
@@ -1320,9 +1320,9 @@
     ],
     "test.test[join-mapjoin_with_empty_struct--Debug]": [
         {
-            "checksum": "c81954539c7602e0390507c8057f5a70",
-            "size": 1912,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-mapjoin_with_empty_struct--Debug_/opt.yql_patched"
+            "checksum": "8d8b8b2251830b5295aec4e51ff3f875",
+            "size": 1920,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-mapjoin_with_empty_struct--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_with_empty_struct--Plan]": [
@@ -1342,9 +1342,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort_cross--Debug]": [
         {
-            "checksum": "db74f78669f5221cefa1a0c7ca3625ee",
-            "size": 4523,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_cross--Debug_/opt.yql_patched"
+            "checksum": "39de66d436c603f2e57b8af6ad9517fd",
+            "size": 4539,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort_cross--Plan]": [
@@ -1364,9 +1364,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort_nested--Debug]": [
         {
-            "checksum": "6e87d5d1ca6fd77cc298de5c2b388932",
-            "size": 6016,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_nested--Debug_/opt.yql_patched"
+            "checksum": "7013f381a0f5b6fc8c4266604b99fa54",
+            "size": 6028,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_nested--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort_nested--Plan]": [
@@ -1386,9 +1386,9 @@
     ],
     "test.test[join-premap_common_multiparents-off-Debug]": [
         {
-            "checksum": "72763fc890688cb0e7860660ff4b0fa4",
-            "size": 4086,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-premap_common_multiparents-off-Debug_/opt.yql_patched"
+            "checksum": "d09b2a7be6f73151ed74aec7b00bd214",
+            "size": 4122,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-premap_common_multiparents-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_multiparents-off-Plan]": [
@@ -1414,9 +1414,9 @@
     ],
     "test.test[join-premap_common_semi--Debug]": [
         {
-            "checksum": "470267d4e0176768077c712fba5a13fc",
-            "size": 2624,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-premap_common_semi--Debug_/opt.yql_patched"
+            "checksum": "a36f83d03671470d01904b85ffb480ec",
+            "size": 2632,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-premap_common_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_semi--Plan]": [
@@ -1436,9 +1436,9 @@
     ],
     "test.test[join-premap_common_semi-off-Debug]": [
         {
-            "checksum": "6dc9095975f147677770ee4d32c32380",
-            "size": 2552,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-premap_common_semi-off-Debug_/opt.yql_patched"
+            "checksum": "8814d2beaf36cf123e4ac94d42c822dc",
+            "size": 2574,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-premap_common_semi-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_semi-off-Plan]": [
@@ -1464,9 +1464,9 @@
     ],
     "test.test[join-selfjoin_on_sorted--Debug]": [
         {
-            "checksum": "a25841c15e0f315499e4b92a463f1a55",
-            "size": 2075,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-selfjoin_on_sorted--Debug_/opt.yql_patched"
+            "checksum": "891ba5611cd33a098a1e20176f7eab29",
+            "size": 2081,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-selfjoin_on_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted--Plan]": [
@@ -1486,9 +1486,9 @@
     ],
     "test.test[join-star_join_inners_premap--Debug]": [
         {
-            "checksum": "6a018d03c1c866bf1b9b2fdd296df943",
-            "size": 6696,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-star_join_inners_premap--Debug_/opt.yql_patched"
+            "checksum": "ad2480f19da8f155ad58d27df49c23e9",
+            "size": 6708,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-star_join_inners_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners_premap--Plan]": [
@@ -1508,9 +1508,9 @@
     ],
     "test.test[join-star_join_inners_premap-off-Debug]": [
         {
-            "checksum": "2d527a7dda592532c5b28eae91077730",
-            "size": 6321,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-star_join_inners_premap-off-Debug_/opt.yql_patched"
+            "checksum": "c9036b9e1f730e1d2671402128a91fb5",
+            "size": 6337,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_join-star_join_inners_premap-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners_premap-off-Plan]": [
@@ -1847,9 +1847,9 @@
     ],
     "test.test[pg-select_subquery2-default.txt-Debug]": [
         {
-            "checksum": "ea405b92129a9f2d361381cb1fd8cc67",
-            "size": 3200,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_pg-select_subquery2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "f7d8af1c56d479434ab34058d984fd88",
+            "size": 3208,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_pg-select_subquery2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_subquery2-default.txt-Plan]": [
@@ -2045,9 +2045,9 @@
     ],
     "test.test[pg-tpch-q02-default.txt-Debug]": [
         {
-            "checksum": "c927df5d8fde88f8aa8c5571ffdaac64",
-            "size": 20281,
-            "uri": "https://{canondata_backend}/1937027/840ae09a36bdc9a4737f612d0787fa5691189018/resource.tar.gz#test.test_pg-tpch-q02-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1f59bfdd0ea5e16cdb07c01ad46ef8b8",
+            "size": 20448,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_pg-tpch-q02-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q02-default.txt-Plan]": [
@@ -2067,9 +2067,9 @@
     ],
     "test.test[pg-tpch-q19-default.txt-Debug]": [
         {
-            "checksum": "7eb7d89750b68ef9108e1440c5c71302",
-            "size": 9295,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_pg-tpch-q19-default.txt-Debug_/opt.yql_patched"
+            "checksum": "654fc76efe31b1df7719134c050cc7bc",
+            "size": 9336,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_pg-tpch-q19-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q19-default.txt-Plan]": [
@@ -2400,9 +2400,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Debug]": [
         {
-            "checksum": "e3d378a7cade6323697f591b6141b708",
-            "size": 2354,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "745699f8b092422291c51fa68f149e5f",
+            "size": 2360,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Plan]": [
@@ -2430,9 +2430,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Debug]": [
         {
-            "checksum": "45e0b71d36b37069232f5aadc6277daa",
-            "size": 3245,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Debug_/opt.yql_patched"
+            "checksum": "66e0fe56bdee75af1e4e6a2cb793100f",
+            "size": 3279,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Plan]": [
@@ -2507,9 +2507,9 @@
     ],
     "test.test[tpch-q4-default.txt-Debug]": [
         {
-            "checksum": "be29ab0f84bb368f5dce573ede045b41",
-            "size": 6512,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_tpch-q4-default.txt-Debug_/opt.yql_patched"
+            "checksum": "4323ba4789a4f474172c6098dc9f8551",
+            "size": 6533,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_tpch-q4-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q4-default.txt-Plan]": [
@@ -2617,9 +2617,9 @@
     ],
     "test.test[weak_field-weak_field_join_where--Debug]": [
         {
-            "checksum": "52130d5e7a01619b0175192e2366e509",
-            "size": 4707,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_weak_field-weak_field_join_where--Debug_/opt.yql_patched"
+            "checksum": "375d00aa24f330d62ca8bf3025a5111b",
+            "size": 4743,
+            "uri": "https://{canondata_backend}/1031349/5baef42837a5c7e8f75ff06754ea8ff7be02b259/resource.tar.gz#test.test_weak_field-weak_field_join_where--Debug_/opt.yql_patched"
         }
     ],
     "test.test[weak_field-weak_field_join_where--Plan]": [
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 b7b80ebc73d..09625e8da17 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
@@ -301,9 +301,9 @@
     ],
     "test.test[ansi_idents-join_using-default.txt-Debug]": [
         {
-            "checksum": "0e100bba3df99867950939373ebdcb0a",
-            "size": 3156,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_ansi_idents-join_using-default.txt-Debug_/opt.yql_patched"
+            "checksum": "85caa5ea7e2aba84aef6944e1670a770",
+            "size": 3164,
+            "uri": "https://{canondata_backend}/1777230/6431aa7a9bca8c0bbec39851d33696aac03b1a14/resource.tar.gz#test.test_ansi_idents-join_using-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[ansi_idents-join_using-default.txt-Plan]": [
@@ -1103,9 +1103,9 @@
     ],
     "test.test[in-in_with_table_of_tuples-default.txt-Debug]": [
         {
-            "checksum": "58537ff3c340707d052468b0f363df44",
-            "size": 4384,
-            "uri": "https://{canondata_backend}/1942671/ba6b48915abb43891f21c0cc2e363567908ff398/resource.tar.gz#test.test_in-in_with_table_of_tuples-default.txt-Debug_/opt.yql_patched"
+            "checksum": "22e03a0bccff2a4777e516cb1d95265d",
+            "size": 4419,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_in-in_with_table_of_tuples-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_with_table_of_tuples-default.txt-Plan]": [
@@ -1220,9 +1220,9 @@
     ],
     "test.test[join-aggr_diff_order-default.txt-Debug]": [
         {
-            "checksum": "8cd6fba6f3d5dc2ffbb5f67aa598a4d5",
-            "size": 2878,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-aggr_diff_order-default.txt-Debug_/opt.yql_patched"
+            "checksum": "6db6e86649822d24ea65043bfeba0482",
+            "size": 2884,
+            "uri": "https://{canondata_backend}/1777230/6431aa7a9bca8c0bbec39851d33696aac03b1a14/resource.tar.gz#test.test_join-aggr_diff_order-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-aggr_diff_order-default.txt-Plan]": [
@@ -1242,9 +1242,9 @@
     ],
     "test.test[join-from_in_front_join--Debug]": [
         {
-            "checksum": "7488d9196a7ce179a518fb73e58e0db6",
-            "size": 2439,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-from_in_front_join--Debug_/opt.yql_patched"
+            "checksum": "33a7c0834d1ba388f9df6ecd0c556480",
+            "size": 2447,
+            "uri": "https://{canondata_backend}/1777230/6431aa7a9bca8c0bbec39851d33696aac03b1a14/resource.tar.gz#test.test_join-from_in_front_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-from_in_front_join--Plan]": [
@@ -1264,9 +1264,9 @@
     ],
     "test.test[join-full_equal_not_null-off-Debug]": [
         {
-            "checksum": "d9cc038bd77d64ef90f559c1fa3029fc",
-            "size": 3187,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-full_equal_not_null-off-Debug_/opt.yql_patched"
+            "checksum": "cbca6555d8e07e13e89c20b0461f72fc",
+            "size": 3222,
+            "uri": "https://{canondata_backend}/1777230/6431aa7a9bca8c0bbec39851d33696aac03b1a14/resource.tar.gz#test.test_join-full_equal_not_null-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_equal_not_null-off-Plan]": [
@@ -1292,9 +1292,9 @@
     ],
     "test.test[join-full_trivial_udf_call--Debug]": [
         {
-            "checksum": "d54f8482909899b9e183d950d82784a0",
-            "size": 3371,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-full_trivial_udf_call--Debug_/opt.yql_patched"
+            "checksum": "929579af3373f6e0c7e821aff7eeb244",
+            "size": 3379,
+            "uri": "https://{canondata_backend}/1777230/6431aa7a9bca8c0bbec39851d33696aac03b1a14/resource.tar.gz#test.test_join-full_trivial_udf_call--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_trivial_udf_call--Plan]": [
@@ -1314,9 +1314,9 @@
     ],
     "test.test[join-full_trivial_udf_call-off-Debug]": [
         {
-            "checksum": "d15da79ddb995563b1c84c6f245964c3",
-            "size": 3381,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-full_trivial_udf_call-off-Debug_/opt.yql_patched"
+            "checksum": "69f8398e5b93b43fdf34bd467fd03ba7",
+            "size": 3389,
+            "uri": "https://{canondata_backend}/1777230/6431aa7a9bca8c0bbec39851d33696aac03b1a14/resource.tar.gz#test.test_join-full_trivial_udf_call-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_trivial_udf_call-off-Plan]": [
@@ -1342,9 +1342,9 @@
     ],
     "test.test[join-grace_join1--Debug]": [
         {
-            "checksum": "c0417557c5cebf4bac494f38a25ae1da",
-            "size": 2897,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-grace_join1--Debug_/opt.yql_patched"
+            "checksum": "c93a099a6ed165c435f92eb2ee7a6b71",
+            "size": 2905,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-grace_join1--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-grace_join1--Plan]": [
@@ -1392,9 +1392,9 @@
     ],
     "test.test[join-join_key_cmp_udf-off-Debug]": [
         {
-            "checksum": "a08343ca097c8c5874501477560c1a34",
-            "size": 2605,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-join_key_cmp_udf-off-Debug_/opt.yql_patched"
+            "checksum": "ba80ce2fb3a7b95175389a10b75e5c20",
+            "size": 2638,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-join_key_cmp_udf-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_key_cmp_udf-off-Plan]": [
@@ -1420,9 +1420,9 @@
     ],
     "test.test[join-left_all-off-Debug]": [
         {
-            "checksum": "d18224559495606f807b4b5e2d5fa78c",
-            "size": 2099,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-left_all-off-Debug_/opt.yql_patched"
+            "checksum": "65adc3e6e976a2e50df93d54b35e6470",
+            "size": 2155,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-left_all-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_all-off-Plan]": [
@@ -1448,9 +1448,9 @@
     ],
     "test.test[join-lookupjoin_inner--Debug]": [
         {
-            "checksum": "77acb9f424f54727b36265db34a67478",
-            "size": 3133,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-lookupjoin_inner--Debug_/opt.yql_patched"
+            "checksum": "59a91fea00cd35b9b519d60262ea214c",
+            "size": 3141,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-lookupjoin_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner--Plan]": [
@@ -1470,9 +1470,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o2o--Debug]": [
         {
-            "checksum": "2ddd98234b86c37a5f61a8268c07bc24",
-            "size": 3803,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o--Debug_/opt.yql_patched"
+            "checksum": "121c6f8c6e88c850d4a4130381e11633",
+            "size": 3823,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_1o2o--Plan]": [
@@ -1495,9 +1495,9 @@
     ],
     "test.test[join-lookupjoin_with_cache--Debug]": [
         {
-            "checksum": "15abe08804a126edde1f2625c79f8926",
-            "size": 4792,
-            "uri": "https://{canondata_backend}/1942671/ba6b48915abb43891f21c0cc2e363567908ff398/resource.tar.gz#test.test_join-lookupjoin_with_cache--Debug_/opt.yql_patched"
+            "checksum": "d8add0e21ebacc6c5959b6322702c540",
+            "size": 4800,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-lookupjoin_with_cache--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_with_cache--Plan]": [
@@ -1517,9 +1517,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_sequence--Debug]": [
         {
-            "checksum": "7f31f398569491f6c2ac9e076c9a0314",
-            "size": 4851,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence--Debug_/opt.yql_patched"
+            "checksum": "0ae92115a6f080a195942a5c25c2096f",
+            "size": 4895,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_sequence--Plan]": [
@@ -1539,9 +1539,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_sequence-off-Debug]": [
         {
-            "checksum": "9af91ef88e5e35f86838f3b304ee4932",
-            "size": 4064,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence-off-Debug_/opt.yql_patched"
+            "checksum": "aa48ba06ba2891010539cc959c16034f",
+            "size": 4127,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_sequence-off-Plan]": [
@@ -1567,9 +1567,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort--Debug]": [
         {
-            "checksum": "fc50054aff4c914cecba6578e3c558c9",
-            "size": 9766,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Debug_/opt.yql_patched"
+            "checksum": "075e2c732cbc7ba3509e363e5e21536c",
+            "size": 9838,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort--Plan]": [
@@ -1589,9 +1589,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_nonsorted--Debug]": [
         {
-            "checksum": "f28339bb3a6e260dbb0c73061876109e",
-            "size": 3651,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nonsorted--Debug_/opt.yql_patched"
+            "checksum": "8f2d1476beffc8e6e8d1d379dc86d9ea",
+            "size": 3671,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nonsorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_nonsorted--Plan]": [
@@ -1611,9 +1611,9 @@
     ],
     "test.test[join-star_join_mirror-off-Debug]": [
         {
-            "checksum": "1e73d6c4c769c24329a9e84b5cab34a0",
-            "size": 7393,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-star_join_mirror-off-Debug_/opt.yql_patched"
+            "checksum": "522cd4255c99c184375bea5f336f755d",
+            "size": 7441,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-star_join_mirror-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_mirror-off-Plan]": [
@@ -1639,9 +1639,9 @@
     ],
     "test.test[join-yql-12022-off-Debug]": [
         {
-            "checksum": "6a4b6c2ebe9b21fcee572e727ad33d4f",
-            "size": 1944,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-yql-12022-off-Debug_/opt.yql_patched"
+            "checksum": "054e99b8e042c96c1eadebc96b252ace",
+            "size": 1964,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_join-yql-12022-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-12022-off-Plan]": [
@@ -1872,9 +1872,9 @@
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input--Debug]": [
         {
-            "checksum": "e68f097921f0ff1ca5e758da62e9d606",
-            "size": 3299,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input--Debug_/opt.yql_patched"
+            "checksum": "dae2ad094f47faee10cc7f751b27b56b",
+            "size": 3307,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input--Plan]": [
@@ -2537,9 +2537,9 @@
     ],
     "test.test[pg-tpch-q12-default.txt-Debug]": [
         {
-            "checksum": "82253358b5bab27007ab4cfbabe57312",
-            "size": 8302,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_pg-tpch-q12-default.txt-Debug_/opt.yql_patched"
+            "checksum": "dfeaa2a20e1d5d40f270324a0650fd96",
+            "size": 8343,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_pg-tpch-q12-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q12-default.txt-Plan]": [
@@ -2559,9 +2559,9 @@
     ],
     "test.test[pg-tpch-q16-default.txt-Debug]": [
         {
-            "checksum": "ba2c88322cb460359f64246bd529a784",
-            "size": 11447,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_pg-tpch-q16-default.txt-Debug_/opt.yql_patched"
+            "checksum": "d4eadd16045d10f347b08b7d11522f7d",
+            "size": 11524,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_pg-tpch-q16-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q16-default.txt-Plan]": [
@@ -2778,9 +2778,9 @@
     ],
     "test.test[sampling-mapjoin_left_sample-default.txt-Debug]": [
         {
-            "checksum": "3cecdbcd59e4c32b1913a67596b5d0ec",
-            "size": 2278,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_sampling-mapjoin_left_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ee61556b643836301047e2017d73693b",
+            "size": 2286,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_sampling-mapjoin_left_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-mapjoin_left_sample-default.txt-Plan]": [
@@ -3114,9 +3114,9 @@
     ],
     "test.test[tpch-q17-default.txt-Debug]": [
         {
-            "checksum": "3893169fc2f94eef3ef99cbb1e67ae46",
-            "size": 7421,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_tpch-q17-default.txt-Debug_/opt.yql_patched"
+            "checksum": "674fa0757774830939a4afb2415ba851",
+            "size": 7437,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_tpch-q17-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q17-default.txt-Plan]": [
@@ -3136,9 +3136,9 @@
     ],
     "test.test[tpch-q22-default.txt-Debug]": [
         {
-            "checksum": "f24a2c991007492f8604d305eefc2b69",
-            "size": 7627,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_tpch-q22-default.txt-Debug_/opt.yql_patched"
+            "checksum": "21bb8909486ef18eed177b75b4d155cc",
+            "size": 7642,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_tpch-q22-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q22-default.txt-Plan]": [
@@ -3158,9 +3158,9 @@
     ],
     "test.test[tpch-q3-default.txt-Debug]": [
         {
-            "checksum": "577787f9b7ea6cbd04b3d990077ff28e",
-            "size": 8886,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_tpch-q3-default.txt-Debug_/opt.yql_patched"
+            "checksum": "5e89a9dd328163491222996474f96fa0",
+            "size": 8937,
+            "uri": "https://{canondata_backend}/937458/119b93f58d275f3cb1cc5fb636cc9ed84a96da9e/resource.tar.gz#test.test_tpch-q3-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q3-default.txt-Plan]": [
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 2474f31f161..6dc5424a272 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
@@ -1092,9 +1092,9 @@
     ],
     "test.test[join-bush_dis_in_in_in--Debug]": [
         {
-            "checksum": "92c0ffd776ef619efd14c19daca3ef6f",
-            "size": 8056,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-bush_dis_in_in_in--Debug_/opt.yql_patched"
+            "checksum": "5b10b81a0d1664caf262219b4eac2ebe",
+            "size": 8105,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-bush_dis_in_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in_in_in--Plan]": [
@@ -1114,9 +1114,9 @@
     ],
     "test.test[join-bush_dis_in_in_in-off-Debug]": [
         {
-            "checksum": "63e84aa97109b5c262f1863a6969071e",
-            "size": 5414,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-bush_dis_in_in_in-off-Debug_/opt.yql_patched"
+            "checksum": "4dfb6de94756f53a461879b6e31063ca",
+            "size": 5481,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-bush_dis_in_in_in-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in_in_in-off-Plan]": [
@@ -1170,9 +1170,9 @@
     ],
     "test.test[join-inner_with_order--Debug]": [
         {
-            "checksum": "53d216134bde5c8904eda3fd27de6d84",
-            "size": 2787,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-inner_with_order--Debug_/opt.yql_patched"
+            "checksum": "b8294da0f950c2edff43643292b3557f",
+            "size": 2795,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-inner_with_order--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_with_order--Plan]": [
@@ -1192,9 +1192,9 @@
     ],
     "test.test[join-join_with_duplicate_keys_on_sorted--Debug]": [
         {
-            "checksum": "1425a9ad841b8c631db8ebfadc5e6923",
-            "size": 3373,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-join_with_duplicate_keys_on_sorted--Debug_/opt.yql_patched"
+            "checksum": "30fb1b2f329921730348b365b49d6a77",
+            "size": 3395,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-join_with_duplicate_keys_on_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_with_duplicate_keys_on_sorted--Plan]": [
@@ -1236,9 +1236,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_single--Debug]": [
         {
-            "checksum": "d45d7a8bf926e0a2737b43cd03b2e8d8",
-            "size": 2486,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_single--Debug_/opt.yql_patched"
+            "checksum": "1938f21c09ef3bf47d6675590879fa12",
+            "size": 2500,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_single--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_single--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-mapjoin_opt_vs_2xopt--Debug]": [
         {
-            "checksum": "5c0b205606cbb9ead12bfad907f3d14c",
-            "size": 4641,
-            "uri": "https://{canondata_backend}/1871002/b2080f1ec9f69fd0b008bc4523f011038ec40f55/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt--Debug_/opt.yql_patched"
+            "checksum": "c661243b0d129e85a6aee45e360c8e56",
+            "size": 4649,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_opt_vs_2xopt--Plan]": [
@@ -1283,9 +1283,9 @@
     ],
     "test.test[join-mergejoin_big_primary_unique--Debug]": [
         {
-            "checksum": "1cf6599b96c25e6c4429b4cc2e20a4a2",
-            "size": 3221,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-mergejoin_big_primary_unique--Debug_/opt.yql_patched"
+            "checksum": "81b55048f204a8f64e09661184c7781e",
+            "size": 3229,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-mergejoin_big_primary_unique--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_big_primary_unique--Plan]": [
@@ -1305,9 +1305,9 @@
     ],
     "test.test[join-mergejoin_with_table_range--Debug]": [
         {
-            "checksum": "3aec94f83daaa51750b594e030095776",
-            "size": 3126,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-mergejoin_with_table_range--Debug_/opt.yql_patched"
+            "checksum": "1048315d40c9e6a4e80dec017b2af119",
+            "size": 3132,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-mergejoin_with_table_range--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_table_range--Plan]": [
@@ -1327,9 +1327,9 @@
     ],
     "test.test[join-nopushdown_filter_over_inner--Debug]": [
         {
-            "checksum": "8464f81dc90758523d2c8f5c86290524",
-            "size": 2664,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-nopushdown_filter_over_inner--Debug_/opt.yql_patched"
+            "checksum": "c58c01431e795406c8c367dd072a7ac8",
+            "size": 2672,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-nopushdown_filter_over_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nopushdown_filter_over_inner--Plan]": [
@@ -1349,9 +1349,9 @@
     ],
     "test.test[join-nopushdown_filter_over_inner-off-Debug]": [
         {
-            "checksum": "cd28e13a1899dee32206290c52dfb018",
-            "size": 2458,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-nopushdown_filter_over_inner-off-Debug_/opt.yql_patched"
+            "checksum": "8afa7c967e903af25a6258b2925e3bb8",
+            "size": 2488,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-nopushdown_filter_over_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nopushdown_filter_over_inner-off-Plan]": [
@@ -1377,9 +1377,9 @@
     ],
     "test.test[join-premap_common_left_cross--Debug]": [
         {
-            "checksum": "adadad1a62a2fb415afb9c4334edd070",
-            "size": 3850,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-premap_common_left_cross--Debug_/opt.yql_patched"
+            "checksum": "91f9b5e32388fd74b079f2e45dae106b",
+            "size": 3866,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_join-premap_common_left_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_left_cross--Plan]": [
@@ -1399,9 +1399,9 @@
     ],
     "test.test[join-star_join--Debug]": [
         {
-            "checksum": "5e9c3da1b8748e34cb77cc90ac205725",
-            "size": 9409,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-star_join--Debug_/opt.yql_patched"
+            "checksum": "71bb003b309fe0ddec128b71ffa35fa5",
+            "size": 9457,
+            "uri": "https://{canondata_backend}/1937492/d5b1a2d27ea37db26c50f883a518c6eb457f4ba4/resource.tar.gz#test.test_join-star_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join--Plan]": [
@@ -1421,9 +1421,9 @@
     ],
     "test.test[join-star_join_multi--Debug]": [
         {
-            "checksum": "bada8afa8918cb76bbf7188d93ecbe0e",
-            "size": 13748,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-star_join_multi--Debug_/opt.yql_patched"
+            "checksum": "0882fc319d36db7a204a1965a12b2594",
+            "size": 13838,
+            "uri": "https://{canondata_backend}/1937492/d5b1a2d27ea37db26c50f883a518c6eb457f4ba4/resource.tar.gz#test.test_join-star_join_multi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_multi--Plan]": [
@@ -1443,9 +1443,9 @@
     ],
     "test.test[join-yql-10654_pullup_with_sys_columns-off-Debug]": [
         {
-            "checksum": "c56d82dac733694436c37660f551475f",
-            "size": 2555,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_join-yql-10654_pullup_with_sys_columns-off-Debug_/opt.yql_patched"
+            "checksum": "49dac251239a4b29666a03e107a25b6c",
+            "size": 2585,
+            "uri": "https://{canondata_backend}/1937492/d5b1a2d27ea37db26c50f883a518c6eb457f4ba4/resource.tar.gz#test.test_join-yql-10654_pullup_with_sys_columns-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-10654_pullup_with_sys_columns-off-Plan]": [
@@ -1787,9 +1787,9 @@
     ],
     "test.test[pg-select_columnref2-default.txt-Debug]": [
         {
-            "checksum": "65b26cd80228a0eb45394ab1ab6b2778",
-            "size": 3142,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_pg-select_columnref2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ff2b5c31367ec973a03132f0e23b179c",
+            "size": 3150,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_pg-select_columnref2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_columnref2-default.txt-Plan]": [
@@ -2117,9 +2117,9 @@
     ],
     "test.test[pg-tpch-q13-default.txt-Debug]": [
         {
-            "checksum": "aa6b7ac2758726728c7dd59687707762",
-            "size": 8862,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_pg-tpch-q13-default.txt-Debug_/opt.yql_patched"
+            "checksum": "10d71fa88d9f5777cfcc0c87d6da69c5",
+            "size": 8887,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_pg-tpch-q13-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q13-default.txt-Plan]": [
@@ -2315,9 +2315,9 @@
     ],
     "test.test[sampling-subquery_mapjoin-default.txt-Debug]": [
         {
-            "checksum": "c6abd980e7137d5aae3298a970fa839c",
-            "size": 2444,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_sampling-subquery_mapjoin-default.txt-Debug_/opt.yql_patched"
+            "checksum": "f1520feba6a70c61339686c444c5c987",
+            "size": 2450,
+            "uri": "https://{canondata_backend}/1937367/a2db7f6870cc304340d95468ee66167dfb2f1c6b/resource.tar.gz#test.test_sampling-subquery_mapjoin-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-subquery_mapjoin-default.txt-Plan]": [
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 fb426f12ade..771d3998643 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
@@ -357,9 +357,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_simple_fs_multiusage--Debug]": [
         {
-            "checksum": "94020f8a1e57024f031cdeecd89e11a9",
-            "size": 5934,
-            "uri": "https://{canondata_backend}/1781765/75774e90f574004e23fc9aacf32e1f561a8c66ec/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple_fs_multiusage--Debug_/opt.yql_patched"
+            "checksum": "334ec2a5c8fb12e0e404dcb0da4a36d1",
+            "size": 5940,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple_fs_multiusage--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_simple_fs_multiusage--Plan]": [
@@ -1137,9 +1137,9 @@
     ],
     "test.test[in-in_ansi_join--Debug]": [
         {
-            "checksum": "9eca4e67f7d200a747ffc5e1b8886e96",
-            "size": 14480,
-            "uri": "https://{canondata_backend}/1936842/2efaf15f30b906d1247f2ec0553f1f18fd6acee8/resource.tar.gz#test.test_in-in_ansi_join--Debug_/opt.yql_patched"
+            "checksum": "222bca0d48c28ca0c315a2972db819a1",
+            "size": 14536,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_in-in_ansi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_ansi_join--Plan]": [
@@ -1218,9 +1218,9 @@
     ],
     "test.test[join-anyjoin_common_nodata_keys--Debug]": [
         {
-            "checksum": "f4666526ea0110cd7671d9fc7a7c4255",
-            "size": 4822,
-            "uri": "https://{canondata_backend}/1942173/f4ab26b3187e68e4bbc4f6f3da1d885be2999e83/resource.tar.gz#test.test_join-anyjoin_common_nodata_keys--Debug_/opt.yql_patched"
+            "checksum": "cb00002bc21a0e93d111856578b04363",
+            "size": 4838,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-anyjoin_common_nodata_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_nodata_keys--Plan]": [
@@ -1240,9 +1240,9 @@
     ],
     "test.test[join-bush_dis_in_in--Debug]": [
         {
-            "checksum": "0600f2d344f23fe400114ab0ccffd716",
-            "size": 6080,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-bush_dis_in_in--Debug_/opt.yql_patched"
+            "checksum": "eb01d3161c9e5ba8dd52ec307d610c08",
+            "size": 6121,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-bush_dis_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in_in--Plan]": [
@@ -1262,9 +1262,9 @@
     ],
     "test.test[join-full_equal_null-off-Debug]": [
         {
-            "checksum": "592872c60779a6079cbe8e0872e7fe75",
-            "size": 3183,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-full_equal_null-off-Debug_/opt.yql_patched"
+            "checksum": "f17a7d37a6fcd6c5bfb783612bc81fd1",
+            "size": 3218,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-full_equal_null-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_equal_null-off-Plan]": [
@@ -1293,9 +1293,9 @@
     ],
     "test.test[join-join_no_correlation_in_order_by--Debug]": [
         {
-            "checksum": "a02efc0fb822f315134952994968f461",
-            "size": 2610,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-join_no_correlation_in_order_by--Debug_/opt.yql_patched"
+            "checksum": "45ad5c0396d59a25f910ca66f4cdc8fc",
+            "size": 2644,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-join_no_correlation_in_order_by--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_no_correlation_in_order_by--Plan]": [
@@ -1322,9 +1322,9 @@
     ],
     "test.test[join-join_no_correlation_in_order_by-off-Debug]": [
         {
-            "checksum": "9061f7ebbd1132c8f3201ff9322bc3d1",
-            "size": 2342,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-join_no_correlation_in_order_by-off-Debug_/opt.yql_patched"
+            "checksum": "3039b538fc77cfbf7e0718f07da89311",
+            "size": 2364,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-join_no_correlation_in_order_by-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_no_correlation_in_order_by-off-Plan]": [
@@ -1353,9 +1353,9 @@
     ],
     "test.test[join-left_trivial-off-Debug]": [
         {
-            "checksum": "367a9e904ed03df71cad557b0f093db3",
-            "size": 2471,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-left_trivial-off-Debug_/opt.yql_patched"
+            "checksum": "1212d9b47789d46506a11caa4a8c160a",
+            "size": 2501,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-left_trivial-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_trivial-off-Plan]": [
@@ -1381,9 +1381,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_many-off-Debug]": [
         {
-            "checksum": "c9f37eb6884db2b168bb60f1622a73f8",
-            "size": 3512,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_many-off-Debug_/opt.yql_patched"
+            "checksum": "438ff8bd2b637d516b2490968a8965fc",
+            "size": 3534,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_many-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_many-off-Plan]": [
@@ -1412,9 +1412,9 @@
     ],
     "test.test[join-mapjoin_with_anonymous--Debug]": [
         {
-            "checksum": "5a233ef7755f08e4267d3f42057783d3",
-            "size": 3497,
-            "uri": "https://{canondata_backend}/1942173/f4ab26b3187e68e4bbc4f6f3da1d885be2999e83/resource.tar.gz#test.test_join-mapjoin_with_anonymous--Debug_/opt.yql_patched"
+            "checksum": "26f5a7cd3c872fa0b2efdcf9c00908c1",
+            "size": 3505,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-mapjoin_with_anonymous--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_with_anonymous--Plan]": [
@@ -1434,9 +1434,9 @@
     ],
     "test.test[join-mergejoin_force_one_sorted--Debug]": [
         {
-            "checksum": "9cdc0e555f288ca3b89c617775cc54bf",
-            "size": 2826,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-mergejoin_force_one_sorted--Debug_/opt.yql_patched"
+            "checksum": "5d70e8cfe8fd29fe53f9c1d303f714e0",
+            "size": 2834,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-mergejoin_force_one_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_one_sorted--Plan]": [
@@ -1456,9 +1456,9 @@
     ],
     "test.test[join-mergejoin_with_reverse_key_order--Debug]": [
         {
-            "checksum": "a28130a1d155ce3c8d83b0c363c5192a",
-            "size": 4357,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-mergejoin_with_reverse_key_order--Debug_/opt.yql_patched"
+            "checksum": "9fa0163ac1511bcf1471ae2589be6aed",
+            "size": 4365,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-mergejoin_with_reverse_key_order--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_reverse_key_order--Plan]": [
@@ -1478,9 +1478,9 @@
     ],
     "test.test[join-order_of_qualified-off-Debug]": [
         {
-            "checksum": "b3870f78a8c88cf39337fb34ca18331c",
-            "size": 2539,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-order_of_qualified-off-Debug_/opt.yql_patched"
+            "checksum": "5efea66281cfa3874211d6f602037a3a",
+            "size": 2571,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-order_of_qualified-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-order_of_qualified-off-Plan]": [
@@ -1506,9 +1506,9 @@
     ],
     "test.test[join-premap_map_cross-off-Debug]": [
         {
-            "checksum": "702c9b9a0098b381d283f932d8030078",
-            "size": 3374,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-premap_map_cross-off-Debug_/opt.yql_patched"
+            "checksum": "aabed868969f3ea1c611229c37932727",
+            "size": 3382,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-premap_map_cross-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_cross-off-Plan]": [
@@ -1534,9 +1534,9 @@
     ],
     "test.test[join-premap_merge_extrasort1--Debug]": [
         {
-            "checksum": "4f828ec4eec4c7659fa61e6ed826a0db",
-            "size": 4463,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-premap_merge_extrasort1--Debug_/opt.yql_patched"
+            "checksum": "3dc66aa4e1e12ada876b3d0172842762",
+            "size": 4471,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-premap_merge_extrasort1--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_extrasort1--Plan]": [
@@ -1556,9 +1556,9 @@
     ],
     "test.test[join-premap_merge_extrasort1-off-Debug]": [
         {
-            "checksum": "e01b93cffe562a51fc5f6bf591c92ef8",
-            "size": 3738,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-premap_merge_extrasort1-off-Debug_/opt.yql_patched"
+            "checksum": "c811d85992d9c064dd01a5476e5a3028",
+            "size": 3746,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-premap_merge_extrasort1-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_extrasort1-off-Plan]": [
@@ -1584,9 +1584,9 @@
     ],
     "test.test[join-premap_merge_inner-off-Debug]": [
         {
-            "checksum": "9e405fe353cf5ae837adbf13d2136041",
-            "size": 3312,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-premap_merge_inner-off-Debug_/opt.yql_patched"
+            "checksum": "7ad7c0200abcd53f74d76abc9d147e0b",
+            "size": 3330,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-premap_merge_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_inner-off-Plan]": [
@@ -1612,9 +1612,9 @@
     ],
     "test.test[join-premap_nonseq_flatmap--Debug]": [
         {
-            "checksum": "f0b2089475b47390e737fa5bdbccac22",
-            "size": 1789,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-premap_nonseq_flatmap--Debug_/opt.yql_patched"
+            "checksum": "7d4c94dc741a765118741f8874afeb2b",
+            "size": 1797,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-premap_nonseq_flatmap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_nonseq_flatmap--Plan]": [
@@ -1634,9 +1634,9 @@
     ],
     "test.test[join-pullup_random--Debug]": [
         {
-            "checksum": "9c9984481f9e5715cd57dd8262e8b7d5",
-            "size": 3019,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-pullup_random--Debug_/opt.yql_patched"
+            "checksum": "46dd081364ee388d40ee5b4a33a10194",
+            "size": 3027,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-pullup_random--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_random--Plan]": [
@@ -1656,9 +1656,9 @@
     ],
     "test.test[join-star_join_inners--Debug]": [
         {
-            "checksum": "6b10af12310018020e2ab6b55509689e",
-            "size": 6328,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-star_join_inners--Debug_/opt.yql_patched"
+            "checksum": "77a3abfe6b7b46d5d533703f54f9d91a",
+            "size": 6340,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-star_join_inners--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners--Plan]": [
@@ -1678,9 +1678,9 @@
     ],
     "test.test[join-star_join_inners_vk_sorted-off-Debug]": [
         {
-            "checksum": "e494f8db5027e250835bf7bea5e3103f",
-            "size": 5892,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-star_join_inners_vk_sorted-off-Debug_/opt.yql_patched"
+            "checksum": "008a92cc9d7fb0dc511296e8b10d2d37",
+            "size": 5956,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-star_join_inners_vk_sorted-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners_vk_sorted-off-Plan]": [
@@ -1711,9 +1711,9 @@
     ],
     "test.test[join-trivial_view--Debug]": [
         {
-            "checksum": "d019cd5a4361fc45290137bd476b2193",
-            "size": 2735,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-trivial_view--Debug_/opt.yql_patched"
+            "checksum": "fe0ff7934118212fbcf9063960208d24",
+            "size": 2743,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-trivial_view--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-trivial_view--Plan]": [
@@ -1733,9 +1733,9 @@
     ],
     "test.test[join-trivial_view-off-Debug]": [
         {
-            "checksum": "2a625e240a793babb4dcf8170f04e292",
-            "size": 2686,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_join-trivial_view-off-Debug_/opt.yql_patched"
+            "checksum": "865d3c5c95f035b23b622a01053eab58",
+            "size": 2716,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_join-trivial_view-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-trivial_view-off-Plan]": [
@@ -1994,9 +1994,9 @@
     ],
     "test.test[optimizers-yql_5830_fuse_outer_with_extra_deps--Debug]": [
         {
-            "checksum": "e4e5aeeba3b8e844b840cd921c24a716",
-            "size": 3534,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_optimizers-yql_5830_fuse_outer_with_extra_deps--Debug_/opt.yql_patched"
+            "checksum": "38de3726eda1f6129bb3d20a3aebbd85",
+            "size": 3540,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_optimizers-yql_5830_fuse_outer_with_extra_deps--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql_5830_fuse_outer_with_extra_deps--Plan]": [
@@ -2429,9 +2429,9 @@
     ],
     "test.test[pg-tpch-q18-default.txt-Debug]": [
         {
-            "checksum": "ecefb368d46f5972d2189f56576fe692",
-            "size": 13148,
-            "uri": "https://{canondata_backend}/1942525/bad6c2a9772cf49687db7658044fea3a45bddb36/resource.tar.gz#test.test_pg-tpch-q18-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1246c4dee1c94df3fdea4189ab5248cb",
+            "size": 13265,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_pg-tpch-q18-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q18-default.txt-Plan]": [
@@ -2451,9 +2451,9 @@
     ],
     "test.test[pg-tpch-q21-default.txt-Debug]": [
         {
-            "checksum": "f8da0d0e537cd77446c2b99bfee67b3c",
-            "size": 17304,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_pg-tpch-q21-default.txt-Debug_/opt.yql_patched"
+            "checksum": "0a9dbfa62809cdd9ab31e4490fb45a58",
+            "size": 17510,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_pg-tpch-q21-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q21-default.txt-Plan]": [
@@ -2539,9 +2539,9 @@
     ],
     "test.test[sampling-mapjoin_right_sample-default.txt-Debug]": [
         {
-            "checksum": "e7c2968e7c8ae3230109dbb61cc38ce8",
-            "size": 2278,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_sampling-mapjoin_right_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "d95f312188271fb2190bfafa46ec6590",
+            "size": 2286,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_sampling-mapjoin_right_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-mapjoin_right_sample-default.txt-Plan]": [
@@ -2716,9 +2716,9 @@
     ],
     "test.test[select-discard-default.txt-Debug]": [
         {
-            "checksum": "407d2b26d8dda3d26e075131183205b0",
-            "size": 7985,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_select-discard-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c4a190087d0e9465424416c99b615928",
+            "size": 7997,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_select-discard-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[select-discard-default.txt-Plan]": [
@@ -2892,9 +2892,9 @@
     ],
     "test.test[tpch-q11-default.txt-Debug]": [
         {
-            "checksum": "705e8b5df4849dae3fe745f88df5e989",
-            "size": 8570,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_tpch-q11-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1dfa50ff563148daa030818b481d6850",
+            "size": 8623,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_tpch-q11-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q11-default.txt-Plan]": [
@@ -2914,9 +2914,9 @@
     ],
     "test.test[tpch-q20-default.txt-Debug]": [
         {
-            "checksum": "231f9d0f395254a73347a87e452c6e55",
-            "size": 11603,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_tpch-q20-default.txt-Debug_/opt.yql_patched"
+            "checksum": "64968089c3277944a06035fccbc196af",
+            "size": 11663,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_tpch-q20-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q20-default.txt-Plan]": [
@@ -2936,9 +2936,9 @@
     ],
     "test.test[tpch-q9-default.txt-Debug]": [
         {
-            "checksum": "0ae61ce3ae0b18d23db679176627bc5e",
-            "size": 14920,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_tpch-q9-default.txt-Debug_/opt.yql_patched"
+            "checksum": "71ec838e72e8a8f7bfc54b04831a6d0a",
+            "size": 15066,
+            "uri": "https://{canondata_backend}/1880306/b8a146dff266e2b5388e4e9ae22aa20c1b4fbc64/resource.tar.gz#test.test_tpch-q9-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q9-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
index 8544fc01508..cedf84014e1 100644
--- a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
@@ -8,9 +8,9 @@
     ],
     "test.test[action-eval_column--Debug]": [
         {
-            "checksum": "62341b3c086cbae38e9ce63668845186",
-            "size": 7824,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_action-eval_column--Debug_/opt.yql_patched"
+            "checksum": "2b0af4c21bdfceb93415ab6b00d7cd50",
+            "size": 7830,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_action-eval_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[action-eval_column--Plan]": [
@@ -445,9 +445,9 @@
     ],
     "test.test[aggregate-group_by_cube_join_count--Debug]": [
         {
-            "checksum": "b439ce6c0b932a82513d1b5c4a5ab327",
-            "size": 6989,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_aggregate-group_by_cube_join_count--Debug_/opt.yql_patched"
+            "checksum": "86212924747fe72fa356e12b9300f608",
+            "size": 6995,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_aggregate-group_by_cube_join_count--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_cube_join_count--Plan]": [
@@ -467,9 +467,9 @@
     ],
     "test.test[aggregate-group_by_expr_semi_join--Debug]": [
         {
-            "checksum": "091efb567b345e60552e9a4ece1a180d",
-            "size": 3981,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_aggregate-group_by_expr_semi_join--Debug_/opt.yql_patched"
+            "checksum": "7349560b8679b81ca371e4f6f74dd853",
+            "size": 3984,
+            "uri": "https://{canondata_backend}/1777230/843d9269357cd6a968324aa591212870032c7c60/resource.tar.gz#test.test_aggregate-group_by_expr_semi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_expr_semi_join--Plan]": [
@@ -489,9 +489,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_star-default.txt-Debug]": [
         {
-            "checksum": "8cf698ff8f785132596249221a6b6f4e",
-            "size": 4185,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_aggregate-group_by_ru_join_star-default.txt-Debug_/opt.yql_patched"
+            "checksum": "03657bb185db50220cbcf34459cd8ffa",
+            "size": 4191,
+            "uri": "https://{canondata_backend}/1777230/843d9269357cd6a968324aa591212870032c7c60/resource.tar.gz#test.test_aggregate-group_by_ru_join_star-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_star-default.txt-Plan]": [
@@ -753,9 +753,9 @@
     ],
     "test.test[distinct-distinct_join-default.txt-Debug]": [
         {
-            "checksum": "b21a4c859e83bbc4f8da5318b801dfc4",
-            "size": 2587,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_distinct-distinct_join-default.txt-Debug_/opt.yql_patched"
+            "checksum": "58e5de0a79e9712d8c47cd91f162321e",
+            "size": 2611,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_distinct-distinct_join-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[distinct-distinct_join-default.txt-Plan]": [
@@ -992,9 +992,9 @@
     ],
     "test.test[join-bush_in_in--Debug]": [
         {
-            "checksum": "7b80a66fe82971a55abd39f67c735eba",
-            "size": 5438,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-bush_in_in--Debug_/opt.yql_patched"
+            "checksum": "7b91f2a00980559b2b31d606feefbe08",
+            "size": 5477,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-bush_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in_in--Plan]": [
@@ -1126,9 +1126,9 @@
     ],
     "test.test[join-inner_grouped_by_expr--Debug]": [
         {
-            "checksum": "1f6b20dad2bfece108042f52aed5aeec",
-            "size": 3475,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-inner_grouped_by_expr--Debug_/opt.yql_patched"
+            "checksum": "36edfd6f5b48b2208f99117d3e492717",
+            "size": 3483,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-inner_grouped_by_expr--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_grouped_by_expr--Plan]": [
@@ -1151,9 +1151,9 @@
     ],
     "test.test[join-join_semi_correlation_in_order_by--Debug]": [
         {
-            "checksum": "a02efc0fb822f315134952994968f461",
-            "size": 2610,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-join_semi_correlation_in_order_by--Debug_/opt.yql_patched"
+            "checksum": "45ad5c0396d59a25f910ca66f4cdc8fc",
+            "size": 2644,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-join_semi_correlation_in_order_by--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_semi_correlation_in_order_by--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-lookupjoin_inner_2o-off-Debug]": [
         {
-            "checksum": "ae5bc4516c05c1f3d3d02e53d3f7d6ae",
-            "size": 3022,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-lookupjoin_inner_2o-off-Debug_/opt.yql_patched"
+            "checksum": "09ba6935ee6a41cc2514cfeae7882e37",
+            "size": 3028,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-lookupjoin_inner_2o-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_2o-off-Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-lookupjoin_inner_empty_subq--Debug]": [
         {
-            "checksum": "d1beef27a17dbfc416289236c82e741a",
-            "size": 3295,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-lookupjoin_inner_empty_subq--Debug_/opt.yql_patched"
+            "checksum": "b3ab35ef66381d685f50ee6a70c6e96f",
+            "size": 3331,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-lookupjoin_inner_empty_subq--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_empty_subq--Plan]": [
@@ -1227,9 +1227,9 @@
     ],
     "test.test[join-lookupjoin_semi--Debug]": [
         {
-            "checksum": "0fa84c2dd0e5279ae791bbae79cff59f",
-            "size": 3121,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-lookupjoin_semi--Debug_/opt.yql_patched"
+            "checksum": "0e2b428e588c066c6666e08dc1d21ee8",
+            "size": 3143,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-lookupjoin_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi--Plan]": [
@@ -1249,9 +1249,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o-off-Debug]": [
         {
-            "checksum": "92444dea39492a9fd4090c7299e2ec3c",
-            "size": 3100,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-lookupjoin_semi_1o-off-Debug_/opt.yql_patched"
+            "checksum": "722b18969d7293310d4cc2a3bfead421",
+            "size": 3138,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-lookupjoin_semi_1o-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_1o-off-Plan]": [
@@ -1277,9 +1277,9 @@
     ],
     "test.test[join-mapjoin_with_empty_struct-off-Debug]": [
         {
-            "checksum": "2ef4772b475c24b990bf869b383c111d",
-            "size": 1997,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-mapjoin_with_empty_struct-off-Debug_/opt.yql_patched"
+            "checksum": "ff07a244160a81abe73e5de1183bd224",
+            "size": 2005,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-mapjoin_with_empty_struct-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_with_empty_struct-off-Plan]": [
@@ -1305,9 +1305,9 @@
     ],
     "test.test[join-opt_on_opt_side_with_group--Debug]": [
         {
-            "checksum": "165a589fac337217d09fcd9534388f24",
-            "size": 3810,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-opt_on_opt_side_with_group--Debug_/opt.yql_patched"
+            "checksum": "8fab61f1b2cf54c5b4821ea82bfa4d67",
+            "size": 3818,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-opt_on_opt_side_with_group--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-opt_on_opt_side_with_group--Plan]": [
@@ -1327,9 +1327,9 @@
     ],
     "test.test[join-opt_on_opt_side_with_group-off-Debug]": [
         {
-            "checksum": "a4254e96182911be5c22c98776870789",
-            "size": 3815,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-opt_on_opt_side_with_group-off-Debug_/opt.yql_patched"
+            "checksum": "26394b1272a6fdf67c7d9037da379b5e",
+            "size": 3823,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-opt_on_opt_side_with_group-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-opt_on_opt_side_with_group-off-Plan]": [
@@ -1358,9 +1358,9 @@
     ],
     "test.test[join-premap_merge_with_remap-off-Debug]": [
         {
-            "checksum": "8cde4d6b0034a4ab749c6286ac675a8c",
-            "size": 7087,
-            "uri": "https://{canondata_backend}/1781765/97c29e53add37e5e221fbc6e22055fd1d8762911/resource.tar.gz#test.test_join-premap_merge_with_remap-off-Debug_/opt.yql_patched"
+            "checksum": "9f3074a442a2ff744c4be07a792e45f9",
+            "size": 7095,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-premap_merge_with_remap-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_with_remap-off-Plan]": [
@@ -1386,9 +1386,9 @@
     ],
     "test.test[join-pushdown_filter_over_inner_with_assume_strict-off-Debug]": [
         {
-            "checksum": "f2dae29aef873a1c0d2cd1cdd6955970",
-            "size": 2506,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_assume_strict-off-Debug_/opt.yql_patched"
+            "checksum": "bb84dae56d19c44cef733224f0047bb9",
+            "size": 2536,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_assume_strict-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_inner_with_assume_strict-off-Plan]": [
@@ -1414,9 +1414,9 @@
     ],
     "test.test[join-star_join_semionly--Debug]": [
         {
-            "checksum": "9eb35476a2a6a0d2e67fd980bf8568a7",
-            "size": 4649,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-star_join_semionly--Debug_/opt.yql_patched"
+            "checksum": "a66e2413ce301ff6a812b36dbbccb1eb",
+            "size": 4677,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_join-star_join_semionly--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_semionly--Plan]": [
@@ -1627,9 +1627,9 @@
     ],
     "test.test[optimizers-yql-6038_direct_row--Debug]": [
         {
-            "checksum": "e2481f901b4480ed6666927e36843675",
-            "size": 4755,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_optimizers-yql-6038_direct_row--Debug_/opt.yql_patched"
+            "checksum": "09bd54ec978aae5d05a500101d116816",
+            "size": 4763,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_optimizers-yql-6038_direct_row--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-6038_direct_row--Plan]": [
@@ -2250,9 +2250,9 @@
     ],
     "test.test[pg-tpch-q11-default.txt-Debug]": [
         {
-            "checksum": "ae6c2da510338556503750ed2d0f7b51",
-            "size": 9824,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_pg-tpch-q11-default.txt-Debug_/opt.yql_patched"
+            "checksum": "bbbf169e3f437773fb09893dd78b0920",
+            "size": 9903,
+            "uri": "https://{canondata_backend}/1942100/e137fd991c9f3857dfbc144867f53c199fe00560/resource.tar.gz#test.test_pg-tpch-q11-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q11-default.txt-Plan]": [
@@ -2592,9 +2592,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Debug]": [
         {
-            "checksum": "524c1c98c8283001990aa9ac0ad71c6e",
-            "size": 3204,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Debug_/opt.yql_patched"
+            "checksum": "efb32b2fff70f99f1caf7b19e5f270eb",
+            "size": 3238,
+            "uri": "https://{canondata_backend}/1777230/843d9269357cd6a968324aa591212870032c7c60/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Plan]": [
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 e9042cd4f52..b820abfba17 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
@@ -262,9 +262,9 @@
     ],
     "test.test[aggregate-group_by_column_alias_reuse_for_join--Debug]": [
         {
-            "checksum": "5c3bb1a6080cd58c9bde3b6a858ad7af",
-            "size": 3441,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_aggregate-group_by_column_alias_reuse_for_join--Debug_/opt.yql_patched"
+            "checksum": "32a4aea6661c24df31f4937404c495a8",
+            "size": 3477,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_aggregate-group_by_column_alias_reuse_for_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_column_alias_reuse_for_join--Plan]": [
@@ -823,9 +823,9 @@
     ],
     "test.test[in-yql-10038-default.txt-Debug]": [
         {
-            "checksum": "527e58b1958a8db6548f03f24144ab10",
-            "size": 2739,
-            "uri": "https://{canondata_backend}/1599023/0d561bfbc99b4f6e2f0bd1ed4d23df64344df344/resource.tar.gz#test.test_in-yql-10038-default.txt-Debug_/opt.yql_patched"
+            "checksum": "a56d2521dd133afb44b9c29582c47f0e",
+            "size": 2771,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_in-yql-10038-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-yql-10038-default.txt-Plan]": [
@@ -889,9 +889,9 @@
     ],
     "test.test[join-anyjoin_common_nodup-off-Debug]": [
         {
-            "checksum": "469c04ae7752a38cd48123c5cd8146a6",
-            "size": 5761,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-anyjoin_common_nodup-off-Debug_/opt.yql_patched"
+            "checksum": "699c9bd886e7562c66751ddf03274281",
+            "size": 5824,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-anyjoin_common_nodup-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_nodup-off-Plan]": [
@@ -917,9 +917,9 @@
     ],
     "test.test[join-bush_in--Debug]": [
         {
-            "checksum": "86ec8db1bfc2d0da9bc9d8fa0d2d52c3",
-            "size": 5385,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-bush_in--Debug_/opt.yql_patched"
+            "checksum": "aa4d5bfe406adb84f9b12f1629852647",
+            "size": 5429,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-bush_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in--Plan]": [
@@ -939,9 +939,9 @@
     ],
     "test.test[join-bush_in-off-Debug]": [
         {
-            "checksum": "3d3461ee962611e326deb14702c682c1",
-            "size": 4544,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-bush_in-off-Debug_/opt.yql_patched"
+            "checksum": "72bab6d740d9db3f319220ad8f83ae73",
+            "size": 4612,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-bush_in-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in-off-Plan]": [
@@ -967,9 +967,9 @@
     ],
     "test.test[join-equi_join_three_asterisk_eval-off-Debug]": [
         {
-            "checksum": "0e8a526262ae9ad59cd2ceafca7f1547",
-            "size": 3714,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-equi_join_three_asterisk_eval-off-Debug_/opt.yql_patched"
+            "checksum": "064b4909c6ab09b4863d82814f559de8",
+            "size": 3801,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-equi_join_three_asterisk_eval-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_asterisk_eval-off-Plan]": [
@@ -995,9 +995,9 @@
     ],
     "test.test[join-full_equal_not_null--Debug]": [
         {
-            "checksum": "fa2330959baa2f57ede5e8baa02bcf91",
-            "size": 3026,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-full_equal_not_null--Debug_/opt.yql_patched"
+            "checksum": "3300a303e3962374aefa468092a0374c",
+            "size": 3060,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-full_equal_not_null--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_equal_not_null--Plan]": [
@@ -1017,9 +1017,9 @@
     ],
     "test.test[join-full_join--Debug]": [
         {
-            "checksum": "b3559fcd2f37eaf5c4a37b27e49bbeb9",
-            "size": 2997,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-full_join--Debug_/opt.yql_patched"
+            "checksum": "9f0a110eb1984fffcb4038bae936b529",
+            "size": 3033,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-full_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_join--Plan]": [
@@ -1039,9 +1039,9 @@
     ],
     "test.test[join-join_comp_map_table--Debug]": [
         {
-            "checksum": "bb60a1f5bb30e05bb8d77145f22493c2",
-            "size": 7003,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-join_comp_map_table--Debug_/opt.yql_patched"
+            "checksum": "1acb30a7666df7f1621b371710db7556",
+            "size": 7045,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-join_comp_map_table--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_comp_map_table--Plan]": [
@@ -1061,9 +1061,9 @@
     ],
     "test.test[join-join_comp_map_table-off-Debug]": [
         {
-            "checksum": "5d52c071cad8ec263507125bca7aa6d0",
-            "size": 5901,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-join_comp_map_table-off-Debug_/opt.yql_patched"
+            "checksum": "ca2e34de3fe63d41a700943e4ea3c01f",
+            "size": 5968,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-join_comp_map_table-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_comp_map_table-off-Plan]": [
@@ -1092,9 +1092,9 @@
     ],
     "test.test[join-join_without_correlation_names-off-Debug]": [
         {
-            "checksum": "7981af7edd1b757399f90f693f905342",
-            "size": 2668,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-join_without_correlation_names-off-Debug_/opt.yql_patched"
+            "checksum": "60547f017887b802d198652297d260f5",
+            "size": 2690,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-join_without_correlation_names-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_names-off-Plan]": [
@@ -1123,9 +1123,9 @@
     ],
     "test.test[join-lookupjoin_not_selected--Debug]": [
         {
-            "checksum": "4e37ddb7630ff7c98905d8c762bf0bd0",
-            "size": 3143,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-lookupjoin_not_selected--Debug_/opt.yql_patched"
+            "checksum": "ed8ba4393c2a6fe450d4b495f85d45da",
+            "size": 3179,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-lookupjoin_not_selected--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_not_selected--Plan]": [
@@ -1145,9 +1145,9 @@
     ],
     "test.test[join-mapjoin_on_very_complex_type--Debug]": [
         {
-            "checksum": "93dfb1cf0a966d103dc93b61fda0d1e1",
-            "size": 3127,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mapjoin_on_very_complex_type--Debug_/opt.yql_patched"
+            "checksum": "0914e9248f54f2178964e849d93a5d9c",
+            "size": 3141,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mapjoin_on_very_complex_type--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_very_complex_type--Plan]": [
@@ -1167,9 +1167,9 @@
     ],
     "test.test[join-mergejoin_choose_primary-off-Debug]": [
         {
-            "checksum": "e7ff86539d0db7e4eadb4f814d17628a",
-            "size": 3116,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_choose_primary-off-Debug_/opt.yql_patched"
+            "checksum": "60184c99936c0342f39458164bffe3e6",
+            "size": 3134,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_choose_primary-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_choose_primary-off-Plan]": [
@@ -1195,9 +1195,9 @@
     ],
     "test.test[join-mergejoin_force_no_sorted--Debug]": [
         {
-            "checksum": "d991ae2f06ef1183776757b58c72a387",
-            "size": 2526,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_force_no_sorted--Debug_/opt.yql_patched"
+            "checksum": "9d6eecd2709911f5c02cd94d747a59fd",
+            "size": 2534,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_force_no_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_no_sorted--Plan]": [
@@ -1217,9 +1217,9 @@
     ],
     "test.test[join-mergejoin_force_no_sorted-off-Debug]": [
         {
-            "checksum": "84e6fc3ac559c61fa322c0c73224b0b3",
-            "size": 2574,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_force_no_sorted-off-Debug_/opt.yql_patched"
+            "checksum": "8d10ee7c05f6e6067cdbcf4c139bbe61",
+            "size": 2582,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_force_no_sorted-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_no_sorted-off-Plan]": [
@@ -1245,9 +1245,9 @@
     ],
     "test.test[join-mergejoin_left_null_column--Debug]": [
         {
-            "checksum": "245f3028ed12a4d473cc3eae255fd975",
-            "size": 2398,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_left_null_column--Debug_/opt.yql_patched"
+            "checksum": "b0945e124cd6da6beb417c45549112f5",
+            "size": 2415,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_left_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_left_null_column--Plan]": [
@@ -1267,9 +1267,9 @@
     ],
     "test.test[join-mergejoin_left_null_column-off-Debug]": [
         {
-            "checksum": "eb149c8dd8d8d9e9dae02a1312218628",
-            "size": 2483,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_left_null_column-off-Debug_/opt.yql_patched"
+            "checksum": "ad14893b09a5c95419e920dc2e50fce2",
+            "size": 2500,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_left_null_column-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_left_null_column-off-Plan]": [
@@ -1295,9 +1295,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_nested--Debug]": [
         {
-            "checksum": "553398224e81322b5b6e8568e8b5adb1",
-            "size": 4643,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nested--Debug_/opt.yql_patched"
+            "checksum": "957e848c82f19687505b8877e4cacbd0",
+            "size": 4659,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nested--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_nested--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_nonsorted-off-Debug]": [
         {
-            "checksum": "e8142607e8eca3e255c39bdef64fe4ac",
-            "size": 3275,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nonsorted-off-Debug_/opt.yql_patched"
+            "checksum": "4ae0ed8859cb03c003373a16a0e0f64f",
+            "size": 3293,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nonsorted-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_nonsorted-off-Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-no_empty_join_for_dyn-off-Debug]": [
         {
-            "checksum": "2f570be04544b556be50a9c7df095a8d",
-            "size": 2426,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-no_empty_join_for_dyn-off-Debug_/opt.yql_patched"
+            "checksum": "cb29571f43291fb47bf2a925e3b69d9f",
+            "size": 2434,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-no_empty_join_for_dyn-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-no_empty_join_for_dyn-off-Plan]": [
@@ -1373,9 +1373,9 @@
     ],
     "test.test[join-premap_common_inner-off-Debug]": [
         {
-            "checksum": "b92f29a1fd7fc6748bd8ea22c54fb3fd",
-            "size": 2656,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-premap_common_inner-off-Debug_/opt.yql_patched"
+            "checksum": "859e6e0ae771bc95ddd6c807ebe59aa7",
+            "size": 2686,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-premap_common_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner-off-Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-premap_context_dep--Debug]": [
         {
-            "checksum": "a7b93d900fc6c10efddea255d43873b7",
-            "size": 3062,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-premap_context_dep--Debug_/opt.yql_patched"
+            "checksum": "3c457781de0d03cea912b9703ae878ff",
+            "size": 3070,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-premap_context_dep--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_context_dep--Plan]": [
@@ -1423,9 +1423,9 @@
     ],
     "test.test[join-premap_context_dep-off-Debug]": [
         {
-            "checksum": "6f953f15a74c31aefa3bf7307f782aa5",
-            "size": 2860,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-premap_context_dep-off-Debug_/opt.yql_patched"
+            "checksum": "b0eb3809b7b086e2ac98c021d57fc7e2",
+            "size": 2890,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-premap_context_dep-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_context_dep-off-Plan]": [
@@ -1451,9 +1451,9 @@
     ],
     "test.test[join-pullup_cross-off-Debug]": [
         {
-            "checksum": "cc5296e07b5a8c9552adbeeb325ea221",
-            "size": 2779,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-pullup_cross-off-Debug_/opt.yql_patched"
+            "checksum": "bc21660261d126914d60bb098227ed3f",
+            "size": 2787,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-pullup_cross-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_cross-off-Plan]": [
@@ -1479,9 +1479,9 @@
     ],
     "test.test[join-pullup_left_semi-off-Debug]": [
         {
-            "checksum": "04b73f8fd5f0d50675956291cdbe98e8",
-            "size": 2535,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-pullup_left_semi-off-Debug_/opt.yql_patched"
+            "checksum": "daa826d0dc08ef1b791e48caa110565c",
+            "size": 2557,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-pullup_left_semi-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_left_semi-off-Plan]": [
@@ -1507,9 +1507,9 @@
     ],
     "test.test[join-pushdown_filter_over_left--Debug]": [
         {
-            "checksum": "2bb3823ad2f03d4413417d2a28594b2d",
-            "size": 2661,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-pushdown_filter_over_left--Debug_/opt.yql_patched"
+            "checksum": "24eadd14b576ae37ad220991c33761fa",
+            "size": 2669,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-pushdown_filter_over_left--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_left--Plan]": [
@@ -1529,9 +1529,9 @@
     ],
     "test.test[join-star_join_mirror--Debug]": [
         {
-            "checksum": "fa0dc7c6b48443a8993a8e5842ccc5b9",
-            "size": 9351,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-star_join_mirror--Debug_/opt.yql_patched"
+            "checksum": "4a7f752cc1725dd5fa448fcee897df4a",
+            "size": 9393,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-star_join_mirror--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_mirror--Plan]": [
@@ -1551,9 +1551,9 @@
     ],
     "test.test[join-star_join_semionly_premap--Debug]": [
         {
-            "checksum": "3aacf77d0abbc4c1c805d6fc7c2f7f59",
-            "size": 4979,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-star_join_semionly_premap--Debug_/opt.yql_patched"
+            "checksum": "461c9cf1e4cb6e63f1b0ad5cf4f5f74d",
+            "size": 5007,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-star_join_semionly_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_semionly_premap--Plan]": [
@@ -1573,9 +1573,9 @@
     ],
     "test.test[join-star_join_semionly_premap-off-Debug]": [
         {
-            "checksum": "f6a7f757bb9c009ba5b23fddb287127b",
-            "size": 4410,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-star_join_semionly_premap-off-Debug_/opt.yql_patched"
+            "checksum": "b1cab118579e866a2e380ce9e5a49369",
+            "size": 4459,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-star_join_semionly_premap-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_semionly_premap-off-Plan]": [
@@ -1601,9 +1601,9 @@
     ],
     "test.test[join-yql-12022--Debug]": [
         {
-            "checksum": "72ab991a00b8651f5cc2713f6edac35f",
-            "size": 1902,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-yql-12022--Debug_/opt.yql_patched"
+            "checksum": "2a6eed1dc3d95236ce2cb6cb1e3a8ae6",
+            "size": 1908,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-yql-12022--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-12022--Plan]": [
@@ -1626,9 +1626,9 @@
     ],
     "test.test[join-yql-14829_left--Debug]": [
         {
-            "checksum": "a8734d0387fa1e789763743a8df63d08",
-            "size": 4863,
-            "uri": "https://{canondata_backend}/1599023/0d561bfbc99b4f6e2f0bd1ed4d23df64344df344/resource.tar.gz#test.test_join-yql-14829_left--Debug_/opt.yql_patched"
+            "checksum": "7d87522b24bd0daf4178675d08912704",
+            "size": 4875,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-yql-14829_left--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14829_left--Plan]": [
@@ -1648,9 +1648,9 @@
     ],
     "test.test[join-yql_465--Debug]": [
         {
-            "checksum": "d0e67877d403afc0d56dbce1f1ec0c81",
-            "size": 2412,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_join-yql_465--Debug_/opt.yql_patched"
+            "checksum": "8a076c94fcdde0e64a7da68ba19a965b",
+            "size": 2420,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_join-yql_465--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql_465--Plan]": [
@@ -2562,9 +2562,9 @@
     ],
     "test.test[tpch-q7-default.txt-Debug]": [
         {
-            "checksum": "8ab1e00ce0a8ae767d397685daba27ad",
-            "size": 13689,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_tpch-q7-default.txt-Debug_/opt.yql_patched"
+            "checksum": "2522ab12a4fdfad723cdcb8fc750dcdb",
+            "size": 13798,
+            "uri": "https://{canondata_backend}/1031349/d6f6fbd690e2387ef546b9d231ad34955cbea3f2/resource.tar.gz#test.test_tpch-q7-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q7-default.txt-Plan]": [
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 dac917ae993..d9def6dbf5b 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
@@ -398,9 +398,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_agg--Debug]": [
         {
-            "checksum": "0f06dcd710057483aa290251a4751e46",
-            "size": 6363,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_aggregate-group_by_ru_join_agg--Debug_/opt.yql_patched"
+            "checksum": "ad3f74137ff5ce0b36e7f46a51de4983",
+            "size": 6369,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_aggregate-group_by_ru_join_agg--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_agg--Plan]": [
@@ -671,9 +671,9 @@
     ],
     "test.test[csee-yql-7237--Debug]": [
         {
-            "checksum": "7ac823f9454abcc5f04ad7abd2af91cd",
-            "size": 5142,
-            "uri": "https://{canondata_backend}/1942671/0f9b7a385d3b24e66ca2f542c2406826dcead5f4/resource.tar.gz#test.test_csee-yql-7237--Debug_/opt.yql_patched"
+            "checksum": "b767adfc92f688e5a8de2beda8281abf",
+            "size": 5164,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_csee-yql-7237--Debug_/opt.yql_patched"
         }
     ],
     "test.test[csee-yql-7237--Plan]": [
@@ -715,9 +715,9 @@
     ],
     "test.test[dq-join_cbo_native_3_tables--Debug]": [
         {
-            "checksum": "fc42908e8ef416a8df5858b17a8a7612",
-            "size": 4732,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_dq-join_cbo_native_3_tables--Debug_/opt.yql_patched"
+            "checksum": "1bd9bac68f3302d0878ca13bb2b78c97",
+            "size": 4756,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_dq-join_cbo_native_3_tables--Debug_/opt.yql_patched"
         }
     ],
     "test.test[dq-join_cbo_native_3_tables--Plan]": [
@@ -1047,9 +1047,9 @@
     ],
     "test.test[in-yql-14677-default.txt-Debug]": [
         {
-            "checksum": "4471f6b5f51fd977fb2d0dc0c0309aa2",
-            "size": 2338,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_in-yql-14677-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c3da2c80c307077696cec6725188887f",
+            "size": 2344,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_in-yql-14677-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-yql-14677-default.txt-Plan]": [
@@ -1096,9 +1096,9 @@
     ],
     "test.test[join-inner_with_order-off-Debug]": [
         {
-            "checksum": "c77c0bf0884658a9aeb5710004788a49",
-            "size": 2694,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-inner_with_order-off-Debug_/opt.yql_patched"
+            "checksum": "ea0eee88b769a650bda535d9b936046f",
+            "size": 2724,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-inner_with_order-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_with_order-off-Plan]": [
@@ -1124,9 +1124,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_only_single--Debug]": [
         {
-            "checksum": "07ecd491de37c89fc417c236a585ffca",
-            "size": 2486,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_only_single--Debug_/opt.yql_patched"
+            "checksum": "ff1e4628cf8acc2be068594b7b1b0466",
+            "size": 2500,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_only_single--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_only_single--Plan]": [
@@ -1146,9 +1146,9 @@
     ],
     "test.test[join-mapjoin_on_tablerecord-off-Debug]": [
         {
-            "checksum": "a8abb60ef7a9f30f2cfcae8bd6af9f9c",
-            "size": 3302,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-mapjoin_on_tablerecord-off-Debug_/opt.yql_patched"
+            "checksum": "af8032b8901cb947992152a316853507",
+            "size": 3344,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mapjoin_on_tablerecord-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_tablerecord-off-Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-mapjoin_opt_vs_2xopt-off-Debug]": [
         {
-            "checksum": "4329f1093e053fbfc6c39e49cd9ba4b7",
-            "size": 4034,
-            "uri": "https://{canondata_backend}/1942671/0f9b7a385d3b24e66ca2f542c2406826dcead5f4/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt-off-Debug_/opt.yql_patched"
+            "checksum": "1d69e9291c928c782eeed5da7fc34309",
+            "size": 4042,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mapjoin_opt_vs_2xopt-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_opt_vs_2xopt-off-Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-mapjoin_partial_uniq_keys--Debug]": [
         {
-            "checksum": "dbbada81b1e1c5efdd1022322cf3a627",
-            "size": 3235,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys--Debug_/opt.yql_patched"
+            "checksum": "9ba4c4e7736578d34860aa5b31965555",
+            "size": 3241,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_partial_uniq_keys--Plan]": [
@@ -1227,9 +1227,9 @@
     ],
     "test.test[join-mergejoin_big_primary_unique-off-Debug]": [
         {
-            "checksum": "46a58ade54df2c64bf347b573de51e8d",
-            "size": 3014,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-mergejoin_big_primary_unique-off-Debug_/opt.yql_patched"
+            "checksum": "b7567f86ef4e042578548641dea3101b",
+            "size": 3018,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mergejoin_big_primary_unique-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_big_primary_unique-off-Plan]": [
@@ -1255,9 +1255,9 @@
     ],
     "test.test[join-mergejoin_choose_primary_with_retry--Debug]": [
         {
-            "checksum": "77eef8db39886b257da947f6e26f4bc7",
-            "size": 3448,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-mergejoin_choose_primary_with_retry--Debug_/opt.yql_patched"
+            "checksum": "a531a8145bf66e2762f5b6172609c896",
+            "size": 3484,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mergejoin_choose_primary_with_retry--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_choose_primary_with_retry--Plan]": [
@@ -1277,9 +1277,9 @@
     ],
     "test.test[join-mergejoin_choose_primary_with_retry-off-Debug]": [
         {
-            "checksum": "02e6be36211a258519f42974bb5a52c3",
-            "size": 3189,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-mergejoin_choose_primary_with_retry-off-Debug_/opt.yql_patched"
+            "checksum": "6f4a7f5464bcc1b1f23df500be8e8153",
+            "size": 3207,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-mergejoin_choose_primary_with_retry-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_choose_primary_with_retry-off-Plan]": [
@@ -1305,9 +1305,9 @@
     ],
     "test.test[join-premap_common_left_cross-off-Debug]": [
         {
-            "checksum": "9b33abf27759ea2fea41e7e8a4afc98c",
-            "size": 3520,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-premap_common_left_cross-off-Debug_/opt.yql_patched"
+            "checksum": "0b3ffe38538e44417bd78cf60794a2ab",
+            "size": 3536,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-premap_common_left_cross-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_left_cross-off-Plan]": [
@@ -1333,9 +1333,9 @@
     ],
     "test.test[join-premap_common_right_tablecontent-off-Debug]": [
         {
-            "checksum": "b261e87c5b173db501aae658c2d6603c",
-            "size": 3936,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-premap_common_right_tablecontent-off-Debug_/opt.yql_patched"
+            "checksum": "67563af642ad9c27514ab898540e27a4",
+            "size": 3944,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-premap_common_right_tablecontent-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_right_tablecontent-off-Plan]": [
@@ -1361,9 +1361,9 @@
     ],
     "test.test[join-premap_merge_extrasort2--Debug]": [
         {
-            "checksum": "cff9e9af89fa5f6384e0fbe9c574d412",
-            "size": 4499,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-premap_merge_extrasort2--Debug_/opt.yql_patched"
+            "checksum": "090c47b00069aa9ac3c15d9540c5688e",
+            "size": 4507,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-premap_merge_extrasort2--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_extrasort2--Plan]": [
@@ -1383,9 +1383,9 @@
     ],
     "test.test[join-star_join_multi-off-Debug]": [
         {
-            "checksum": "792028cf9635f2ec847a2e081e243d54",
-            "size": 9498,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-star_join_multi-off-Debug_/opt.yql_patched"
+            "checksum": "3429a8e18c6d4a4e79fa427a71509b32",
+            "size": 9631,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-star_join_multi-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_multi-off-Plan]": [
@@ -1411,9 +1411,9 @@
     ],
     "test.test[join-two_aggrs-default.txt-Debug]": [
         {
-            "checksum": "3980169a8eb2ae5f6b258fcbcc933e2f",
-            "size": 3983,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-two_aggrs-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1fb470f3bd40ec5142b3f0fd7d577d80",
+            "size": 3989,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-two_aggrs-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-two_aggrs-default.txt-Plan]": [
@@ -1433,9 +1433,9 @@
     ],
     "test.test[join-yql-8980-off-Debug]": [
         {
-            "checksum": "3a123ca63250ec646df4a5c8e5fc69a0",
-            "size": 2682,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_join-yql-8980-off-Debug_/opt.yql_patched"
+            "checksum": "fbe09c939adfbedf06f4a867a3ae43ae",
+            "size": 2739,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_join-yql-8980-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-8980-off-Plan]": [
@@ -1462,9 +1462,9 @@
     ],
     "test.test[key_filter-lambda_with_null_filter--Debug]": [
         {
-            "checksum": "1c3514b4af44a1ebbf0eab9301a3c364",
-            "size": 3112,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_key_filter-lambda_with_null_filter--Debug_/opt.yql_patched"
+            "checksum": "2c2442ca90872834969bbf276024155b",
+            "size": 3115,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_key_filter-lambda_with_null_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[key_filter-lambda_with_null_filter--Plan]": [
@@ -1506,9 +1506,9 @@
     ],
     "test.test[key_filter-multiusage--Debug]": [
         {
-            "checksum": "465c1770ff08f41429f0c20cb5ccaa9a",
-            "size": 3799,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_key_filter-multiusage--Debug_/opt.yql_patched"
+            "checksum": "c24b355f1a64c6b4e79e6c4eddbca76e",
+            "size": 3805,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_key_filter-multiusage--Debug_/opt.yql_patched"
         }
     ],
     "test.test[key_filter-multiusage--Plan]": [
@@ -1660,9 +1660,9 @@
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input_other--Debug]": [
         {
-            "checksum": "77c0a66ed79f1c0c6b8bd6f7d3420b9c",
-            "size": 4010,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input_other--Debug_/opt.yql_patched"
+            "checksum": "705b657d1f7b96c962b6068ebe8f6fb6",
+            "size": 4018,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input_other--Plan]": [
@@ -2012,9 +2012,9 @@
     ],
     "test.test[pg-select_qstarref2-default.txt-Debug]": [
         {
-            "checksum": "ea405b92129a9f2d361381cb1fd8cc67",
-            "size": 3200,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_pg-select_qstarref2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "f7d8af1c56d479434ab34058d984fd88",
+            "size": 3208,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_pg-select_qstarref2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_qstarref2-default.txt-Plan]": [
@@ -2472,9 +2472,9 @@
     ],
     "test.test[tpch-q16-default.txt-Debug]": [
         {
-            "checksum": "84f2f59bc02f9670532abac3b822fe15",
-            "size": 9477,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_tpch-q16-default.txt-Debug_/opt.yql_patched"
+            "checksum": "d0c96236759978a7a6f11eb625e351e7",
+            "size": 9524,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_tpch-q16-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q16-default.txt-Plan]": [
@@ -2494,9 +2494,9 @@
     ],
     "test.test[tpch-q2-default.txt-Debug]": [
         {
-            "checksum": "68b1bb261c61c5319a2d101a06e1a653",
-            "size": 14421,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_tpch-q2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "287fa6e5b545e916d3124c0605531453",
+            "size": 14549,
+            "uri": "https://{canondata_backend}/1814674/596b6881e4e692acb2f60c77f02abe1dfca443e9/resource.tar.gz#test.test_tpch-q2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q2-default.txt-Plan]": [
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 86c4d2e1960..7b6e3b508c1 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
@@ -1041,9 +1041,9 @@
     ],
     "test.test[join-alias_where_group-off-Debug]": [
         {
-            "checksum": "90e53f26caf43ff0a427f0c6b63b74d0",
-            "size": 3104,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-alias_where_group-off-Debug_/opt.yql_patched"
+            "checksum": "10827b0c96fd7f2b7729a58aac91e9b8",
+            "size": 3132,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-alias_where_group-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-alias_where_group-off-Plan]": [
@@ -1069,9 +1069,9 @@
     ],
     "test.test[join-anyjoin_merge_nodup-off-Debug]": [
         {
-            "checksum": "20f7326066ee83a92e013738a02acd03",
-            "size": 5903,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-anyjoin_merge_nodup-off-Debug_/opt.yql_patched"
+            "checksum": "2c818b219158d0b80228bf84ca52ef71",
+            "size": 5967,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-anyjoin_merge_nodup-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_merge_nodup-off-Plan]": [
@@ -1097,9 +1097,9 @@
     ],
     "test.test[join-bush_dis_in_in-off-Debug]": [
         {
-            "checksum": "bb6884c9babadb43d09f9e29a33d0448",
-            "size": 4734,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-bush_dis_in_in-off-Debug_/opt.yql_patched"
+            "checksum": "d206541fb161c6d05dfdd2519a8646e0",
+            "size": 4819,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-bush_dis_in_in-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in_in-off-Plan]": [
@@ -1125,9 +1125,9 @@
     ],
     "test.test[join-force_merge_join-default.txt-Debug]": [
         {
-            "checksum": "77b31f1dbc1b8419ab5e5d5cffb8add1",
-            "size": 2409,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-force_merge_join-default.txt-Debug_/opt.yql_patched"
+            "checksum": "550f566d6c50954bdfc8c78c7c3a78a1",
+            "size": 2415,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-force_merge_join-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-force_merge_join-default.txt-Plan]": [
@@ -1147,9 +1147,9 @@
     ],
     "test.test[join-join_comp_common_table-off-Debug]": [
         {
-            "checksum": "b2372350128eb0e4e3932fde99bd0846",
-            "size": 8228,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-join_comp_common_table-off-Debug_/opt.yql_patched"
+            "checksum": "a83f072be7ac2cb80d5a952c1efd881f",
+            "size": 8282,
+            "uri": "https://{canondata_backend}/1924537/f2f4ea63ccfe63a6b12e91ca30e0044f48ed329b/resource.tar.gz#test.test_join-join_comp_common_table-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_comp_common_table-off-Plan]": [
@@ -1180,9 +1180,9 @@
     ],
     "test.test[join-lookupjoin_semi_2o--Debug]": [
         {
-            "checksum": "69ec132bf5d96f4ef4d4825f97b28e5a",
-            "size": 3475,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-lookupjoin_semi_2o--Debug_/opt.yql_patched"
+            "checksum": "4daba49f6789185c5ee3704259ff9adc",
+            "size": 3495,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-lookupjoin_semi_2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_2o--Plan]": [
@@ -1202,9 +1202,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_many--Debug]": [
         {
-            "checksum": "ae8a86b4669f204510e8ed4ccb3129e1",
-            "size": 3427,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_many--Debug_/opt.yql_patched"
+            "checksum": "a305293681993978b45347acf9c739e3",
+            "size": 3449,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_many--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_many--Plan]": [
@@ -1224,9 +1224,9 @@
     ],
     "test.test[join-mergejoin_force_one_sorted-off-Debug]": [
         {
-            "checksum": "e1d6684f25d06b31265168acf933e23f",
-            "size": 2874,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-mergejoin_force_one_sorted-off-Debug_/opt.yql_patched"
+            "checksum": "96a5ec63fac15e85e237769cb4cc684f",
+            "size": 2882,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-mergejoin_force_one_sorted-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_one_sorted-off-Plan]": [
@@ -1252,9 +1252,9 @@
     ],
     "test.test[join-mergejoin_semi_to_inner--Debug]": [
         {
-            "checksum": "a291faea123c6a018ec54941dbc481b4",
-            "size": 3732,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-mergejoin_semi_to_inner--Debug_/opt.yql_patched"
+            "checksum": "a8a536844cb6ad96317f6a8e5d24eeed",
+            "size": 3738,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-mergejoin_semi_to_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_semi_to_inner--Plan]": [
@@ -1274,9 +1274,9 @@
     ],
     "test.test[join-mergejoin_semi_to_inner-off-Debug]": [
         {
-            "checksum": "1898bf55359d713aa819b84a22227b5c",
-            "size": 3347,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-mergejoin_semi_to_inner-off-Debug_/opt.yql_patched"
+            "checksum": "f3f42a14bd88073e08e80ad3aae3402f",
+            "size": 3351,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-mergejoin_semi_to_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_semi_to_inner-off-Plan]": [
@@ -1302,9 +1302,9 @@
     ],
     "test.test[join-nested_semi_join--Debug]": [
         {
-            "checksum": "f4ab822f732fbb8e068e2892f2468afd",
-            "size": 2470,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-nested_semi_join--Debug_/opt.yql_patched"
+            "checksum": "80b699d563462f7d46087baca353a397",
+            "size": 2496,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-nested_semi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nested_semi_join--Plan]": [
@@ -1324,9 +1324,9 @@
     ],
     "test.test[join-premap_common_inner_both_sides-off-Debug]": [
         {
-            "checksum": "a8372f84f4a00513a014bb3aabb88f5c",
-            "size": 3058,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-premap_common_inner_both_sides-off-Debug_/opt.yql_patched"
+            "checksum": "b9519fcf7684afb43c1574834a8e8474",
+            "size": 3088,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-premap_common_inner_both_sides-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner_both_sides-off-Plan]": [
@@ -1352,9 +1352,9 @@
     ],
     "test.test[join-premap_map_cross--Debug]": [
         {
-            "checksum": "93c0855dd0fb7f89d3371261237241eb",
-            "size": 3288,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-premap_map_cross--Debug_/opt.yql_patched"
+            "checksum": "ab59bf52e40d4db6adfc196336634397",
+            "size": 3296,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-premap_map_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_cross--Plan]": [
@@ -1374,9 +1374,9 @@
     ],
     "test.test[join-premap_merge_inner--Debug]": [
         {
-            "checksum": "0175324a785d7138b8edcc06a5296ddb",
-            "size": 3445,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-premap_merge_inner--Debug_/opt.yql_patched"
+            "checksum": "7d526bd183976bcda29b419c2d6c1e96",
+            "size": 3481,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-premap_merge_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_inner--Plan]": [
@@ -1396,9 +1396,9 @@
     ],
     "test.test[join-premap_no_premap--Debug]": [
         {
-            "checksum": "25c3886766618b873de45bf557cb26c5",
-            "size": 5455,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-premap_no_premap--Debug_/opt.yql_patched"
+            "checksum": "58fca7b6269d8bae10b059c5704ac63d",
+            "size": 5479,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-premap_no_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_no_premap--Plan]": [
@@ -1418,9 +1418,9 @@
     ],
     "test.test[join-premap_no_premap-off-Debug]": [
         {
-            "checksum": "64c6b5e53fbecbc69f724880a1120c31",
-            "size": 5138,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-premap_no_premap-off-Debug_/opt.yql_patched"
+            "checksum": "4e7529720facaf67e67d10d62da02672",
+            "size": 5160,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-premap_no_premap-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_no_premap-off-Plan]": [
@@ -1446,9 +1446,9 @@
     ],
     "test.test[join-pullup_random-off-Debug]": [
         {
-            "checksum": "b3f8c88fe6d88473b58ea58d73a41955",
-            "size": 2872,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-pullup_random-off-Debug_/opt.yql_patched"
+            "checksum": "9a0dabc5f2983df573933b9de70f6fc3",
+            "size": 2902,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-pullup_random-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_random-off-Plan]": [
@@ -1474,9 +1474,9 @@
     ],
     "test.test[join-right_trivial-off-Debug]": [
         {
-            "checksum": "b70672f0ce8e9fe773314f10fa6382ec",
-            "size": 2862,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-right_trivial-off-Debug_/opt.yql_patched"
+            "checksum": "f9782fbbf75a31705882de2d5dfcad1a",
+            "size": 2892,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-right_trivial-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-right_trivial-off-Plan]": [
@@ -1507,9 +1507,9 @@
     ],
     "test.test[join-yql-4275--Debug]": [
         {
-            "checksum": "212770110f676add568dd04a387145dc",
-            "size": 2734,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_join-yql-4275--Debug_/opt.yql_patched"
+            "checksum": "f5cf491ed0a4c4e21f57094b26286e48",
+            "size": 2740,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_join-yql-4275--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-4275--Plan]": [
@@ -1782,9 +1782,9 @@
     ],
     "test.test[optimizers-yql-5978_fill_multi_usage--Debug]": [
         {
-            "checksum": "499dae7235e523807d28a4e5626d277a",
-            "size": 4697,
-            "uri": "https://{canondata_backend}/212715/b10a3a963ab6644683db33c830058d65ff99d14f/resource.tar.gz#test.test_optimizers-yql-5978_fill_multi_usage--Debug_/opt.yql_patched"
+            "checksum": "2b06d31ae2d7c4506208c4ac6177ca76",
+            "size": 4705,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_optimizers-yql-5978_fill_multi_usage--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-5978_fill_multi_usage--Plan]": [
@@ -2002,9 +2002,9 @@
     ],
     "test.test[pg-select_table2-default.txt-Debug]": [
         {
-            "checksum": "53e02cf1e1c8a9e77a635d8b4bbb2046",
-            "size": 2347,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_pg-select_table2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "634bcdba8a9115b7d975b0d50c447949",
+            "size": 2355,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_pg-select_table2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_table2-default.txt-Plan]": [
@@ -2461,9 +2461,9 @@
     ],
     "test.test[simple_columns-simple_columns_union_all_qualified_star-default.txt-Debug]": [
         {
-            "checksum": "7d35446abf4787c8f66bd93407c4b2ba",
-            "size": 4258,
-            "uri": "https://{canondata_backend}/212715/b10a3a963ab6644683db33c830058d65ff99d14f/resource.tar.gz#test.test_simple_columns-simple_columns_union_all_qualified_star-default.txt-Debug_/opt.yql_patched"
+            "checksum": "42e752ed9c5c78b303675e5a2a7385f0",
+            "size": 4274,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_simple_columns-simple_columns_union_all_qualified_star-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_union_all_qualified_star-default.txt-Plan]": [
@@ -2527,9 +2527,9 @@
     ],
     "test.test[tpch-q15-default.txt-Debug]": [
         {
-            "checksum": "72ffb4cc0e449cbcbd1ceee621de62e8",
-            "size": 9063,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_tpch-q15-default.txt-Debug_/opt.yql_patched"
+            "checksum": "da7f4ebd402eeea0c10acf86c7ac059a",
+            "size": 9113,
+            "uri": "https://{canondata_backend}/1946324/52216c80dd82a135143a59b93de6ed80422b3740/resource.tar.gz#test.test_tpch-q15-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q15-default.txt-Plan]": [
@@ -2549,9 +2549,9 @@
     ],
     "test.test[tpch-q19-default.txt-Debug]": [
         {
-            "checksum": "9ca03cc4fcb76aacb43108990e721e71",
-            "size": 7170,
-            "uri": "https://{canondata_backend}/1880306/e4ccac619cc79d4b07e7e803e386d47da238c793/resource.tar.gz#test.test_tpch-q19-default.txt-Debug_/opt.yql_patched"
+            "checksum": "48f1eea28106cb0cf4a87431bfb7dbcf",
+            "size": 7193,
+            "uri": "https://{canondata_backend}/1880306/37d72c7f6e41a0ba11afad2e957f2b63d46a85c3/resource.tar.gz#test.test_tpch-q19-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q19-default.txt-Plan]": [
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 d793506214d..bf91c58300c 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
@@ -378,9 +378,9 @@
     ],
     "test.test[aggregate-group_by_gs_join_aliases-default.txt-Debug]": [
         {
-            "checksum": "d9a427c8f5d18e16feed51ca0b1bb799",
-            "size": 5459,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_aggregate-group_by_gs_join_aliases-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ac899cbff93df497959a093141959eae",
+            "size": 5465,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_aggregate-group_by_gs_join_aliases-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_gs_join_aliases-default.txt-Plan]": [
@@ -1008,9 +1008,9 @@
     ],
     "test.test[in-in_compact_distinct--Debug]": [
         {
-            "checksum": "bed340fe08ae17aeed21c41956e094da",
-            "size": 3178,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_in-in_compact_distinct--Debug_/opt.yql_patched"
+            "checksum": "a1b706381745975a68f015518a7213ea",
+            "size": 3186,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_in-in_compact_distinct--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_compact_distinct--Plan]": [
@@ -1079,9 +1079,9 @@
     ],
     "test.test[join-equi_join_by_expr--Debug]": [
         {
-            "checksum": "cbedb9a67b8f50e6445922958fd98fa8",
-            "size": 3366,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-equi_join_by_expr--Debug_/opt.yql_patched"
+            "checksum": "7661b05f9709fa921d5315f6ccdbe8ae",
+            "size": 3402,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-equi_join_by_expr--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_by_expr--Plan]": [
@@ -1123,9 +1123,9 @@
     ],
     "test.test[join-inner_all_right-off-Debug]": [
         {
-            "checksum": "6cc9df2110181c18bf84404316e07c4a",
-            "size": 2273,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-inner_all_right-off-Debug_/opt.yql_patched"
+            "checksum": "d26027ac515cee3010d501e9c5cee9dc",
+            "size": 2295,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-inner_all_right-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_all_right-off-Plan]": [
@@ -1151,9 +1151,9 @@
     ],
     "test.test[join-inner_on_key_only--Debug]": [
         {
-            "checksum": "7488d9196a7ce179a518fb73e58e0db6",
-            "size": 2439,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-inner_on_key_only--Debug_/opt.yql_patched"
+            "checksum": "33a7c0834d1ba388f9df6ecd0c556480",
+            "size": 2447,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-inner_on_key_only--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_on_key_only--Plan]": [
@@ -1173,9 +1173,9 @@
     ],
     "test.test[join-left_cast_to_string-off-Debug]": [
         {
-            "checksum": "418e8b3ac89d3a21c9ff10203e9fb0c3",
-            "size": 2677,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-left_cast_to_string-off-Debug_/opt.yql_patched"
+            "checksum": "67f310c7b642559cc1ac23530456bb39",
+            "size": 2707,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-left_cast_to_string-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_cast_to_string-off-Plan]": [
@@ -1251,9 +1251,9 @@
     ],
     "test.test[join-left_only_semi_and_other--Debug]": [
         {
-            "checksum": "d9221ce455edc89926ae2c0eb0baffc9",
-            "size": 4707,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-left_only_semi_and_other--Debug_/opt.yql_patched"
+            "checksum": "85d0433c444fd603f6efb33117f3a7cf",
+            "size": 4731,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-left_only_semi_and_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_only_semi_and_other--Plan]": [
@@ -1273,9 +1273,9 @@
     ],
     "test.test[join-left_only_with_other-off-Debug]": [
         {
-            "checksum": "8147cc19dfc1361e872ca8bb8001e35e",
-            "size": 2750,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-left_only_with_other-off-Debug_/opt.yql_patched"
+            "checksum": "2b66bb31a098f352ab0fe6c14334122b",
+            "size": 2762,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-left_only_with_other-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_only_with_other-off-Plan]": [
@@ -1304,9 +1304,9 @@
     ],
     "test.test[join-lookupjoin_bug7646_csee--Debug]": [
         {
-            "checksum": "6287c712931e6b5080773845a9cceb35",
-            "size": 7166,
-            "uri": "https://{canondata_backend}/1924537/a3566508617a6e749a2826046e318a3ce77f33ae/resource.tar.gz#test.test_join-lookupjoin_bug7646_csee--Debug_/opt.yql_patched"
+            "checksum": "c9539e5032a90902151ae256803f6934",
+            "size": 7215,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-lookupjoin_bug7646_csee--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug7646_csee--Plan]": [
@@ -1326,9 +1326,9 @@
     ],
     "test.test[join-lookupjoin_bug8533--Debug]": [
         {
-            "checksum": "2099d2e32a02154297f37c0b85bf6985",
-            "size": 3153,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-lookupjoin_bug8533--Debug_/opt.yql_patched"
+            "checksum": "04a37a0dde98d47d4f17582a2af1ff9f",
+            "size": 3189,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-lookupjoin_bug8533--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug8533--Plan]": [
@@ -1348,9 +1348,9 @@
     ],
     "test.test[join-lookupjoin_bug8533-off-Debug]": [
         {
-            "checksum": "be69b7eeea02acc9e315dbad00cfedcd",
-            "size": 3220,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-lookupjoin_bug8533-off-Debug_/opt.yql_patched"
+            "checksum": "5851f3313c3f7f6f098896c4e034dd70",
+            "size": 3247,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-lookupjoin_bug8533-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug8533-off-Plan]": [
@@ -1376,9 +1376,9 @@
     ],
     "test.test[join-lookupjoin_semi-off-Debug]": [
         {
-            "checksum": "375dc2ed507d47a40a224312ab3df199",
-            "size": 2997,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-lookupjoin_semi-off-Debug_/opt.yql_patched"
+            "checksum": "77e78b51fd0fbbe74818fabaa06330b7",
+            "size": 3024,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-lookupjoin_semi-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi-off-Plan]": [
@@ -1426,9 +1426,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort_cross-off-Debug]": [
         {
-            "checksum": "e71c0a71faf1698997900ccf75da7123",
-            "size": 4447,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_cross-off-Debug_/opt.yql_patched"
+            "checksum": "3266ab132f54e184d8b3056d88ac3e3a",
+            "size": 4491,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_cross-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort_cross-off-Plan]": [
@@ -1454,9 +1454,9 @@
     ],
     "test.test[join-premap_common_multiparents_no_premap--Debug]": [
         {
-            "checksum": "08f700c9b4ee6fd3473d7353ec08bcc9",
-            "size": 3481,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-premap_common_multiparents_no_premap--Debug_/opt.yql_patched"
+            "checksum": "b68ac4e6d6b7c0a34218d9de43322e14",
+            "size": 3489,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-premap_common_multiparents_no_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_multiparents_no_premap--Plan]": [
@@ -1476,9 +1476,9 @@
     ],
     "test.test[join-pullup_rownumber--Debug]": [
         {
-            "checksum": "c80ddb2b6e259ad778f30f369324493e",
-            "size": 3759,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-pullup_rownumber--Debug_/opt.yql_patched"
+            "checksum": "6c15db62155db275323d29ad9736db0c",
+            "size": 3767,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-pullup_rownumber--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_rownumber--Plan]": [
@@ -1498,9 +1498,9 @@
     ],
     "test.test[join-selfjoin_on_sorted_with_rename--Debug]": [
         {
-            "checksum": "c928eddec9909759dd4c59e98dfd615b",
-            "size": 2212,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_rename--Debug_/opt.yql_patched"
+            "checksum": "af8ac7336448b7b5faa7bf43ead94830",
+            "size": 2218,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_rename--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted_with_rename--Plan]": [
@@ -1520,9 +1520,9 @@
     ],
     "test.test[join-star_join_semionly-off-Debug]": [
         {
-            "checksum": "805e92cf5f54a50ec841b74253c3226a",
-            "size": 4145,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-star_join_semionly-off-Debug_/opt.yql_patched"
+            "checksum": "0d63ee9a1dae0c99180c1213a2b3c23a",
+            "size": 4194,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-star_join_semionly-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_semionly-off-Plan]": [
@@ -1548,9 +1548,9 @@
     ],
     "test.test[join-three_equalities_paren-off-Debug]": [
         {
-            "checksum": "fcc7c13ba72ca52cec886e5712777e3d",
-            "size": 2248,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_join-three_equalities_paren-off-Debug_/opt.yql_patched"
+            "checksum": "2f6954e29b23d6d1470a45e5c54ef4c9",
+            "size": 2256,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_join-three_equalities_paren-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-three_equalities_paren-off-Plan]": [
@@ -2297,9 +2297,9 @@
     ],
     "test.test[pg-tpch-q15-default.txt-Debug]": [
         {
-            "checksum": "fe0c7e0d5d698a2f749761f4408a869d",
-            "size": 9030,
-            "uri": "https://{canondata_backend}/1937027/90a6ebec3ebdfe556d7145dc39b71ce1ef80b871/resource.tar.gz#test.test_pg-tpch-q15-default.txt-Debug_/opt.yql_patched"
+            "checksum": "153d691b198c6e35f6cd0fdb22028566",
+            "size": 9069,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_pg-tpch-q15-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q15-default.txt-Plan]": [
@@ -2693,9 +2693,9 @@
     ],
     "test.test[tpch-q18-default.txt-Debug]": [
         {
-            "checksum": "64f4ff2c8b3f8af60458c1a71860a60a",
-            "size": 9812,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_tpch-q18-default.txt-Debug_/opt.yql_patched"
+            "checksum": "75f0f81fe43f909d79d0a8420738886a",
+            "size": 9841,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_tpch-q18-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q18-default.txt-Plan]": [
@@ -2715,9 +2715,9 @@
     ],
     "test.test[tpch-q21-default.txt-Debug]": [
         {
-            "checksum": "a1519e8f165b136d0c8d7f418d08f89e",
-            "size": 11658,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_tpch-q21-default.txt-Debug_/opt.yql_patched"
+            "checksum": "551032db9b0ac7ea318471d8e0d0e7fd",
+            "size": 11745,
+            "uri": "https://{canondata_backend}/1871182/013efa06de0b2dafa1f19c37180aa25564edef5c/resource.tar.gz#test.test_tpch-q21-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q21-default.txt-Plan]": [
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 9ecb8bc47f3..b4daebb926c 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
@@ -985,9 +985,9 @@
     ],
     "test.test[in-in_scalar_vector_subquery-default.txt-Debug]": [
         {
-            "checksum": "e9336056113d6d9f38590932e0bb06b7",
-            "size": 8391,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_in-in_scalar_vector_subquery-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c156c33a81cf3e7f5e51c0f974c0e4ec",
+            "size": 8423,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_in-in_scalar_vector_subquery-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_scalar_vector_subquery-default.txt-Plan]": [
@@ -1098,9 +1098,9 @@
     ],
     "test.test[join-alias_where_group--Debug]": [
         {
-            "checksum": "0eb7ab4d7389e5f28fcb388b39059a49",
-            "size": 3153,
-            "uri": "https://{canondata_backend}/1937424/bd94128e88c847280cc3490a6d7144716a790e88/resource.tar.gz#test.test_join-alias_where_group--Debug_/opt.yql_patched"
+            "checksum": "8fb53e58ad22667eba1e6776d32cab4a",
+            "size": 3161,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-alias_where_group--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-alias_where_group--Plan]": [
@@ -1120,9 +1120,9 @@
     ],
     "test.test[join-anyjoin_merge_nodup--Debug]": [
         {
-            "checksum": "fbfdd5ae529a6074c860b1ca82e9f242",
-            "size": 5279,
-            "uri": "https://{canondata_backend}/1773845/38a5e42f094acedb001785c46756100166f2d154/resource.tar.gz#test.test_join-anyjoin_merge_nodup--Debug_/opt.yql_patched"
+            "checksum": "967903a142c4daaed33f5624b323032a",
+            "size": 5311,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-anyjoin_merge_nodup--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_merge_nodup--Plan]": [
@@ -1142,9 +1142,9 @@
     ],
     "test.test[join-bush_in_in_in--Debug]": [
         {
-            "checksum": "3a8ef64d579906ae9b09881dab6d96b1",
-            "size": 6958,
-            "uri": "https://{canondata_backend}/1773845/38a5e42f094acedb001785c46756100166f2d154/resource.tar.gz#test.test_join-bush_in_in_in--Debug_/opt.yql_patched"
+            "checksum": "b2de428bae6c65fd6f6681e10c353adc",
+            "size": 7016,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-bush_in_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in_in_in--Plan]": [
@@ -1164,9 +1164,9 @@
     ],
     "test.test[join-bush_in_in_in-off-Debug]": [
         {
-            "checksum": "0b3adcdde91174d5d7a15ed49bc55f15",
-            "size": 4381,
-            "uri": "https://{canondata_backend}/1773845/38a5e42f094acedb001785c46756100166f2d154/resource.tar.gz#test.test_join-bush_in_in_in-off-Debug_/opt.yql_patched"
+            "checksum": "8f2604bd2cacfff3b1e0b42b29876966",
+            "size": 4448,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-bush_in_in_in-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in_in_in-off-Plan]": [
@@ -1192,9 +1192,9 @@
     ],
     "test.test[join-full_trivial--Debug]": [
         {
-            "checksum": "ef49f9d7848ea731bcdccb59a7cab5d2",
-            "size": 2968,
-            "uri": "https://{canondata_backend}/1937424/bd94128e88c847280cc3490a6d7144716a790e88/resource.tar.gz#test.test_join-full_trivial--Debug_/opt.yql_patched"
+            "checksum": "c04a9bb4cdba4d7f17a978dd0795fd37",
+            "size": 2976,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-full_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_trivial--Plan]": [
@@ -1214,9 +1214,9 @@
     ],
     "test.test[join-full_trivial-off-Debug]": [
         {
-            "checksum": "17565abcd81024cbc5f105e3861b9492",
-            "size": 3015,
-            "uri": "https://{canondata_backend}/1942100/070d287587bd5d2ed4158069a020e4772af81216/resource.tar.gz#test.test_join-full_trivial-off-Debug_/opt.yql_patched"
+            "checksum": "dea863e976c0c84be492df3f8572fe52",
+            "size": 3023,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-full_trivial-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_trivial-off-Plan]": [
@@ -1242,9 +1242,9 @@
     ],
     "test.test[join-group_compact_by--Debug]": [
         {
-            "checksum": "c0a19e20507d364415d91c6da4f289c2",
-            "size": 2858,
-            "uri": "https://{canondata_backend}/1781765/eaf8b4f54dbd9300a96708f39f699380d90b82a9/resource.tar.gz#test.test_join-group_compact_by--Debug_/opt.yql_patched"
+            "checksum": "f97106be4215d049aaa4991432caa6e0",
+            "size": 2864,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-group_compact_by--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-group_compact_by--Plan]": [
@@ -1264,9 +1264,9 @@
     ],
     "test.test[join-inner_all--Debug]": [
         {
-            "checksum": "7b5da36e0e369001087b3f6b28a49b2a",
-            "size": 2344,
-            "uri": "https://{canondata_backend}/1937424/bd94128e88c847280cc3490a6d7144716a790e88/resource.tar.gz#test.test_join-inner_all--Debug_/opt.yql_patched"
+            "checksum": "6aeafa5cbc98f1134a5a608c6a2eeaff",
+            "size": 2352,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-inner_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_all--Plan]": [
@@ -1286,9 +1286,9 @@
     ],
     "test.test[join-join_comp_common_table--Debug]": [
         {
-            "checksum": "3113ba8fe3468876da711ee8398f6c52",
-            "size": 9466,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_join-join_comp_common_table--Debug_/opt.yql_patched"
+            "checksum": "16c3f27aa3e6ca5b38138ca47c4a976a",
+            "size": 9520,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-join_comp_common_table--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_comp_common_table--Plan]": [
@@ -1311,9 +1311,9 @@
     ],
     "test.test[join-join_without_column-off-Debug]": [
         {
-            "checksum": "148eaf999b4c25cb407162a4b5e83f3e",
-            "size": 2505,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_join-join_without_column-off-Debug_/opt.yql_patched"
+            "checksum": "ed7ff25b3e0abb1508a71ecc584e4699",
+            "size": 2538,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-join_without_column-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_column-off-Plan]": [
@@ -1342,9 +1342,9 @@
     ],
     "test.test[join-lookupjoin_semi_subq--Debug]": [
         {
-            "checksum": "3cdb269b1eb2bf659b8b1ed1430741c0",
-            "size": 3350,
-            "uri": "https://{canondata_backend}/1937424/bd94128e88c847280cc3490a6d7144716a790e88/resource.tar.gz#test.test_join-lookupjoin_semi_subq--Debug_/opt.yql_patched"
+            "checksum": "78b7830b70a9ed49936803d0ba43c3c3",
+            "size": 3372,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-lookupjoin_semi_subq--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_subq--Plan]": [
@@ -1364,9 +1364,9 @@
     ],
     "test.test[join-mergejoin_big_primary-off-Debug]": [
         {
-            "checksum": "c47f0d136964e736cc5ea87048ae59d4",
-            "size": 3200,
-            "uri": "https://{canondata_backend}/1942100/070d287587bd5d2ed4158069a020e4772af81216/resource.tar.gz#test.test_join-mergejoin_big_primary-off-Debug_/opt.yql_patched"
+            "checksum": "87696bc93f9258e535d17669a0188f86",
+            "size": 3214,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-mergejoin_big_primary-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_big_primary-off-Plan]": [
@@ -1392,9 +1392,9 @@
     ],
     "test.test[join-mergejoin_with_reverse_key_order-off-Debug]": [
         {
-            "checksum": "949a99526bb3cbb60ab2222b85cd5a5a",
-            "size": 3475,
-            "uri": "https://{canondata_backend}/1942100/070d287587bd5d2ed4158069a020e4772af81216/resource.tar.gz#test.test_join-mergejoin_with_reverse_key_order-off-Debug_/opt.yql_patched"
+            "checksum": "91d15c83686f2024d8cecee01a5f81b2",
+            "size": 3483,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-mergejoin_with_reverse_key_order-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_reverse_key_order-off-Plan]": [
@@ -1420,9 +1420,9 @@
     ],
     "test.test[join-nested_semi_join-off-Debug]": [
         {
-            "checksum": "5b813c112ab44e7dc132255963cf2058",
-            "size": 2232,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_join-nested_semi_join-off-Debug_/opt.yql_patched"
+            "checksum": "29ef70625aea80a3d91c50460f3db772",
+            "size": 2285,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-nested_semi_join-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nested_semi_join-off-Plan]": [
@@ -1448,9 +1448,9 @@
     ],
     "test.test[join-order_of_qualified--Debug]": [
         {
-            "checksum": "d1346dd1b32243f00c99dd48605c28b2",
-            "size": 2743,
-            "uri": "https://{canondata_backend}/1937424/bd94128e88c847280cc3490a6d7144716a790e88/resource.tar.gz#test.test_join-order_of_qualified--Debug_/opt.yql_patched"
+            "checksum": "d85a1a311f513f7f1d99fd5431313921",
+            "size": 2751,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-order_of_qualified--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-order_of_qualified--Plan]": [
@@ -1470,9 +1470,9 @@
     ],
     "test.test[join-premap_common_inner_both_sides--Debug]": [
         {
-            "checksum": "f013ba5e7573dc8ac5c7bff734c37e85",
-            "size": 3157,
-            "uri": "https://{canondata_backend}/1937424/bd94128e88c847280cc3490a6d7144716a790e88/resource.tar.gz#test.test_join-premap_common_inner_both_sides--Debug_/opt.yql_patched"
+            "checksum": "9f23df914193438752f61919794bd082",
+            "size": 3165,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-premap_common_inner_both_sides--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner_both_sides--Plan]": [
@@ -1492,9 +1492,9 @@
     ],
     "test.test[join-pullup_null_column--Debug]": [
         {
-            "checksum": "6a75fa1d2150627b83e7aeb9b7101fc2",
-            "size": 2971,
-            "uri": "https://{canondata_backend}/1130705/757d10cb32f3f15562b523da2252a50eeaba7592/resource.tar.gz#test.test_join-pullup_null_column--Debug_/opt.yql_patched"
+            "checksum": "93c383c6c059b177d7e9ea1404474a3f",
+            "size": 2979,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-pullup_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_null_column--Plan]": [
@@ -1514,9 +1514,9 @@
     ],
     "test.test[join-pullup_null_column-off-Debug]": [
         {
-            "checksum": "accc227baecda1bfc14c7ebba5a63494",
-            "size": 2876,
-            "uri": "https://{canondata_backend}/1130705/757d10cb32f3f15562b523da2252a50eeaba7592/resource.tar.gz#test.test_join-pullup_null_column-off-Debug_/opt.yql_patched"
+            "checksum": "2d99c7b1e2423a681715a61c5117f4ba",
+            "size": 2884,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-pullup_null_column-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_null_column-off-Plan]": [
@@ -1542,9 +1542,9 @@
     ],
     "test.test[join-star_join_inners-off-Debug]": [
         {
-            "checksum": "8dde2b435b9e6568d27cff78dc2032a2",
-            "size": 5853,
-            "uri": "https://{canondata_backend}/1781765/eaf8b4f54dbd9300a96708f39f699380d90b82a9/resource.tar.gz#test.test_join-star_join_inners-off-Debug_/opt.yql_patched"
+            "checksum": "0f25cb73efc218de8437ccc9a0b5cf0e",
+            "size": 5869,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-star_join_inners-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners-off-Plan]": [
@@ -1573,9 +1573,9 @@
     ],
     "test.test[join-yql-14829_leftonly--Debug]": [
         {
-            "checksum": "b3bc95aaec2e7d7f1ece6d2a865b0783",
-            "size": 4704,
-            "uri": "https://{canondata_backend}/1937429/8c62189ab5d8963fa2bc00211d90a8db6a318dd6/resource.tar.gz#test.test_join-yql-14829_leftonly--Debug_/opt.yql_patched"
+            "checksum": "6e39498888b1754f011ce52628d505f3",
+            "size": 4716,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-yql-14829_leftonly--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14829_leftonly--Plan]": [
@@ -1598,9 +1598,9 @@
     ],
     "test.test[join-yql-8125--Debug]": [
         {
-            "checksum": "6e086607c5763909dbd1e49e7d877b83",
-            "size": 5930,
-            "uri": "https://{canondata_backend}/1937429/8c62189ab5d8963fa2bc00211d90a8db6a318dd6/resource.tar.gz#test.test_join-yql-8125--Debug_/opt.yql_patched"
+            "checksum": "c5caf79524cc3475b6ab3035d358a898",
+            "size": 5938,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_join-yql-8125--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-8125--Plan]": [
@@ -2186,9 +2186,9 @@
     ],
     "test.test[sampling-bind_join_left-default.txt-Debug]": [
         {
-            "checksum": "2ce9c01caf89f4e1716c3a1df7a8536c",
-            "size": 2520,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_sampling-bind_join_left-default.txt-Debug_/opt.yql_patched"
+            "checksum": "962ba68a30f98dadfd847f7a43df2a4a",
+            "size": 2526,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_sampling-bind_join_left-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-bind_join_left-default.txt-Plan]": [
@@ -2501,9 +2501,9 @@
     ],
     "test.test[select-table_content_with_tmp_folder--Debug]": [
         {
-            "checksum": "7c479bfe149dd94fff0f839ed0b7278f",
-            "size": 2961,
-            "uri": "https://{canondata_backend}/1936947/2bc3e51a8b9883f1a1d8b98124fe921cba1fca45/resource.tar.gz#test.test_select-table_content_with_tmp_folder--Debug_/opt.yql_patched"
+            "checksum": "527e6f2f15b316a289404c41d901b5d7",
+            "size": 2969,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_select-table_content_with_tmp_folder--Debug_/opt.yql_patched"
         }
     ],
     "test.test[select-table_content_with_tmp_folder--Plan]": [
@@ -2611,9 +2611,9 @@
     ],
     "test.test[tpch-q5-default.txt-Debug]": [
         {
-            "checksum": "6cabf7676ba2b690a2c680f2c11f1443",
-            "size": 13673,
-            "uri": "https://{canondata_backend}/1937492/7f627c78f51b5d0e4fd57b95d2981739b8732ef5/resource.tar.gz#test.test_tpch-q5-default.txt-Debug_/opt.yql_patched"
+            "checksum": "81c5a7cfba61c2c36d3093f10ebc77f6",
+            "size": 13813,
+            "uri": "https://{canondata_backend}/1924537/f64da96875f0898ddb0731c0a649ba5ae74791e1/resource.tar.gz#test.test_tpch-q5-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q5-default.txt-Plan]": [
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 d8b865f1de1..57e9b4dd988 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
@@ -839,9 +839,9 @@
     ],
     "test.test[in-in_noansi_join--Debug]": [
         {
-            "checksum": "b16c21190ee07271dffbee72ac88a8ed",
-            "size": 11201,
-            "uri": "https://{canondata_backend}/1937027/7e92a59557f254d8b58c96118ce2e626b197c0b1/resource.tar.gz#test.test_in-in_noansi_join--Debug_/opt.yql_patched"
+            "checksum": "3ad8ae57541786a7c9294cd74bdef7ca",
+            "size": 11257,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_in-in_noansi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_noansi_join--Plan]": [
@@ -941,9 +941,9 @@
     ],
     "test.test[join-count_bans--Debug]": [
         {
-            "checksum": "641d41279201db0efc809bdb3ba75235",
-            "size": 5441,
-            "uri": "https://{canondata_backend}/1899731/5f2ba051437dbbe71df0674617fe1a74e541bb6d/resource.tar.gz#test.test_join-count_bans--Debug_/opt.yql_patched"
+            "checksum": "691f5676ba171babaff9b0f05d87788c",
+            "size": 5461,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-count_bans--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-count_bans--Plan]": [
@@ -963,9 +963,9 @@
     ],
     "test.test[join-grace_join2--Debug]": [
         {
-            "checksum": "34fdff009f1cfcdc53164eeb5db58dd7",
-            "size": 2171,
-            "uri": "https://{canondata_backend}/1923547/c3f064ea25dafaabdc78d527cb888e8c29c155df/resource.tar.gz#test.test_join-grace_join2--Debug_/opt.yql_patched"
+            "checksum": "19183560892a902b147f83ed5fae6ddd",
+            "size": 2191,
+            "uri": "https://{canondata_backend}/1880306/e5370ce7a3ad1f86353c982d49d1bf532f00bc25/resource.tar.gz#test.test_join-grace_join2--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-grace_join2--Plan]": [
@@ -1013,9 +1013,9 @@
     ],
     "test.test[join-inner_on_key_only-off-Debug]": [
         {
-            "checksum": "eded91de4543d602493927dec3fcd835",
-            "size": 2284,
-            "uri": "https://{canondata_backend}/1784117/cb10fc911ed03589097ad5a3bcbcd64029d4ed63/resource.tar.gz#test.test_join-inner_on_key_only-off-Debug_/opt.yql_patched"
+            "checksum": "565e6a72f6f24490d675a723f87f9e07",
+            "size": 2314,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-inner_on_key_only-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_on_key_only-off-Plan]": [
@@ -1044,9 +1044,9 @@
     ],
     "test.test[join-join_and_distinct_key--Debug]": [
         {
-            "checksum": "3a98cc3278686914c21b690c69c309c7",
-            "size": 4828,
-            "uri": "https://{canondata_backend}/1937027/7e92a59557f254d8b58c96118ce2e626b197c0b1/resource.tar.gz#test.test_join-join_and_distinct_key--Debug_/opt.yql_patched"
+            "checksum": "45377eae2f577d40859c21af6c0c9af8",
+            "size": 4863,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-join_and_distinct_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_and_distinct_key--Plan]": [
@@ -1092,9 +1092,9 @@
     ],
     "test.test[join-left_only_semi_and_other-off-Debug]": [
         {
-            "checksum": "50d727dfb921404bf46fad0f4b55ae05",
-            "size": 3587,
-            "uri": "https://{canondata_backend}/1899731/5f2ba051437dbbe71df0674617fe1a74e541bb6d/resource.tar.gz#test.test_join-left_only_semi_and_other-off-Debug_/opt.yql_patched"
+            "checksum": "56e61b8e93b9e17175adb45030d60c58",
+            "size": 3611,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-left_only_semi_and_other-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_only_semi_and_other-off-Plan]": [
@@ -1120,9 +1120,9 @@
     ],
     "test.test[join-left_semi_with_other-off-Debug]": [
         {
-            "checksum": "f77883a3aaab61d176e2bff6065011cc",
-            "size": 3240,
-            "uri": "https://{canondata_backend}/1899731/5f2ba051437dbbe71df0674617fe1a74e541bb6d/resource.tar.gz#test.test_join-left_semi_with_other-off-Debug_/opt.yql_patched"
+            "checksum": "6b7cc783b48e0ebfbf327bc95df94139",
+            "size": 3256,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-left_semi_with_other-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_semi_with_other-off-Plan]": [
@@ -1151,9 +1151,9 @@
     ],
     "test.test[join-lookupjoin_bug7646_csee-off-Debug]": [
         {
-            "checksum": "e53b2b5dc733add8b86f05d4a491245d",
-            "size": 5897,
-            "uri": "https://{canondata_backend}/1777230/84194ad8ae2188df41a496fbc52fcf70c26dfad4/resource.tar.gz#test.test_join-lookupjoin_bug7646_csee-off-Debug_/opt.yql_patched"
+            "checksum": "8c2457e62d0a95ae677e5925e8ac55fa",
+            "size": 5967,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-lookupjoin_bug7646_csee-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug7646_csee-off-Plan]": [
@@ -1179,9 +1179,9 @@
     ],
     "test.test[join-lookupjoin_inner_2o--Debug]": [
         {
-            "checksum": "35266686a69dd08e3855c01727a1cbb0",
-            "size": 3631,
-            "uri": "https://{canondata_backend}/1689644/27655d171ad3d760f29cf419525b3e47961104a4/resource.tar.gz#test.test_join-lookupjoin_inner_2o--Debug_/opt.yql_patched"
+            "checksum": "a17def47ba958a5b67bc96611e1dae37",
+            "size": 3637,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-lookupjoin_inner_2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_2o--Plan]": [
@@ -1201,9 +1201,9 @@
     ],
     "test.test[join-lookupjoin_inner_empty_subq-off-Debug]": [
         {
-            "checksum": "644eb1913fce4bca53f8456f261c8d8f",
-            "size": 3000,
-            "uri": "https://{canondata_backend}/1931696/7debf44e6873970907931465d4bb07df69738d81/resource.tar.gz#test.test_join-lookupjoin_inner_empty_subq-off-Debug_/opt.yql_patched"
+            "checksum": "edf7f093859502ca93486ee24363ca93",
+            "size": 3014,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-lookupjoin_inner_empty_subq-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_empty_subq-off-Plan]": [
@@ -1229,9 +1229,9 @@
     ],
     "test.test[join-opt_on_opt_side-off-Debug]": [
         {
-            "checksum": "24abb518385e71e5465e9f081cd97c43",
-            "size": 2686,
-            "uri": "https://{canondata_backend}/1942100/178599a2b23ce6932b343bc5f863a036b0534c1c/resource.tar.gz#test.test_join-opt_on_opt_side-off-Debug_/opt.yql_patched"
+            "checksum": "5b7007e7069f966cf0e7cb5e1196174c",
+            "size": 2694,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-opt_on_opt_side-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-opt_on_opt_side-off-Plan]": [
@@ -1257,9 +1257,9 @@
     ],
     "test.test[join-pullup_rownumber-off-Debug]": [
         {
-            "checksum": "65b887dba5c24fa309e225ede57c241a",
-            "size": 3613,
-            "uri": "https://{canondata_backend}/1871182/5e06b08307574a72f79e9da297b863e3e09d864d/resource.tar.gz#test.test_join-pullup_rownumber-off-Debug_/opt.yql_patched"
+            "checksum": "a91e281dd0da0e1f2a96c4bd8a450fc4",
+            "size": 3643,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-pullup_rownumber-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_rownumber-off-Plan]": [
@@ -1285,9 +1285,9 @@
     ],
     "test.test[join-selfjoin_on_sorted-off-Debug]": [
         {
-            "checksum": "e086d78e6c888c194c03691233787e59",
-            "size": 1833,
-            "uri": "https://{canondata_backend}/1899731/5f2ba051437dbbe71df0674617fe1a74e541bb6d/resource.tar.gz#test.test_join-selfjoin_on_sorted-off-Debug_/opt.yql_patched"
+            "checksum": "1c0d1cfe2209e84f289f5c7b75780f17",
+            "size": 1836,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-selfjoin_on_sorted-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted-off-Plan]": [
@@ -1313,9 +1313,9 @@
     ],
     "test.test[join-selfjoin_on_sorted_with_filter--Debug]": [
         {
-            "checksum": "32ede98a38a26645d8c39818aa696072",
-            "size": 2251,
-            "uri": "https://{canondata_backend}/1899731/5f2ba051437dbbe71df0674617fe1a74e541bb6d/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_filter--Debug_/opt.yql_patched"
+            "checksum": "11566209d1e9d993c36a61ea540435b6",
+            "size": 2257,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted_with_filter--Plan]": [
@@ -1335,9 +1335,9 @@
     ],
     "test.test[join-selfjoin_on_sorted_with_filter-off-Debug]": [
         {
-            "checksum": "40461a1ec1a6db653b3ab34c11ad5e8d",
-            "size": 2009,
-            "uri": "https://{canondata_backend}/1899731/5f2ba051437dbbe71df0674617fe1a74e541bb6d/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_filter-off-Debug_/opt.yql_patched"
+            "checksum": "0be7ecd1b7841f0659fc00f49f9184f1",
+            "size": 2012,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_filter-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted_with_filter-off-Plan]": [
@@ -1363,9 +1363,9 @@
     ],
     "test.test[join-three_equalities_paren--Debug]": [
         {
-            "checksum": "778ff490035dc0b5d6082e8bec1ad7b2",
-            "size": 2328,
-            "uri": "https://{canondata_backend}/1689644/27655d171ad3d760f29cf419525b3e47961104a4/resource.tar.gz#test.test_join-three_equalities_paren--Debug_/opt.yql_patched"
+            "checksum": "b547b00070074c36f2c30e6896da33c7",
+            "size": 2336,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_join-three_equalities_paren--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-three_equalities_paren--Plan]": [
@@ -1905,9 +1905,9 @@
     ],
     "test.test[pg-tpch-q20-default.txt-Debug]": [
         {
-            "checksum": "fb3e6cb18595b6fff26a91fd87a3c595",
-            "size": 16472,
-            "uri": "https://{canondata_backend}/1775059/8b4ccf16cb253f7848b641a6d35b146c935c5c5f/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9d160317d8d9665413fe838cd19f6319",
+            "size": 16625,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q20-default.txt-Plan]": [
@@ -2402,9 +2402,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_all-default.txt-Debug]": [
         {
-            "checksum": "a2d7f9e770ad774f99936d5fc1bc5690",
-            "size": 3153,
-            "uri": "https://{canondata_backend}/1937027/7e92a59557f254d8b58c96118ce2e626b197c0b1/resource.tar.gz#test.test_simple_columns-simple_columns_join_all-default.txt-Debug_/opt.yql_patched"
+            "checksum": "dfea9f64387e04911669bd5b714923b1",
+            "size": 3187,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_simple_columns-simple_columns_join_all-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_all-default.txt-Plan]": [
@@ -2428,9 +2428,9 @@
     ],
     "test.test[tpch-q10-default.txt-Debug]": [
         {
-            "checksum": "e82b80222637ec19e895a2cc1b2d765e",
-            "size": 12432,
-            "uri": "https://{canondata_backend}/1871002/687bee7af1280545ea5dbf73fb913b9c4e58ba06/resource.tar.gz#test.test_tpch-q10-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9bb3ede9b94f841d40ec8cc7e065e157",
+            "size": 12499,
+            "uri": "https://{canondata_backend}/1942173/7c77a27f1a6a7f952a7fad5a820ff16b2b90fda4/resource.tar.gz#test.test_tpch-q10-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q10-default.txt-Plan]": [
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 dcc21d70a92..6d5be8e4366 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
@@ -863,9 +863,9 @@
     ],
     "test.test[hor_join-row_num_per_sect--Debug]": [
         {
-            "checksum": "52ad27a5b6ae688ff41bf03d7786466d",
-            "size": 4803,
-            "uri": "https://{canondata_backend}/1925842/89201b3d4ed056ff4c825e43401edcfb2de6a888/resource.tar.gz#test.test_hor_join-row_num_per_sect--Debug_/opt.yql_patched"
+            "checksum": "8fd59d2f37f5af5e097c171f037736f5",
+            "size": 4811,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_hor_join-row_num_per_sect--Debug_/opt.yql_patched"
         }
     ],
     "test.test[hor_join-row_num_per_sect--Plan]": [
@@ -1015,9 +1015,9 @@
     ],
     "test.test[join-filter_joined-off-Debug]": [
         {
-            "checksum": "510725e9b330cf8e4b2ee87fc79b2af0",
-            "size": 2423,
-            "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-filter_joined-off-Debug_/opt.yql_patched"
+            "checksum": "b636302af94e65bc35b74dc61a2c38aa",
+            "size": 2431,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-filter_joined-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-filter_joined-off-Plan]": [
@@ -1043,9 +1043,9 @@
     ],
     "test.test[join-from_in_front_join-off-Debug]": [
         {
-            "checksum": "eded91de4543d602493927dec3fcd835",
-            "size": 2284,
-            "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-from_in_front_join-off-Debug_/opt.yql_patched"
+            "checksum": "565e6a72f6f24490d675a723f87f9e07",
+            "size": 2314,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-from_in_front_join-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-from_in_front_join-off-Plan]": [
@@ -1071,9 +1071,9 @@
     ],
     "test.test[join-grace_join1-off-Debug]": [
         {
-            "checksum": "7584f427c15db89dc77a8e6507e6b1f7",
-            "size": 2768,
-            "uri": "https://{canondata_backend}/1689644/a542bdd2dded3530ea215952e130558c5b8e2394/resource.tar.gz#test.test_join-grace_join1-off-Debug_/opt.yql_patched"
+            "checksum": "8d499e4b9f23b070b51b007b89b37d99",
+            "size": 2805,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-grace_join1-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-grace_join1-off-Plan]": [
@@ -1127,9 +1127,9 @@
     ],
     "test.test[join-inner_trivial--Debug]": [
         {
-            "checksum": "7488d9196a7ce179a518fb73e58e0db6",
-            "size": 2439,
-            "uri": "https://{canondata_backend}/1775059/8eed37259d411fc80649c1b2311ad3abfd9ee15e/resource.tar.gz#test.test_join-inner_trivial--Debug_/opt.yql_patched"
+            "checksum": "33a7c0834d1ba388f9df6ecd0c556480",
+            "size": 2447,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-inner_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_trivial--Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-inner_trivial-off-Debug]": [
         {
-            "checksum": "eded91de4543d602493927dec3fcd835",
-            "size": 2284,
-            "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-inner_trivial-off-Debug_/opt.yql_patched"
+            "checksum": "565e6a72f6f24490d675a723f87f9e07",
+            "size": 2314,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-inner_trivial-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_trivial-off-Plan]": [
@@ -1180,9 +1180,9 @@
     ],
     "test.test[join-join_without_correlation_names--Debug]": [
         {
-            "checksum": "7d413d01e4070c5b567adef24b538101",
-            "size": 2817,
-            "uri": "https://{canondata_backend}/1936947/c075b3a6b857003250f6fcdaddd6e5508fb9d58f/resource.tar.gz#test.test_join-join_without_correlation_names--Debug_/opt.yql_patched"
+            "checksum": "3e9d9382ccb9276888cc0929fef316ca",
+            "size": 2851,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-join_without_correlation_names--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_names--Plan]": [
@@ -1209,9 +1209,9 @@
     ],
     "test.test[join-lookupjoin_with_cache-off-Debug]": [
         {
-            "checksum": "f5d056938db6359405c0331c2f9a148f",
-            "size": 4605,
-            "uri": "https://{canondata_backend}/1781765/e2adc29b0cfedd2d07b9052970265a4b4f24285c/resource.tar.gz#test.test_join-lookupjoin_with_cache-off-Debug_/opt.yql_patched"
+            "checksum": "6d162e5ad4b3b3bad064ac2b86afc683",
+            "size": 4613,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-lookupjoin_with_cache-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_with_cache-off-Plan]": [
@@ -1237,9 +1237,9 @@
     ],
     "test.test[join-mapjoin_dup_key--Debug]": [
         {
-            "checksum": "2de7a7fb5234ad85d6bf667228150320",
-            "size": 2444,
-            "uri": "https://{canondata_backend}/1775059/8eed37259d411fc80649c1b2311ad3abfd9ee15e/resource.tar.gz#test.test_join-mapjoin_dup_key--Debug_/opt.yql_patched"
+            "checksum": "b35b7c77eccfa219aca8d0213306cb5b",
+            "size": 2480,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mapjoin_dup_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_dup_key--Plan]": [
@@ -1259,9 +1259,9 @@
     ],
     "test.test[join-mapjoin_dup_key-off-Debug]": [
         {
-            "checksum": "5eca7b346e5ec3944bb8685a9999f6cc",
-            "size": 2285,
-            "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-mapjoin_dup_key-off-Debug_/opt.yql_patched"
+            "checksum": "38037ba6222a9f788a78348edd91c281",
+            "size": 2320,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mapjoin_dup_key-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_dup_key-off-Plan]": [
@@ -1287,9 +1287,9 @@
     ],
     "test.test[join-mergejoin_any_no_join_reduce-off-Debug]": [
         {
-            "checksum": "8d5f82fee1e4852bbbed08f39f374bb1",
-            "size": 2132,
-            "uri": "https://{canondata_backend}/1937001/2a7ef44323a9583b611e77f9451ecbcf9a39cd8f/resource.tar.gz#test.test_join-mergejoin_any_no_join_reduce-off-Debug_/opt.yql_patched"
+            "checksum": "e6d9e9ae290d4eaec16f355d75873774",
+            "size": 2140,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mergejoin_any_no_join_reduce-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_any_no_join_reduce-off-Plan]": [
@@ -1315,9 +1315,9 @@
     ],
     "test.test[join-mergejoin_narrows_output_sort--Debug]": [
         {
-            "checksum": "566529028aa4b0a748411c2a07a05b4a",
-            "size": 5695,
-            "uri": "https://{canondata_backend}/1775059/8eed37259d411fc80649c1b2311ad3abfd9ee15e/resource.tar.gz#test.test_join-mergejoin_narrows_output_sort--Debug_/opt.yql_patched"
+            "checksum": "b018118dccada1234ad5848a6ff57b4b",
+            "size": 5737,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mergejoin_narrows_output_sort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_narrows_output_sort--Plan]": [
@@ -1337,9 +1337,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort-off-Debug]": [
         {
-            "checksum": "773b1ed94d1e2ff74b32ae1f48cbe3f8",
-            "size": 9493,
-            "uri": "https://{canondata_backend}/1936947/c075b3a6b857003250f6fcdaddd6e5508fb9d58f/resource.tar.gz#test.test_join-mergejoin_saves_output_sort-off-Debug_/opt.yql_patched"
+            "checksum": "a9868bec6bc72bf97ae346f13828c1ea",
+            "size": 9565,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mergejoin_saves_output_sort-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort-off-Plan]": [
@@ -1387,9 +1387,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_nested-off-Debug]": [
         {
-            "checksum": "d2df77959ef94df3a988ad62382a93c8",
-            "size": 4278,
-            "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nested-off-Debug_/opt.yql_patched"
+            "checksum": "2890c347bf75428a6486a6f073ee3d5a",
+            "size": 4286,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nested-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_nested-off-Plan]": [
@@ -1415,9 +1415,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_norename--Debug]": [
         {
-            "checksum": "9c413d55bf5d7a7f8bdeddc35bbfc8b0",
-            "size": 5602,
-            "uri": "https://{canondata_backend}/1817427/0c40572784ba0c378f9763d962c3c5e8b7787ec6/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_norename--Debug_/opt.yql_patched"
+            "checksum": "003e95a491f990454ec6731b3eabd613",
+            "size": 5626,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_norename--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_norename--Plan]": [
@@ -1437,9 +1437,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_norename-off-Debug]": [
         {
-            "checksum": "c502bdf4d1d1b4f7108a27a360b1859c",
-            "size": 5125,
-            "uri": "https://{canondata_backend}/1817427/0c40572784ba0c378f9763d962c3c5e8b7787ec6/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_norename-off-Debug_/opt.yql_patched"
+            "checksum": "907fc0669df961d84cdd6e8bdf64b9e0",
+            "size": 5170,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_norename-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_norename-off-Plan]": [
@@ -1465,9 +1465,9 @@
     ],
     "test.test[join-pullup_exclusion-off-Debug]": [
         {
-            "checksum": "e4f06b6b8465fbdf70a3e2b5cc6422d0",
-            "size": 3588,
-            "uri": "https://{canondata_backend}/1924537/8b609a36ae618dd93dae76d33a498930f0df8908/resource.tar.gz#test.test_join-pullup_exclusion-off-Debug_/opt.yql_patched"
+            "checksum": "1c886943c403a2f5b22932631e0fa1c5",
+            "size": 3596,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-pullup_exclusion-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_exclusion-off-Plan]": [
@@ -1493,9 +1493,9 @@
     ],
     "test.test[join-pullup_inner--Debug]": [
         {
-            "checksum": "dd1f1129a9fde57ad9cfe5486e883e37",
-            "size": 2819,
-            "uri": "https://{canondata_backend}/1924537/8b609a36ae618dd93dae76d33a498930f0df8908/resource.tar.gz#test.test_join-pullup_inner--Debug_/opt.yql_patched"
+            "checksum": "4afc5c76383b9f74dc521484a374740e",
+            "size": 2827,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-pullup_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_inner--Plan]": [
@@ -1515,9 +1515,9 @@
     ],
     "test.test[join-three_equalities--Debug]": [
         {
-            "checksum": "13a2e38b6dc9a0dbecf273033a0a025d",
-            "size": 3621,
-            "uri": "https://{canondata_backend}/1775059/8eed37259d411fc80649c1b2311ad3abfd9ee15e/resource.tar.gz#test.test_join-three_equalities--Debug_/opt.yql_patched"
+            "checksum": "e6135c9e2f53dd0658139f6739172210",
+            "size": 3699,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_join-three_equalities--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-three_equalities--Plan]": [
@@ -2206,9 +2206,9 @@
     ],
     "test.test[pg-tpch-q09-default.txt-Debug]": [
         {
-            "checksum": "6b0e666ebab448c0fc0280db34c43050",
-            "size": 15462,
-            "uri": "https://{canondata_backend}/1942525/b9bb3a1fbdb407ecda898dc1b460df49b1268bbf/resource.tar.gz#test.test_pg-tpch-q09-default.txt-Debug_/opt.yql_patched"
+            "checksum": "be9680a4f9cbc57e2580bc01b9591625",
+            "size": 15679,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_pg-tpch-q09-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q09-default.txt-Plan]": [
@@ -2561,9 +2561,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Debug]": [
         {
-            "checksum": "617a4b11b14848c35ab67e7fa848d2f2",
-            "size": 3110,
-            "uri": "https://{canondata_backend}/1936947/c075b3a6b857003250f6fcdaddd6e5508fb9d58f/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Debug_/opt.yql_patched"
+            "checksum": "0418967b3e6f0e10939331651c0cd8e5",
+            "size": 3144,
+            "uri": "https://{canondata_backend}/1031349/19c1b83c6617df0481dde490e324b359e5015bf9/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Plan]": [
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 8ad12b63be8..393cab705e2 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
@@ -289,9 +289,9 @@
     ],
     "test.test[aggregate-group_by_expr_with_join--Debug]": [
         {
-            "checksum": "2374a8e9cf058eda416ec7e66d2df84a",
-            "size": 3143,
-            "uri": "https://{canondata_backend}/1936947/e9b2989833eb2cb143a6b33579463fddacfe47db/resource.tar.gz#test.test_aggregate-group_by_expr_with_join--Debug_/opt.yql_patched"
+            "checksum": "cf21c3a8fba4969b410b297dc4185510",
+            "size": 3163,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_aggregate-group_by_expr_with_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_expr_with_join--Plan]": [
@@ -1228,9 +1228,9 @@
     ],
     "test.test[in-in_compact_distinct-empty-Debug]": [
         {
-            "checksum": "68e77fa1f03b2d1a3a89c4662d7e408e",
-            "size": 3179,
-            "uri": "https://{canondata_backend}/1871182/cdd8fb9ea4ddd53c6670aa1140203ceb50634749/resource.tar.gz#test.test_in-in_compact_distinct-empty-Debug_/opt.yql_patched"
+            "checksum": "acd650a3cf1fa0c3a45324690a89b37b",
+            "size": 3187,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_in-in_compact_distinct-empty-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_compact_distinct-empty-Plan]": [
@@ -1306,9 +1306,9 @@
     ],
     "test.test[join-anyjoin_common_dup--Debug]": [
         {
-            "checksum": "2e9bd4b61373c617b245f2afb533e31a",
-            "size": 5153,
-            "uri": "https://{canondata_backend}/1871182/893ad3fc11eaa7592c8f79be39032bc7c103ca52/resource.tar.gz#test.test_join-anyjoin_common_dup--Debug_/opt.yql_patched"
+            "checksum": "2be9469d802ec4ea7145aa6ad12a58ef",
+            "size": 5185,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-anyjoin_common_dup--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_dup--Plan]": [
@@ -1328,9 +1328,9 @@
     ],
     "test.test[join-anyjoin_common_dup-off-Debug]": [
         {
-            "checksum": "aa547c1979785eedd20c559006af434f",
-            "size": 5765,
-            "uri": "https://{canondata_backend}/1871182/893ad3fc11eaa7592c8f79be39032bc7c103ca52/resource.tar.gz#test.test_join-anyjoin_common_dup-off-Debug_/opt.yql_patched"
+            "checksum": "6a9cc0931ad793927587d2f52cd06d4a",
+            "size": 5828,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-anyjoin_common_dup-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_dup-off-Plan]": [
@@ -1428,9 +1428,9 @@
     ],
     "test.test[join-inner_grouped-off-Debug]": [
         {
-            "checksum": "7f23d823f97a89009a065dd396665968",
-            "size": 3426,
-            "uri": "https://{canondata_backend}/995452/cf615d0761fdf54ff78f8d33100e0f379784db10/resource.tar.gz#test.test_join-inner_grouped-off-Debug_/opt.yql_patched"
+            "checksum": "e65b2420bd032b5d21cbb21c69e0467d",
+            "size": 3448,
+            "uri": "https://{canondata_backend}/1942100/b7c3148d85bada3dcb5f80c113a4345cbf0e421e/resource.tar.gz#test.test_join-inner_grouped-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_grouped-off-Plan]": [
@@ -1456,9 +1456,9 @@
     ],
     "test.test[join-join_left_cbo--Debug]": [
         {
-            "checksum": "5a44f489aad4c30996c298a194334422",
-            "size": 2585,
-            "uri": "https://{canondata_backend}/1936997/3b4a22ca6dc6f7fdc9a243be5c610aa02e850d48/resource.tar.gz#test.test_join-join_left_cbo--Debug_/opt.yql_patched"
+            "checksum": "53b7fd938ee1fba4deec3ec69af4e6b8",
+            "size": 2595,
+            "uri": "https://{canondata_backend}/1942100/b7c3148d85bada3dcb5f80c113a4345cbf0e421e/resource.tar.gz#test.test_join-join_left_cbo--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_left_cbo--Plan]": [
@@ -1478,9 +1478,9 @@
     ],
     "test.test[join-join_right_cbo--Debug]": [
         {
-            "checksum": "9acafe243bd31bdb7f660720fd88f785",
-            "size": 2587,
-            "uri": "https://{canondata_backend}/1936997/3b4a22ca6dc6f7fdc9a243be5c610aa02e850d48/resource.tar.gz#test.test_join-join_right_cbo--Debug_/opt.yql_patched"
+            "checksum": "7d9bd70a94f140c7fa48c78d6ba901e7",
+            "size": 2595,
+            "uri": "https://{canondata_backend}/1942100/b7c3148d85bada3dcb5f80c113a4345cbf0e421e/resource.tar.gz#test.test_join-join_right_cbo--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_right_cbo--Plan]": [
@@ -1500,9 +1500,9 @@
     ],
     "test.test[join-left_join_null_column--Debug]": [
         {
-            "checksum": "ebfd269be1f03b7e1089396429486cac",
-            "size": 2010,
-            "uri": "https://{canondata_backend}/1889210/5f0f82e4a2bed51403d8667507a43b3b2e40bfb4/resource.tar.gz#test.test_join-left_join_null_column--Debug_/opt.yql_patched"
+            "checksum": "62aef4ffc02573e6535bdc05f8addaf2",
+            "size": 2028,
+            "uri": "https://{canondata_backend}/1942100/b7c3148d85bada3dcb5f80c113a4345cbf0e421e/resource.tar.gz#test.test_join-left_join_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_join_null_column--Plan]": [
@@ -1525,9 +1525,9 @@
     ],
     "test.test[join-lookupjoin_bug7646_subst--Debug]": [
         {
-            "checksum": "6f1e0f90b4ce5214b30b4220e454cc28",
-            "size": 7079,
-            "uri": "https://{canondata_backend}/1936947/e5ffaeeed615e0346537e67b5a609bd1a207a23b/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst--Debug_/opt.yql_patched"
+            "checksum": "0853d3a634a9377b941a8add17716074",
+            "size": 7125,
+            "uri": "https://{canondata_backend}/1942100/b7c3148d85bada3dcb5f80c113a4345cbf0e421e/resource.tar.gz#test.test_join-lookupjoin_bug7646_subst--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug7646_subst--Plan]": [
@@ -1547,9 +1547,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o2o-off-Debug]": [
         {
-            "checksum": "9af259e1c05a14c047112bf5aa68089c",
-            "size": 3053,
-            "uri": "https://{canondata_backend}/1599023/4e9b507a0cbcf5cfc31288de53bbb8560bb1a4bf/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o-off-Debug_/opt.yql_patched"
+            "checksum": "69013b84478ac9597c673cf9140818d8",
+            "size": 3057,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_1o2o-off-Plan]": [
@@ -1575,9 +1575,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite--Debug]": [
         {
-            "checksum": "05816de5de3e25e03744ad040cefe1e9",
-            "size": 2897,
-            "uri": "https://{canondata_backend}/1936947/e9b2989833eb2cb143a6b33579463fddacfe47db/resource.tar.gz#test.test_join-mapjoin_early_rewrite--Debug_/opt.yql_patched"
+            "checksum": "95e210e552eaa78497632cef77ccde95",
+            "size": 2917,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-mapjoin_early_rewrite--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite--Plan]": [
@@ -1597,9 +1597,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_non_optional_left_only_single--Debug]": [
         {
-            "checksum": "0abc00df02c21147e0038c55ddbb221c",
-            "size": 2834,
-            "uri": "https://{canondata_backend}/1597364/26c9cd4ddf7d11c6a72eed900146bed3a8e037de/resource.tar.gz#test.test_join-mapjoin_on_complex_type_non_optional_left_only_single--Debug_/opt.yql_patched"
+            "checksum": "a9f4bd3f5006d68fa22d4ad011ab8cb5",
+            "size": 2848,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-mapjoin_on_complex_type_non_optional_left_only_single--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_non_optional_left_only_single--Plan]": [
@@ -1619,9 +1619,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_non_optional_left_only_single-off-Debug]": [
         {
-            "checksum": "433dd390a5404ef4f46d04a9d8ab45f1",
-            "size": 2919,
-            "uri": "https://{canondata_backend}/1599023/4e9b507a0cbcf5cfc31288de53bbb8560bb1a4bf/resource.tar.gz#test.test_join-mapjoin_on_complex_type_non_optional_left_only_single-off-Debug_/opt.yql_patched"
+            "checksum": "1216a21d5b0d733c3be6a3ef7185a35a",
+            "size": 2933,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-mapjoin_on_complex_type_non_optional_left_only_single-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_non_optional_left_only_single-off-Plan]": [
@@ -1647,9 +1647,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_single-off-Debug]": [
         {
-            "checksum": "c2d030bfc8640b32efd737a702a111c3",
-            "size": 2571,
-            "uri": "https://{canondata_backend}/1937001/3df1bf80f5738c3f0205526961db8957f75fdaea/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_single-off-Debug_/opt.yql_patched"
+            "checksum": "b60f9a8decf1151ef10ce57897a20921",
+            "size": 2585,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_single-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_single-off-Plan]": [
@@ -1675,9 +1675,9 @@
     ],
     "test.test[join-mapjoin_partial_uniq_keys-off-Debug]": [
         {
-            "checksum": "5eaf8354f6cc16f145e87afab1b16819",
-            "size": 3280,
-            "uri": "https://{canondata_backend}/1936947/e9b2989833eb2cb143a6b33579463fddacfe47db/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys-off-Debug_/opt.yql_patched"
+            "checksum": "8d47b58ba17293369003c5ae425cc7f7",
+            "size": 3300,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_partial_uniq_keys-off-Plan]": [
@@ -1703,9 +1703,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names--Debug]": [
         {
-            "checksum": "daa901bcce94e74d0c9bda0edffa0c36",
-            "size": 5599,
-            "uri": "https://{canondata_backend}/1917492/d983c8e69867e7a5af2aad3db8b5eeebdf959284/resource.tar.gz#test.test_join-mergejoin_with_different_key_names--Debug_/opt.yql_patched"
+            "checksum": "605681ecc576f463cd3736a4b03e8137",
+            "size": 5623,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-mergejoin_with_different_key_names--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names--Plan]": [
@@ -1725,9 +1725,9 @@
     ],
     "test.test[join-premap_common_right_tablecontent--Debug]": [
         {
-            "checksum": "c63327da6da05173c10204ed7879e595",
-            "size": 4062,
-            "uri": "https://{canondata_backend}/1917492/d983c8e69867e7a5af2aad3db8b5eeebdf959284/resource.tar.gz#test.test_join-premap_common_right_tablecontent--Debug_/opt.yql_patched"
+            "checksum": "ad2e262d443e068314365065d4b85793",
+            "size": 4070,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-premap_common_right_tablecontent--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_right_tablecontent--Plan]": [
@@ -1747,9 +1747,9 @@
     ],
     "test.test[join-pushdown_filter_over_inner_with_strict_udf--Debug]": [
         {
-            "checksum": "05a2007d81d74ca83d3a9dbbafcad0d3",
-            "size": 2991,
-            "uri": "https://{canondata_backend}/1889210/cdea4d984d293e4c4894b43fbddd80f6768144c4/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_strict_udf--Debug_/opt.yql_patched"
+            "checksum": "926dda62b8bdcd29038cce7de32c9bd8",
+            "size": 2999,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_strict_udf--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_inner_with_strict_udf--Plan]": [
@@ -1769,9 +1769,9 @@
     ],
     "test.test[join-simple_columns_partial--Debug]": [
         {
-            "checksum": "644742a020d613053bb84a2ae0cf10bc",
-            "size": 4327,
-            "uri": "https://{canondata_backend}/1936947/e9b2989833eb2cb143a6b33579463fddacfe47db/resource.tar.gz#test.test_join-simple_columns_partial--Debug_/opt.yql_patched"
+            "checksum": "62ff08bd62351739ca7f5f8897893e3b",
+            "size": 4359,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-simple_columns_partial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-simple_columns_partial--Plan]": [
@@ -1791,9 +1791,9 @@
     ],
     "test.test[join-yql-10654_pullup_with_sys_columns--Debug]": [
         {
-            "checksum": "4a582121c9ca58fded87f2ec6be801ec",
-            "size": 2807,
-            "uri": "https://{canondata_backend}/1924537/de922a973d80db7430ccc36b4b196b0fe3a08ff2/resource.tar.gz#test.test_join-yql-10654_pullup_with_sys_columns--Debug_/opt.yql_patched"
+            "checksum": "02717b964e8a286fca89b94a85f88bff",
+            "size": 2813,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-yql-10654_pullup_with_sys_columns--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-10654_pullup_with_sys_columns--Plan]": [
@@ -1813,9 +1813,9 @@
     ],
     "test.test[join-yql-14847-off-Debug]": [
         {
-            "checksum": "2002a08a74299a24e2adf96635fc1315",
-            "size": 3415,
-            "uri": "https://{canondata_backend}/1777230/11c4f630aeae911ec4d9696f9ed2ecf794640de1/resource.tar.gz#test.test_join-yql-14847-off-Debug_/opt.yql_patched"
+            "checksum": "b169ea2fabd32471b473e893d513b60c",
+            "size": 3440,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-yql-14847-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14847-off-Plan]": [
@@ -1901,9 +1901,9 @@
     ],
     "test.test[join-yql-8980--Debug]": [
         {
-            "checksum": "65e01e689cfa82babcc5c43e20771249",
-            "size": 3703,
-            "uri": "https://{canondata_backend}/1917492/d983c8e69867e7a5af2aad3db8b5eeebdf959284/resource.tar.gz#test.test_join-yql-8980--Debug_/opt.yql_patched"
+            "checksum": "2ec24e57b39532f60f6dc71a74603363",
+            "size": 3743,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_join-yql-8980--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-8980--Plan]": [
@@ -2502,9 +2502,9 @@
     ],
     "test.test[pg-tpch-q04-default.txt-Debug]": [
         {
-            "checksum": "3b518a82f26def6d341316349d3ba89e",
-            "size": 9178,
-            "uri": "https://{canondata_backend}/1871182/cdd8fb9ea4ddd53c6670aa1140203ceb50634749/resource.tar.gz#test.test_pg-tpch-q04-default.txt-Debug_/opt.yql_patched"
+            "checksum": "88355c18f13a440f21cf0f5989182a84",
+            "size": 9226,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_pg-tpch-q04-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q04-default.txt-Plan]": [
@@ -2758,9 +2758,9 @@
     ],
     "test.test[type_v3-mergejoin_with_sort--Debug]": [
         {
-            "checksum": "e335d32d42443be9ca324bbb8d8875ef",
-            "size": 3069,
-            "uri": "https://{canondata_backend}/1923547/fea898f087e0f27f17f93176391f1a45065a7fa5/resource.tar.gz#test.test_type_v3-mergejoin_with_sort--Debug_/opt.yql_patched"
+            "checksum": "5b6e6bbf7892840309ee05ecfd5312de",
+            "size": 3077,
+            "uri": "https://{canondata_backend}/1942100/b7c3148d85bada3dcb5f80c113a4345cbf0e421e/resource.tar.gz#test.test_type_v3-mergejoin_with_sort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[type_v3-mergejoin_with_sort--Plan]": [
@@ -2831,9 +2831,9 @@
     ],
     "test.test[weak_field-weak_field_join--Debug]": [
         {
-            "checksum": "a4a57e5501e6e39a03c40a822f1822a9",
-            "size": 3947,
-            "uri": "https://{canondata_backend}/1871182/91f889c7532ee076053812abbc5ffbe82bf23f5f/resource.tar.gz#test.test_weak_field-weak_field_join--Debug_/opt.yql_patched"
+            "checksum": "e923d17b3b54a4ad545b576e9248b700",
+            "size": 3955,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_weak_field-weak_field_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[weak_field-weak_field_join--Plan]": [
@@ -2853,9 +2853,9 @@
     ],
     "test.test[weak_field-weak_field_join_condition--Debug]": [
         {
-            "checksum": "163abc737493e2a21904062939175b23",
-            "size": 4160,
-            "uri": "https://{canondata_backend}/1871182/91f889c7532ee076053812abbc5ffbe82bf23f5f/resource.tar.gz#test.test_weak_field-weak_field_join_condition--Debug_/opt.yql_patched"
+            "checksum": "7fcc7da8b0c103377ce20a8b15ae5019",
+            "size": 4196,
+            "uri": "https://{canondata_backend}/1871182/4317fe200ca948d942762066eed2d9a33cc59adc/resource.tar.gz#test.test_weak_field-weak_field_join_condition--Debug_/opt.yql_patched"
         }
     ],
     "test.test[weak_field-weak_field_join_condition--Plan]": [
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 375bb0ba9f2..64fad671176 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
@@ -1210,9 +1210,9 @@
     ],
     "test.test[join-anyjoin_common_nodata_keys-off-Debug]": [
         {
-            "checksum": "e70f7576de758019dea7880b960506e5",
-            "size": 5167,
-            "uri": "https://{canondata_backend}/1871002/f2b11283e242599ec077764e30c7c497103c2c47/resource.tar.gz#test.test_join-anyjoin_common_nodata_keys-off-Debug_/opt.yql_patched"
+            "checksum": "44f01bf417c9e131b69ddc6cdcf5daed",
+            "size": 5197,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-anyjoin_common_nodata_keys-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_nodata_keys-off-Plan]": [
@@ -1238,9 +1238,9 @@
     ],
     "test.test[join-equi_join_three_simple--Debug]": [
         {
-            "checksum": "0e222972b5f6badf793f0d12bd8e1266",
-            "size": 3443,
-            "uri": "https://{canondata_backend}/1784826/cf0f4ffb05e551854e93236e2ec6a28087498c6c/resource.tar.gz#test.test_join-equi_join_three_simple--Debug_/opt.yql_patched"
+            "checksum": "9ee1d558c8c5c49ef01414c258295466",
+            "size": 3473,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-equi_join_three_simple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_simple--Plan]": [
@@ -1260,9 +1260,9 @@
     ],
     "test.test[join-equi_join_three_simple-off-Debug]": [
         {
-            "checksum": "53713963724d4430ec1069b3d6d8111e",
-            "size": 2716,
-            "uri": "https://{canondata_backend}/1924537/40c66e62107c2a9e3733dec809479087bdd8f6d6/resource.tar.gz#test.test_join-equi_join_three_simple-off-Debug_/opt.yql_patched"
+            "checksum": "000ceeaa30185b584b624e4fa3c06670",
+            "size": 2825,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-equi_join_three_simple-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_simple-off-Plan]": [
@@ -1288,9 +1288,9 @@
     ],
     "test.test[join-full_equal_null--Debug]": [
         {
-            "checksum": "6cbbbc249697741accb4894b32e6b6d6",
-            "size": 3022,
-            "uri": "https://{canondata_backend}/1936947/2fc43e3b7bf2ac6312b395248938656a7fa50fcc/resource.tar.gz#test.test_join-full_equal_null--Debug_/opt.yql_patched"
+            "checksum": "c6a6166d931e06f97222bcf0854ef5d6",
+            "size": 3056,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-full_equal_null--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_equal_null--Plan]": [
@@ -1310,9 +1310,9 @@
     ],
     "test.test[join-inner_trivial_from_concat--Debug]": [
         {
-            "checksum": "7c88ce9627d1396310a2b721dbac70be",
-            "size": 2612,
-            "uri": "https://{canondata_backend}/1784826/cf0f4ffb05e551854e93236e2ec6a28087498c6c/resource.tar.gz#test.test_join-inner_trivial_from_concat--Debug_/opt.yql_patched"
+            "checksum": "0e1b206b7fd08502b79ce7a597fe41ca",
+            "size": 2620,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-inner_trivial_from_concat--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_trivial_from_concat--Plan]": [
@@ -1332,9 +1332,9 @@
     ],
     "test.test[join-inner_trivial_from_concat-off-Debug]": [
         {
-            "checksum": "074e3330122abd18e8e493410bc5cdec",
-            "size": 2453,
-            "uri": "https://{canondata_backend}/1924537/40c66e62107c2a9e3733dec809479087bdd8f6d6/resource.tar.gz#test.test_join-inner_trivial_from_concat-off-Debug_/opt.yql_patched"
+            "checksum": "4ff58f6dfc4461e2032ddffac7709893",
+            "size": 2483,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-inner_trivial_from_concat-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_trivial_from_concat-off-Plan]": [
@@ -1363,9 +1363,9 @@
     ],
     "test.test[join-join_without_column--Debug]": [
         {
-            "checksum": "1bf8d7d6110d4544e1a9ff16c4546eea",
-            "size": 2807,
-            "uri": "https://{canondata_backend}/1936947/2fc43e3b7bf2ac6312b395248938656a7fa50fcc/resource.tar.gz#test.test_join-join_without_column--Debug_/opt.yql_patched"
+            "checksum": "6580057f558a4213679909d606aeb115",
+            "size": 2841,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-join_without_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_column--Plan]": [
@@ -1392,9 +1392,9 @@
     ],
     "test.test[join-join_without_correlation_and_struct_access-off-Debug]": [
         {
-            "checksum": "39eac1695fdb17e8cac6d3cb221529ac",
-            "size": 3115,
-            "uri": "https://{canondata_backend}/1936947/2fc43e3b7bf2ac6312b395248938656a7fa50fcc/resource.tar.gz#test.test_join-join_without_correlation_and_struct_access-off-Debug_/opt.yql_patched"
+            "checksum": "70a41e9c6db2129c066d29b42b53aec0",
+            "size": 3155,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-join_without_correlation_and_struct_access-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_and_struct_access-off-Plan]": [
@@ -1423,9 +1423,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o--Debug]": [
         {
-            "checksum": "8b585aacf8ed490f30e5d0b5375a1654",
-            "size": 3637,
-            "uri": "https://{canondata_backend}/1784826/cf0f4ffb05e551854e93236e2ec6a28087498c6c/resource.tar.gz#test.test_join-lookupjoin_inner_1o--Debug_/opt.yql_patched"
+            "checksum": "be697afb789a711c7df3432b917ed473",
+            "size": 3643,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-lookupjoin_inner_1o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_1o--Plan]": [
@@ -1445,9 +1445,9 @@
     ],
     "test.test[join-lookupjoin_semi_2o-off-Debug]": [
         {
-            "checksum": "c33de03003be23bf67b0b2a8183992a7",
-            "size": 3109,
-            "uri": "https://{canondata_backend}/1924537/40c66e62107c2a9e3733dec809479087bdd8f6d6/resource.tar.gz#test.test_join-lookupjoin_semi_2o-off-Debug_/opt.yql_patched"
+            "checksum": "860d3d99a6ad3f41fbe532d374690bb1",
+            "size": 3122,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-lookupjoin_semi_2o-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_2o-off-Plan]": [
@@ -1473,9 +1473,9 @@
     ],
     "test.test[join-lookupjoin_semi_subq-off-Debug]": [
         {
-            "checksum": "e405a2edc94ff9786d6581dbea16fb74",
-            "size": 3226,
-            "uri": "https://{canondata_backend}/1814674/de17576700fc11fc02ec994a616abc5adadd5f40/resource.tar.gz#test.test_join-lookupjoin_semi_subq-off-Debug_/opt.yql_patched"
+            "checksum": "17b861dbebb9d82b64290a320103f436",
+            "size": 3253,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-lookupjoin_semi_subq-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_subq-off-Plan]": [
@@ -1504,9 +1504,9 @@
     ],
     "test.test[join-mapjoin_with_anonymous-off-Debug]": [
         {
-            "checksum": "6b5ff00e5e906a96e032a85c1e7298b7",
-            "size": 3368,
-            "uri": "https://{canondata_backend}/1871002/f2b11283e242599ec077764e30c7c497103c2c47/resource.tar.gz#test.test_join-mapjoin_with_anonymous-off-Debug_/opt.yql_patched"
+            "checksum": "388665b3346712545e3860096741867d",
+            "size": 3422,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-mapjoin_with_anonymous-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_with_anonymous-off-Plan]": [
@@ -1532,9 +1532,9 @@
     ],
     "test.test[join-premap_map_inner--Debug]": [
         {
-            "checksum": "e5851b6ff37ce8e4e1e002d3e7d6d8d9",
-            "size": 3437,
-            "uri": "https://{canondata_backend}/1784826/cf0f4ffb05e551854e93236e2ec6a28087498c6c/resource.tar.gz#test.test_join-premap_map_inner--Debug_/opt.yql_patched"
+            "checksum": "818b944464b39c28ed7032e9e7ef45aa",
+            "size": 3473,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-premap_map_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_inner--Plan]": [
@@ -1554,9 +1554,9 @@
     ],
     "test.test[join-premap_map_inner-off-Debug]": [
         {
-            "checksum": "f5f595757ab280ebe0d7702aaea96b1d",
-            "size": 3304,
-            "uri": "https://{canondata_backend}/1924537/40c66e62107c2a9e3733dec809479087bdd8f6d6/resource.tar.gz#test.test_join-premap_map_inner-off-Debug_/opt.yql_patched"
+            "checksum": "e8f5ed0ed26a6293d58548109878b6d7",
+            "size": 3322,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-premap_map_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_inner-off-Plan]": [
@@ -1582,9 +1582,9 @@
     ],
     "test.test[join-premap_nonseq_flatmap-off-Debug]": [
         {
-            "checksum": "7ded3c70370b51aa33d82d0d618d76ab",
-            "size": 1874,
-            "uri": "https://{canondata_backend}/1924537/40c66e62107c2a9e3733dec809479087bdd8f6d6/resource.tar.gz#test.test_join-premap_nonseq_flatmap-off-Debug_/opt.yql_patched"
+            "checksum": "a9949a43c501d9a4f1aa3ccf795298cb",
+            "size": 1882,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-premap_nonseq_flatmap-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_nonseq_flatmap-off-Plan]": [
@@ -1613,9 +1613,9 @@
     ],
     "test.test[join-yql-8125-off-Debug]": [
         {
-            "checksum": "ef01e02d8fb3b36d4ce398b7b699b788",
-            "size": 6000,
-            "uri": "https://{canondata_backend}/1871002/f2b11283e242599ec077764e30c7c497103c2c47/resource.tar.gz#test.test_join-yql-8125-off-Debug_/opt.yql_patched"
+            "checksum": "21b739fe84435bd4db17c5e823ec57df",
+            "size": 6008,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_join-yql-8125-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-8125-off-Plan]": [
@@ -2270,9 +2270,9 @@
     ],
     "test.test[pg-tpch-q07-default.txt-Debug]": [
         {
-            "checksum": "d7c1ba4bf7c15c62d26be2abbae6c67b",
-            "size": 15079,
-            "uri": "https://{canondata_backend}/1773845/b47f1f4bac787b2bdb5c2d566b66807095fbb956/resource.tar.gz#test.test_pg-tpch-q07-default.txt-Debug_/opt.yql_patched"
+            "checksum": "37dfdcec2130064c8de5a211a6a2f405",
+            "size": 15236,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_pg-tpch-q07-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q07-default.txt-Plan]": [
@@ -2292,9 +2292,9 @@
     ],
     "test.test[pg-tpch-q10-default.txt-Debug]": [
         {
-            "checksum": "b44a9ad1f1c2845c400a2d59dfd3778e",
-            "size": 14271,
-            "uri": "https://{canondata_backend}/1773845/b47f1f4bac787b2bdb5c2d566b66807095fbb956/resource.tar.gz#test.test_pg-tpch-q10-default.txt-Debug_/opt.yql_patched"
+            "checksum": "e26844495a0ecb5d6ac018c26f979a29",
+            "size": 14393,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_pg-tpch-q10-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q10-default.txt-Plan]": [
@@ -2314,9 +2314,9 @@
     ],
     "test.test[pg-tpch-q14-default.txt-Debug]": [
         {
-            "checksum": "5fac1a1b68646f94408e527dd5f58791",
-            "size": 8293,
-            "uri": "https://{canondata_backend}/1924537/bb09f7f7f49f479d6bdbad2ad3eb185564d33ca0/resource.tar.gz#test.test_pg-tpch-q14-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9c5e88e9f4df67c2d407742997e57ad1",
+            "size": 8335,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_pg-tpch-q14-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q14-default.txt-Plan]": [
@@ -2566,9 +2566,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_qualified-default.txt-Debug]": [
         {
-            "checksum": "93bfd6de5614f4352464f8e33f20995e",
-            "size": 3031,
-            "uri": "https://{canondata_backend}/1936947/2fc43e3b7bf2ac6312b395248938656a7fa50fcc/resource.tar.gz#test.test_simple_columns-simple_columns_join_qualified-default.txt-Debug_/opt.yql_patched"
+            "checksum": "206da1c5471e6353ed41a3a29d0d2e24",
+            "size": 3065,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_simple_columns-simple_columns_join_qualified-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_qualified-default.txt-Plan]": [
@@ -2595,9 +2595,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Debug]": [
         {
-            "checksum": "38e2c32234a380759c5f062b3b442666",
-            "size": 2796,
-            "uri": "https://{canondata_backend}/1936947/2fc43e3b7bf2ac6312b395248938656a7fa50fcc/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c2cd189ec429234a13dcba607713a79b",
+            "size": 2802,
+            "uri": "https://{canondata_backend}/212715/7f481604d75f86fddead511124887e2e0fa01e78/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Plan]": [
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 442538318ca..a2b29a9db01 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
@@ -323,9 +323,9 @@
     ],
     "test.test[aggregate-group_by_ru_join--Debug]": [
         {
-            "checksum": "ceb9d500ea81a570a5e09fb71e3a25e5",
-            "size": 4136,
-            "uri": "https://{canondata_backend}/1931696/0a5f01ad7bf7c863b92eab0e8aff7f87ecb60e51/resource.tar.gz#test.test_aggregate-group_by_ru_join--Debug_/opt.yql_patched"
+            "checksum": "bd34725a3ba0deabf33687831bbad29a",
+            "size": 4142,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_aggregate-group_by_ru_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join--Plan]": [
@@ -1012,9 +1012,9 @@
     ],
     "test.test[insert-anonymous_tables-default.txt-Debug]": [
         {
-            "checksum": "f10c2d1e068afae9fe40a2532eb39209",
-            "size": 5324,
-            "uri": "https://{canondata_backend}/212715/7330261df3fff15f3668f75005d797e388f41e2f/resource.tar.gz#test.test_insert-anonymous_tables-default.txt-Debug_/opt.yql_patched"
+            "checksum": "a00f944a0900362a10dfd645da708b61",
+            "size": 5332,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_insert-anonymous_tables-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[insert-anonymous_tables-default.txt-Plan]": [
@@ -1056,9 +1056,9 @@
     ],
     "test.test[join-equi_join_by_expr-off-Debug]": [
         {
-            "checksum": "70e3d9fbc15c29dbe96c896cc348364c",
-            "size": 2850,
-            "uri": "https://{canondata_backend}/1931696/221cedac6157fdff4d16e16ac8e9133139de7efd/resource.tar.gz#test.test_join-equi_join_by_expr-off-Debug_/opt.yql_patched"
+            "checksum": "67652e101dd9a8c99f36900ee94a82fe",
+            "size": 2888,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-equi_join_by_expr-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_by_expr-off-Plan]": [
@@ -1084,9 +1084,9 @@
     ],
     "test.test[join-flatten_columns2-off-Debug]": [
         {
-            "checksum": "7d92288d4b4c655f2b1f9075dcc10638",
-            "size": 2649,
-            "uri": "https://{canondata_backend}/1937001/7bff8f98ab448f07ac3e80a4af0d2aed91a791f3/resource.tar.gz#test.test_join-flatten_columns2-off-Debug_/opt.yql_patched"
+            "checksum": "4d9fa57334edfcb242cf154410eaf5b4",
+            "size": 2679,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-flatten_columns2-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-flatten_columns2-off-Plan]": [
@@ -1115,9 +1115,9 @@
     ],
     "test.test[join-join_and_distinct_key-off-Debug]": [
         {
-            "checksum": "8b6db6c00e226a2716c816cb136ebdd4",
-            "size": 4466,
-            "uri": "https://{canondata_backend}/995452/e78675a82a4300d32887a13f4b9e86cb1608f590/resource.tar.gz#test.test_join-join_and_distinct_key-off-Debug_/opt.yql_patched"
+            "checksum": "74795016dd458d57161cf922b050ff65",
+            "size": 4506,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-join_and_distinct_key-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_and_distinct_key-off-Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-join_semi_correlation_in_order_by-off-Debug]": [
         {
-            "checksum": "9061f7ebbd1132c8f3201ff9322bc3d1",
-            "size": 2342,
-            "uri": "https://{canondata_backend}/995452/e78675a82a4300d32887a13f4b9e86cb1608f590/resource.tar.gz#test.test_join-join_semi_correlation_in_order_by-off-Debug_/opt.yql_patched"
+            "checksum": "3039b538fc77cfbf7e0718f07da89311",
+            "size": 2364,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-join_semi_correlation_in_order_by-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_semi_correlation_in_order_by-off-Plan]": [
@@ -1180,9 +1180,9 @@
     ],
     "test.test[join-left_cast_to_string--Debug]": [
         {
-            "checksum": "8afa5c1120a564aeae4169a2c460fb3c",
-            "size": 2770,
-            "uri": "https://{canondata_backend}/1775059/24b9dd14f7cb6caf2007568a5489e68c1bfd7731/resource.tar.gz#test.test_join-left_cast_to_string--Debug_/opt.yql_patched"
+            "checksum": "a80d7d10334cea3255896af620ccd763",
+            "size": 2778,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-left_cast_to_string--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_cast_to_string--Plan]": [
@@ -1202,9 +1202,9 @@
     ],
     "test.test[join-left_semi_with_other--Debug]": [
         {
-            "checksum": "9ba37bc66c862e1089f62019c473d513",
-            "size": 4061,
-            "uri": "https://{canondata_backend}/1931696/0a5f01ad7bf7c863b92eab0e8aff7f87ecb60e51/resource.tar.gz#test.test_join-left_semi_with_other--Debug_/opt.yql_patched"
+            "checksum": "69efb368ddc45cb6d36c404d3474fcac",
+            "size": 4077,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-left_semi_with_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_semi_with_other--Plan]": [
@@ -1224,9 +1224,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o--Debug]": [
         {
-            "checksum": "49d26d0efc88e8354b03a66764e56d36",
-            "size": 3518,
-            "uri": "https://{canondata_backend}/1775059/24b9dd14f7cb6caf2007568a5489e68c1bfd7731/resource.tar.gz#test.test_join-lookupjoin_semi_1o--Debug_/opt.yql_patched"
+            "checksum": "39b45e8f9a5d12587d4194d1b5ffcc22",
+            "size": 3540,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-lookupjoin_semi_1o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_1o--Plan]": [
@@ -1274,9 +1274,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_star-off-Debug]": [
         {
-            "checksum": "6fc1fd1a8d0b3068112452c268fcd41a",
-            "size": 2625,
-            "uri": "https://{canondata_backend}/995452/e78675a82a4300d32887a13f4b9e86cb1608f590/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star-off-Debug_/opt.yql_patched"
+            "checksum": "d245bc6c37229e5b2b2f1d0ffa0d7950",
+            "size": 2663,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_star-off-Plan]": [
@@ -1302,9 +1302,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort_nested-off-Debug]": [
         {
-            "checksum": "ebe4bfabe4117ce434d851d6b1ee7878",
-            "size": 4804,
-            "uri": "https://{canondata_backend}/1784826/6c4e23b08b618ad38a21babd86e439d03aa22777/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_nested-off-Debug_/opt.yql_patched"
+            "checksum": "24a47209d59fd6003333755920ce2709",
+            "size": 4814,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_nested-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort_nested-off-Plan]": [
@@ -1330,9 +1330,9 @@
     ],
     "test.test[join-mergejoin_small_primary--Debug]": [
         {
-            "checksum": "aa27c1474ab50914594f6639d53a4afc",
-            "size": 3452,
-            "uri": "https://{canondata_backend}/1775059/24b9dd14f7cb6caf2007568a5489e68c1bfd7731/resource.tar.gz#test.test_join-mergejoin_small_primary--Debug_/opt.yql_patched"
+            "checksum": "cb9cc2cd23d63e065612ab3faf387db8",
+            "size": 3488,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-mergejoin_small_primary--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_small_primary--Plan]": [
@@ -1352,9 +1352,9 @@
     ],
     "test.test[join-mergejoin_small_primary-off-Debug]": [
         {
-            "checksum": "a46ae14645fdf1b2225d9281d894738c",
-            "size": 3197,
-            "uri": "https://{canondata_backend}/1784826/6c4e23b08b618ad38a21babd86e439d03aa22777/resource.tar.gz#test.test_join-mergejoin_small_primary-off-Debug_/opt.yql_patched"
+            "checksum": "571d5faa3f00c5755c7dd9c7426ea59b",
+            "size": 3211,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-mergejoin_small_primary-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_small_primary-off-Plan]": [
@@ -1380,9 +1380,9 @@
     ],
     "test.test[join-opt_on_opt_side--Debug]": [
         {
-            "checksum": "a5adcd7a042d6921f701a6daadf4146a",
-            "size": 2681,
-            "uri": "https://{canondata_backend}/1937001/7bff8f98ab448f07ac3e80a4af0d2aed91a791f3/resource.tar.gz#test.test_join-opt_on_opt_side--Debug_/opt.yql_patched"
+            "checksum": "6ec6005ab7b1bc53864ffad0ff2eb29e",
+            "size": 2689,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-opt_on_opt_side--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-opt_on_opt_side--Plan]": [
@@ -1402,9 +1402,9 @@
     ],
     "test.test[join-premap_common_multiparents--Debug]": [
         {
-            "checksum": "6e2b3a2c8555ce91b3ffc83510e8ec8c",
-            "size": 4381,
-            "uri": "https://{canondata_backend}/1931696/0a5f01ad7bf7c863b92eab0e8aff7f87ecb60e51/resource.tar.gz#test.test_join-premap_common_multiparents--Debug_/opt.yql_patched"
+            "checksum": "3940fe50466f70338236a5b7900c081e",
+            "size": 4397,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-premap_common_multiparents--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_multiparents--Plan]": [
@@ -1424,9 +1424,9 @@
     ],
     "test.test[join-premap_common_multiparents_no_premap-off-Debug]": [
         {
-            "checksum": "3aceb00570e3390c95b2a46730574f34",
-            "size": 3323,
-            "uri": "https://{canondata_backend}/1931696/0a5f01ad7bf7c863b92eab0e8aff7f87ecb60e51/resource.tar.gz#test.test_join-premap_common_multiparents_no_premap-off-Debug_/opt.yql_patched"
+            "checksum": "a0dff4d9c8caf83b45dc9b1b92d463d5",
+            "size": 3353,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-premap_common_multiparents_no_premap-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_multiparents_no_premap-off-Plan]": [
@@ -1455,9 +1455,9 @@
     ],
     "test.test[join-premap_merge_with_remap--Debug]": [
         {
-            "checksum": "4c10aa8f92aa2aa7b0c5766aa0570b0d",
-            "size": 7118,
-            "uri": "https://{canondata_backend}/1942100/681b12141420eba184a0557376121d518d52c23b/resource.tar.gz#test.test_join-premap_merge_with_remap--Debug_/opt.yql_patched"
+            "checksum": "1e1e1a775d113ba8b397457748517169",
+            "size": 7126,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-premap_merge_with_remap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_with_remap--Plan]": [
@@ -1477,9 +1477,9 @@
     ],
     "test.test[join-pushdown_filter_over_inner_with_assume_strict--Debug]": [
         {
-            "checksum": "b74812e2531dc71347c2e708a1ab1429",
-            "size": 2712,
-            "uri": "https://{canondata_backend}/1775059/24b9dd14f7cb6caf2007568a5489e68c1bfd7731/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_assume_strict--Debug_/opt.yql_patched"
+            "checksum": "61f700f52c91dd99021a5bad485115e0",
+            "size": 2720,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_assume_strict--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_inner_with_assume_strict--Plan]": [
@@ -1499,9 +1499,9 @@
     ],
     "test.test[join-selfjoin_on_sorted_with_rename-off-Debug]": [
         {
-            "checksum": "c169b1162ace6da4b862aabcaea55112",
-            "size": 2139,
-            "uri": "https://{canondata_backend}/995452/e78675a82a4300d32887a13f4b9e86cb1608f590/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_rename-off-Debug_/opt.yql_patched"
+            "checksum": "3779212b31c16055f609811bb0e7dd9a",
+            "size": 2141,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_rename-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted_with_rename-off-Plan]": [
@@ -1787,9 +1787,9 @@
     ],
     "test.test[optimizers-yql-8223_direct_row_and_skipnullmembers--Debug]": [
         {
-            "checksum": "b5434ddea34075583ef4fc0c12ea071d",
-            "size": 3766,
-            "uri": "https://{canondata_backend}/1597364/bb2a478f5e9c5bfeb5e6ba7fde27b7879d5d2f67/resource.tar.gz#test.test_optimizers-yql-8223_direct_row_and_skipnullmembers--Debug_/opt.yql_patched"
+            "checksum": "56809100a1d910589320d3d68556bfc5",
+            "size": 3772,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_optimizers-yql-8223_direct_row_and_skipnullmembers--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-8223_direct_row_and_skipnullmembers--Plan]": [
@@ -2571,9 +2571,9 @@
     ],
     "test.test[tpch-q14-default.txt-Debug]": [
         {
-            "checksum": "d4d3fa3986e4d4f1aecee6946a20b3b9",
-            "size": 6075,
-            "uri": "https://{canondata_backend}/1923547/790a6b0249d542dbba70b1a6973edba84a764c61/resource.tar.gz#test.test_tpch-q14-default.txt-Debug_/opt.yql_patched"
+            "checksum": "f23b5025fb3694dedca1007f38ac097b",
+            "size": 6097,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_tpch-q14-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q14-default.txt-Plan]": [
@@ -2593,9 +2593,9 @@
     ],
     "test.test[tpch-q8-default.txt-Debug]": [
         {
-            "checksum": "c8dbb95490d2ee975b2298aeec0a89d1",
-            "size": 19059,
-            "uri": "https://{canondata_backend}/1937001/7bff8f98ab448f07ac3e80a4af0d2aed91a791f3/resource.tar.gz#test.test_tpch-q8-default.txt-Debug_/opt.yql_patched"
+            "checksum": "49ea4cdff7dfb5e4c591a323519d1c0a",
+            "size": 19209,
+            "uri": "https://{canondata_backend}/212715/a575a87b0ddb5b480fdcb6e3622436bf4a82b2a1/resource.tar.gz#test.test_tpch-q8-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q8-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 7ebe7498c8a..8fe072d5970 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
@@ -1341,9 +1341,9 @@
     ],
     "test.test[in-in_tablesource_to_equijoin--Debug]": [
         {
-            "checksum": "fec3f36eba5ddccad0ba50639f5f9e6a",
-            "size": 9266,
-            "uri": "https://{canondata_backend}/1937027/d3548eb0e12456df7d78d12789a5f6e6325fd027/resource.tar.gz#test.test_in-in_tablesource_to_equijoin--Debug_/opt.yql_patched"
+            "checksum": "908f7e2827f9e6984e9c683e0dce5580",
+            "size": 9364,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_in-in_tablesource_to_equijoin--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_tablesource_to_equijoin--Plan]": [
@@ -1467,9 +1467,9 @@
     ],
     "test.test[join-filter_joined--Debug]": [
         {
-            "checksum": "e0eb19487cd98efc78fac09e84c7dc15",
-            "size": 2418,
-            "uri": "https://{canondata_backend}/1917492/38396ffc75979034965f5365aa27fa1c534e80f8/resource.tar.gz#test.test_join-filter_joined--Debug_/opt.yql_patched"
+            "checksum": "ca19931eddca8f265acd15fff12c3e50",
+            "size": 2426,
+            "uri": "https://{canondata_backend}/1777230/ed7f1ae5da0c6cfe124a1de622facdf03b11ee8b/resource.tar.gz#test.test_join-filter_joined--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-filter_joined--Plan]": [
@@ -1489,9 +1489,9 @@
     ],
     "test.test[join-inner_with_select-off-Debug]": [
         {
-            "checksum": "6e4e81737b9684c7f6a4574a969dc1a4",
-            "size": 2740,
-            "uri": "https://{canondata_backend}/1937001/205481a8623c17e2bed6fe61c2cf8cadb9a35844/resource.tar.gz#test.test_join-inner_with_select-off-Debug_/opt.yql_patched"
+            "checksum": "e4f20112c164598434d5e0d7e854cd33",
+            "size": 2770,
+            "uri": "https://{canondata_backend}/1777230/ed7f1ae5da0c6cfe124a1de622facdf03b11ee8b/resource.tar.gz#test.test_join-inner_with_select-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_with_select-off-Plan]": [
@@ -1517,9 +1517,9 @@
     ],
     "test.test[join-lookupjoin_inner-off-Debug]": [
         {
-            "checksum": "aa6a9292d420ffb143509da49e7d9d71",
+            "checksum": "95f8d9fe2f3d0ecc3caca2000c917b76",
             "size": 2930,
-            "uri": "https://{canondata_backend}/1937150/c49758d527ec85011ab8f1e29da739cbd14731c8/resource.tar.gz#test.test_join-lookupjoin_inner-off-Debug_/opt.yql_patched"
+            "uri": "https://{canondata_backend}/1777230/ed7f1ae5da0c6cfe124a1de622facdf03b11ee8b/resource.tar.gz#test.test_join-lookupjoin_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner-off-Plan]": [
@@ -1545,9 +1545,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o2o-off-Debug]": [
         {
-            "checksum": "b31860bf223531fb41bae399a205f904",
-            "size": 3143,
-            "uri": "https://{canondata_backend}/1937150/c49758d527ec85011ab8f1e29da739cbd14731c8/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o-off-Debug_/opt.yql_patched"
+            "checksum": "4f7af39330d9d05b33ef0f3e1765a464",
+            "size": 3167,
+            "uri": "https://{canondata_backend}/1777230/ed7f1ae5da0c6cfe124a1de622facdf03b11ee8b/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_1o2o-off-Plan]": [
@@ -1573,9 +1573,9 @@
     ],
     "test.test[join-mapjoin_left_null_column--Debug]": [
         {
-            "checksum": "828bd1c6f40a3c60b2a81dbfcdfcd9bd",
-            "size": 2110,
-            "uri": "https://{canondata_backend}/1599023/c740047c261980b1e01d1f5aa2d5ef7442556a50/resource.tar.gz#test.test_join-mapjoin_left_null_column--Debug_/opt.yql_patched"
+            "checksum": "1945ec5c9539a2620a2801a8a1e3b2df",
+            "size": 2128,
+            "uri": "https://{canondata_backend}/1777230/ed7f1ae5da0c6cfe124a1de622facdf03b11ee8b/resource.tar.gz#test.test_join-mapjoin_left_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_left_null_column--Plan]": [
@@ -1595,9 +1595,9 @@
     ],
     "test.test[join-mapjoin_left_null_column-off-Debug]": [
         {
-            "checksum": "e123175a63c27ab46d4f5484b1d503d1",
-            "size": 2195,
-            "uri": "https://{canondata_backend}/1937150/c49758d527ec85011ab8f1e29da739cbd14731c8/resource.tar.gz#test.test_join-mapjoin_left_null_column-off-Debug_/opt.yql_patched"
+            "checksum": "6f5fb15c8777b96ebc9395ee9e586801",
+            "size": 2213,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-mapjoin_left_null_column-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_left_null_column-off-Plan]": [
@@ -1623,9 +1623,9 @@
     ],
     "test.test[join-mapjoin_on_very_complex_type-off-Debug]": [
         {
-            "checksum": "f5a0eb9d881d75c2191cb362d8380384",
-            "size": 3212,
-            "uri": "https://{canondata_backend}/1942100/0aeaf9869b0ddd879ea5b962964545b2e8d4ee29/resource.tar.gz#test.test_join-mapjoin_on_very_complex_type-off-Debug_/opt.yql_patched"
+            "checksum": "54d4e22f13d3145db90a5c90c91fce3d",
+            "size": 3226,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-mapjoin_on_very_complex_type-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_very_complex_type-off-Plan]": [
@@ -1651,9 +1651,9 @@
     ],
     "test.test[join-mergejoin_any_no_join_reduce--Debug]": [
         {
-            "checksum": "264b98b7d901f02933ea107fda09c223",
-            "size": 2047,
-            "uri": "https://{canondata_backend}/1871102/d650db84ec1efd067cde9e73e01d682909b94f83/resource.tar.gz#test.test_join-mergejoin_any_no_join_reduce--Debug_/opt.yql_patched"
+            "checksum": "e1f377901416829b21829c38a1fbaf10",
+            "size": 2055,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-mergejoin_any_no_join_reduce--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_any_no_join_reduce--Plan]": [
@@ -1673,9 +1673,9 @@
     ],
     "test.test[join-mergejoin_choose_primary--Debug]": [
         {
-            "checksum": "8e880da5c0fdd078c72b9dbb1c04943c",
-            "size": 3375,
-            "uri": "https://{canondata_backend}/1917492/38396ffc75979034965f5365aa27fa1c534e80f8/resource.tar.gz#test.test_join-mergejoin_choose_primary--Debug_/opt.yql_patched"
+            "checksum": "6a9099861f1aa14d1b5e9b24077da817",
+            "size": 3411,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-mergejoin_choose_primary--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_choose_primary--Plan]": [
@@ -1695,9 +1695,9 @@
     ],
     "test.test[join-mergejoin_semi_composite_to_inner--Debug]": [
         {
-            "checksum": "730c0ed16b306b2dc464a01d1ea904d6",
-            "size": 7556,
-            "uri": "https://{canondata_backend}/1917492/38396ffc75979034965f5365aa27fa1c534e80f8/resource.tar.gz#test.test_join-mergejoin_semi_composite_to_inner--Debug_/opt.yql_patched"
+            "checksum": "29b65ce1384f2f2e32e43592d56e49bb",
+            "size": 7592,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-mergejoin_semi_composite_to_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_semi_composite_to_inner--Plan]": [
@@ -1717,9 +1717,9 @@
     ],
     "test.test[join-mergejoin_semi_composite_to_inner-off-Debug]": [
         {
-            "checksum": "f3f3a26e3225e0dcfd83489c796c861a",
-            "size": 5697,
-            "uri": "https://{canondata_backend}/1937150/c49758d527ec85011ab8f1e29da739cbd14731c8/resource.tar.gz#test.test_join-mergejoin_semi_composite_to_inner-off-Debug_/opt.yql_patched"
+            "checksum": "115a17d7f5939fcdd63f2dbb365353ae",
+            "size": 5769,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-mergejoin_semi_composite_to_inner-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_semi_composite_to_inner-off-Plan]": [
@@ -1767,9 +1767,9 @@
     ],
     "test.test[join-premap_common_cross-off-Debug]": [
         {
-            "checksum": "57257d38926672a6497538ed2fbe628b",
-            "size": 2802,
-            "uri": "https://{canondata_backend}/1937150/c49758d527ec85011ab8f1e29da739cbd14731c8/resource.tar.gz#test.test_join-premap_common_cross-off-Debug_/opt.yql_patched"
+            "checksum": "3adb5b87765be956ea3069fe3ceeecaa",
+            "size": 2810,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-premap_common_cross-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_cross-off-Plan]": [
@@ -1795,9 +1795,9 @@
     ],
     "test.test[join-premap_common_inner--Debug]": [
         {
-            "checksum": "3431b03afc53b73e9a6a01f8daf550d7",
-            "size": 2864,
-            "uri": "https://{canondata_backend}/1917492/38396ffc75979034965f5365aa27fa1c534e80f8/resource.tar.gz#test.test_join-premap_common_inner--Debug_/opt.yql_patched"
+            "checksum": "6ef91266fc0927584bfcfa11297e4f0c",
+            "size": 2872,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-premap_common_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner--Plan]": [
@@ -1817,9 +1817,9 @@
     ],
     "test.test[join-premap_common_inner_filter--Debug]": [
         {
-            "checksum": "ad94dd090e9d92dbb49087434c4ee798",
-            "size": 2935,
-            "uri": "https://{canondata_backend}/1917492/38396ffc75979034965f5365aa27fa1c534e80f8/resource.tar.gz#test.test_join-premap_common_inner_filter--Debug_/opt.yql_patched"
+            "checksum": "e453a178f393a98367c3d65ad27fd4e3",
+            "size": 2943,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-premap_common_inner_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner_filter--Plan]": [
@@ -1839,9 +1839,9 @@
     ],
     "test.test[join-pullup_left_semi--Debug]": [
         {
-            "checksum": "9d606943e223db78082bfab7190972e0",
-            "size": 2619,
-            "uri": "https://{canondata_backend}/1937001/205481a8623c17e2bed6fe61c2cf8cadb9a35844/resource.tar.gz#test.test_join-pullup_left_semi--Debug_/opt.yql_patched"
+            "checksum": "eba9faaa5be18b8e6ef4e7bcfecf1e4c",
+            "size": 2627,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-pullup_left_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_left_semi--Plan]": [
@@ -1861,9 +1861,9 @@
     ],
     "test.test[join-pushdown_filter_over_left-off-Debug]": [
         {
-            "checksum": "ecd28e3ab018ef613e12f278a80bb930",
-            "size": 2457,
-            "uri": "https://{canondata_backend}/1942100/0aeaf9869b0ddd879ea5b962964545b2e8d4ee29/resource.tar.gz#test.test_join-pushdown_filter_over_left-off-Debug_/opt.yql_patched"
+            "checksum": "b82f19647a9b2a78ad84b5815d1b7465",
+            "size": 2485,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-pushdown_filter_over_left-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_left-off-Plan]": [
@@ -1889,9 +1889,9 @@
     ],
     "test.test[join-three_equalities-off-Debug]": [
         {
-            "checksum": "4b5bec079a2db2292ee1caf5033ec6b7",
-            "size": 3150,
-            "uri": "https://{canondata_backend}/1942100/0aeaf9869b0ddd879ea5b962964545b2e8d4ee29/resource.tar.gz#test.test_join-three_equalities-off-Debug_/opt.yql_patched"
+            "checksum": "317a2d6aa450e5df9ed4778194b9eba5",
+            "size": 3226,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-three_equalities-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-three_equalities-off-Plan]": [
@@ -1939,9 +1939,9 @@
     ],
     "test.test[join-yql_465-off-Debug]": [
         {
-            "checksum": "571b9e105ed24b2124af008e349f9ebc",
-            "size": 2168,
-            "uri": "https://{canondata_backend}/1937150/c49758d527ec85011ab8f1e29da739cbd14731c8/resource.tar.gz#test.test_join-yql_465-off-Debug_/opt.yql_patched"
+            "checksum": "62944146ef0d7feaf022b423dcc7f687",
+            "size": 2220,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_join-yql_465-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql_465-off-Plan]": [
@@ -2843,9 +2843,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Debug]": [
         {
-            "checksum": "f2ff8f9584f386bf31303cb5131b80c8",
-            "size": 2925,
-            "uri": "https://{canondata_backend}/1937027/d3548eb0e12456df7d78d12789a5f6e6325fd027/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Debug_/opt.yql_patched"
+            "checksum": "03fa121bfda83c092ee5ea60e5e69a9a",
+            "size": 2959,
+            "uri": "https://{canondata_backend}/1871182/6f64c40116f70a4d635a7fc8d77b59f1c2902999/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Plan]": [
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 44937a1f4a8..3303d09cc39 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
@@ -992,9 +992,9 @@
     ],
     "test.test[in-in_immediate_subquery-default.txt-Debug]": [
         {
-            "checksum": "d08c88a6a87cc82ec39f9133b314a344",
-            "size": 3464,
-            "uri": "https://{canondata_backend}/1936947/4e75efdf8bb6c4502b7bcfedc52bbdf182bdb39c/resource.tar.gz#test.test_in-in_immediate_subquery-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ad2543eb25d9eade95e6a523c2791e04",
+            "size": 3476,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_in-in_immediate_subquery-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_immediate_subquery-default.txt-Plan]": [
@@ -1085,9 +1085,9 @@
     ],
     "test.test[join-inner_grouped--Debug]": [
         {
-            "checksum": "30078ac7161d5652c90d1a1a5a71b9d1",
-            "size": 3459,
-            "uri": "https://{canondata_backend}/1917492/013c44333397f24e9d05ca78229d035d6a2cc02b/resource.tar.gz#test.test_join-inner_grouped--Debug_/opt.yql_patched"
+            "checksum": "52aa634693ad9be4d06eff8731c300ce",
+            "size": 3467,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-inner_grouped--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_grouped--Plan]": [
@@ -1107,9 +1107,9 @@
     ],
     "test.test[join-join_cbo_3_tables--Debug]": [
         {
-            "checksum": "4111eaa2f11f6425faaaabdf3069c8b1",
-            "size": 4622,
-            "uri": "https://{canondata_backend}/1871002/c040fe83a73e26552347f2cdc9c9be9e70a9f948/resource.tar.gz#test.test_join-join_cbo_3_tables--Debug_/opt.yql_patched"
+            "checksum": "b238426908adc70741316a341299b1aa",
+            "size": 4646,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-join_cbo_3_tables--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_cbo_3_tables--Plan]": [
@@ -1157,9 +1157,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_only_single-off-Debug]": [
         {
-            "checksum": "f787bd967f40042c3888c6146f549786",
-            "size": 2571,
-            "uri": "https://{canondata_backend}/1031349/5f7489d93f6bde373961f8e2806cc32a017775d5/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_only_single-off-Debug_/opt.yql_patched"
+            "checksum": "c752817c25cf7a5e6ecd0c115b9213b7",
+            "size": 2585,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_only_single-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_only_single-off-Plan]": [
@@ -1188,9 +1188,9 @@
     ],
     "test.test[join-mergejoin_force_align2-off-Debug]": [
         {
-            "checksum": "9089da7f1261d1ff02d05a438b07aa9d",
-            "size": 5166,
-            "uri": "https://{canondata_backend}/1937367/6f10cbbe8f7236353e26f98539fa9e27ba019196/resource.tar.gz#test.test_join-mergejoin_force_align2-off-Debug_/opt.yql_patched"
+            "checksum": "1273b8a62f4c04192d6ec99aa9229c87",
+            "size": 5214,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-mergejoin_force_align2-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_align2-off-Plan]": [
@@ -1216,9 +1216,9 @@
     ],
     "test.test[join-nopushdown_filter_with_depends_on-off-Debug]": [
         {
-            "checksum": "4e27ac753c6a183800edf0a77eb148c6",
-            "size": 2580,
-            "uri": "https://{canondata_backend}/1936273/1ba42e2c47cd3429011228159c1fdf43dd1881b7/resource.tar.gz#test.test_join-nopushdown_filter_with_depends_on-off-Debug_/opt.yql_patched"
+            "checksum": "ab69c0e470d3dea94966c4f821fdf2ef",
+            "size": 2602,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-nopushdown_filter_with_depends_on-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nopushdown_filter_with_depends_on-off-Plan]": [
@@ -1237,9 +1237,9 @@
     ],
     "test.test[join-premap_map_semi-off-Debug]": [
         {
-            "checksum": "6253188cdd1b0fdbbe00d601e7002dd9",
-            "size": 3178,
-            "uri": "https://{canondata_backend}/1936273/1ba42e2c47cd3429011228159c1fdf43dd1881b7/resource.tar.gz#test.test_join-premap_map_semi-off-Debug_/opt.yql_patched"
+            "checksum": "fc8b924f5a14e68d529538a39b67672b",
+            "size": 3205,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-premap_map_semi-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_semi-off-Plan]": [
@@ -1265,9 +1265,9 @@
     ],
     "test.test[join-premap_merge_extrasort2-off-Debug]": [
         {
-            "checksum": "0f053507529231fe5abb3f33d32c9824",
-            "size": 3846,
-            "uri": "https://{canondata_backend}/1936273/1ba42e2c47cd3429011228159c1fdf43dd1881b7/resource.tar.gz#test.test_join-premap_merge_extrasort2-off-Debug_/opt.yql_patched"
+            "checksum": "e98c8f45c93be4c1b1e00a273f39dd75",
+            "size": 3854,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-premap_merge_extrasort2-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_extrasort2-off-Plan]": [
@@ -1293,9 +1293,9 @@
     ],
     "test.test[join-pullup_context_dep-off-Debug]": [
         {
-            "checksum": "4fa087956881dd1b982e0689153d49f5",
-            "size": 2776,
-            "uri": "https://{canondata_backend}/1936273/1ba42e2c47cd3429011228159c1fdf43dd1881b7/resource.tar.gz#test.test_join-pullup_context_dep-off-Debug_/opt.yql_patched"
+            "checksum": "a7e306a586694dc7389fbc7eea90e821",
+            "size": 2806,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-pullup_context_dep-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_context_dep-off-Plan]": [
@@ -1321,9 +1321,9 @@
     ],
     "test.test[join-split_to_list_as_key--Debug]": [
         {
-            "checksum": "1f7b822492c2ba053dbb79eb16215325",
-            "size": 3564,
-            "uri": "https://{canondata_backend}/1917492/013c44333397f24e9d05ca78229d035d6a2cc02b/resource.tar.gz#test.test_join-split_to_list_as_key--Debug_/opt.yql_patched"
+            "checksum": "955b8d6249a0e7c7485214c2e48b7ab0",
+            "size": 3600,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-split_to_list_as_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-split_to_list_as_key--Plan]": [
@@ -1343,9 +1343,9 @@
     ],
     "test.test[join-star_join-off-Debug]": [
         {
-            "checksum": "fbf79b9d1ec8827bf68f6a2432c8a71c",
-            "size": 7396,
-            "uri": "https://{canondata_backend}/1781765/51d24e14e139f66d2e27548a413616e7d1e3f90d/resource.tar.gz#test.test_join-star_join-off-Debug_/opt.yql_patched"
+            "checksum": "99250c34b2b25ba921c27a6434b86893",
+            "size": 7474,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-star_join-off-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join-off-Plan]": [
@@ -1371,9 +1371,9 @@
     ],
     "test.test[join-yql-14847--Debug]": [
         {
-            "checksum": "7cdd2871fb5d16604a1fdfc4e4b4efb4",
-            "size": 3611,
-            "uri": "https://{canondata_backend}/1777230/cde2d2f2baccf10822529befb91eccc19cd66677/resource.tar.gz#test.test_join-yql-14847--Debug_/opt.yql_patched"
+            "checksum": "e52d47d4196899cff78c26c689cac831",
+            "size": 3647,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_join-yql-14847--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14847--Plan]": [
@@ -1531,9 +1531,9 @@
     ],
     "test.test[optimizers-test_no_aggregate_split--Debug]": [
         {
-            "checksum": "dd9986babcb4d0434e204058b092c30c",
-            "size": 4387,
-            "uri": "https://{canondata_backend}/1936947/4e75efdf8bb6c4502b7bcfedc52bbdf182bdb39c/resource.tar.gz#test.test_optimizers-test_no_aggregate_split--Debug_/opt.yql_patched"
+            "checksum": "784e398cb1cbd43f2a3d16afce6c8618",
+            "size": 4393,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_optimizers-test_no_aggregate_split--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-test_no_aggregate_split--Plan]": [
@@ -1846,9 +1846,9 @@
     ],
     "test.test[pg-select_starref2-default.txt-Debug]": [
         {
-            "checksum": "d00cd7d7f48bf79833060581f9849c9d",
-            "size": 3254,
-            "uri": "https://{canondata_backend}/1130705/527a85a17291a23e3b3ec92dc3f59c0a9020a092/resource.tar.gz#test.test_pg-select_starref2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ba2aa10c2bd43d82902c71ba3564b94b",
+            "size": 3262,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_pg-select_starref2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_starref2-default.txt-Plan]": [
@@ -2000,9 +2000,9 @@
     ],
     "test.test[pg-tpch-q08-default.txt-Debug]": [
         {
-            "checksum": "c5ae9f7f6321859b9e84f9ec4651b531",
-            "size": 20330,
-            "uri": "https://{canondata_backend}/212715/d4312004b5d9579cd7a3cccdeaf592cd03bb8043/resource.tar.gz#test.test_pg-tpch-q08-default.txt-Debug_/opt.yql_patched"
+            "checksum": "8575ca02544da94d374dfc8db0d3ccce",
+            "size": 20562,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_pg-tpch-q08-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q08-default.txt-Plan]": [
@@ -2093,9 +2093,9 @@
     ],
     "test.test[sampling-join_left_sample-default.txt-Debug]": [
         {
-            "checksum": "b9d778fdbb34ad426426e074a5ec787a",
-            "size": 2178,
-            "uri": "https://{canondata_backend}/1917492/013c44333397f24e9d05ca78229d035d6a2cc02b/resource.tar.gz#test.test_sampling-join_left_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "92256f844c063eb85a323b7762123677",
+            "size": 2186,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_sampling-join_left_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-join_left_sample-default.txt-Plan]": [
@@ -2114,9 +2114,9 @@
     ],
     "test.test[sampling-orderedjoin_right_sample-default.txt-Debug]": [
         {
-            "checksum": "1cb7dde5150be5b883ba613417009144",
-            "size": 2283,
-            "uri": "https://{canondata_backend}/1917492/013c44333397f24e9d05ca78229d035d6a2cc02b/resource.tar.gz#test.test_sampling-orderedjoin_right_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "7d15eb26e67cfb3f61ed9aad81647bf1",
+            "size": 2291,
+            "uri": "https://{canondata_backend}/1871182/e74dc45050363faa345feb7a557afc518d879b69/resource.tar.gz#test.test_sampling-orderedjoin_right_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-orderedjoin_right_sample-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json
index e0669526e3b..951af00e17c 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part0/canondata/result.json
@@ -295,9 +295,9 @@
     ],
     "test.test[aggregate-group_by_expr_with_join--Debug]": [
         {
-            "checksum": "80eec47ed25c7d7ed6ebdcf8b1c3cba2",
-            "size": 3142,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_aggregate-group_by_expr_with_join--Debug_/opt.yql_patched"
+            "checksum": "f06fed65dbfbc5f5aae1522d6f18e5c4",
+            "size": 3162,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_aggregate-group_by_expr_with_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_expr_with_join--Plan]": [
@@ -1163,9 +1163,9 @@
     ],
     "test.test[join-bush_in--Debug]": [
         {
-            "checksum": "df2fee4028b5a71e3e92c7d86d144b35",
-            "size": 5384,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-bush_in--Debug_/opt.yql_patched"
+            "checksum": "f8a83781fde2c31fb69691f6e6018fe1",
+            "size": 5428,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-bush_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-flatten_columns2--Debug]": [
         {
-            "checksum": "dd41dc6c0968ae4b08626e577a335b5b",
-            "size": 2854,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-flatten_columns2--Debug_/opt.yql_patched"
+            "checksum": "34d7609803d2ce1410307f3ab26f1d56",
+            "size": 2862,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-flatten_columns2--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-flatten_columns2--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-inner_trivial_from_concat--Debug]": [
         {
-            "checksum": "7f53f214b2034689047ca365f16c1134",
-            "size": 2611,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-inner_trivial_from_concat--Debug_/opt.yql_patched"
+            "checksum": "bc4aa6c98ff91d9c77037c152b09c124",
+            "size": 2619,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-inner_trivial_from_concat--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_trivial_from_concat--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-join_right_cbo--Debug]": [
         {
-            "checksum": "6f742b49b0938294c02579ffc7b49a93",
-            "size": 2586,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-join_right_cbo--Debug_/opt.yql_patched"
+            "checksum": "5d7ea7c0823083cd35010f92bc4a20d4",
+            "size": 2594,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-join_right_cbo--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_right_cbo--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-join_without_correlation_and_struct_access--Debug]": [
         {
-            "checksum": "222b8f644af10f593fd2ec75c799a561",
-            "size": 3506,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-join_without_correlation_and_struct_access--Debug_/opt.yql_patched"
+            "checksum": "2c6ecef06d8dad1427815481ae2f33c1",
+            "size": 3540,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-join_without_correlation_and_struct_access--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_and_struct_access--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o--Debug]": [
         {
-            "checksum": "7c9cfbac38f6495816cf5e2ecb6d2162",
-            "size": 3636,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-lookupjoin_inner_1o--Debug_/opt.yql_patched"
+            "checksum": "c8227686121a0f162189b7a414125c18",
+            "size": 3642,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-lookupjoin_inner_1o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_1o--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-lookupjoin_inner_2o--Debug]": [
         {
-            "checksum": "a0350a123bd64912ba0f2e43a504a5bd",
-            "size": 3630,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-lookupjoin_inner_2o--Debug_/opt.yql_patched"
+            "checksum": "8cb8ad6f58fca2ab0b585c5c633cd39a",
+            "size": 3636,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-lookupjoin_inner_2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_2o--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o--Debug]": [
         {
-            "checksum": "38e18c088080418737f839fcf64942bc",
-            "size": 3517,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-lookupjoin_semi_1o--Debug_/opt.yql_patched"
+            "checksum": "87970bdebfc274c62f756c90ade1f33f",
+            "size": 3539,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-lookupjoin_semi_1o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_1o--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-mapjoin_on_very_complex_type--Debug]": [
         {
-            "checksum": "41d380b2a1e8515efbbf7b3de8d0c70f",
-            "size": 3126,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-mapjoin_on_very_complex_type--Debug_/opt.yql_patched"
+            "checksum": "13559537b7e7e00f687ea0cf669d6fbe",
+            "size": 3140,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-mapjoin_on_very_complex_type--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_very_complex_type--Plan]": [
@@ -1331,9 +1331,9 @@
     ],
     "test.test[join-mergejoin_any_no_join_reduce--Debug]": [
         {
-            "checksum": "1ddb4487a8d901fcb095d0f0ba71c511",
-            "size": 2046,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-mergejoin_any_no_join_reduce--Debug_/opt.yql_patched"
+            "checksum": "065be510b85c8c89036c038891cdc74a",
+            "size": 2054,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-mergejoin_any_no_join_reduce--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_any_no_join_reduce--Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names--Debug]": [
         {
-            "checksum": "58377942efa7d202be0590a778e953d8",
-            "size": 5598,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-mergejoin_with_different_key_names--Debug_/opt.yql_patched"
+            "checksum": "1843f084bea7193143f446ded9320571",
+            "size": 5622,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-mergejoin_with_different_key_names--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names--Plan]": [
@@ -1359,9 +1359,9 @@
     ],
     "test.test[join-opt_on_opt_side--Debug]": [
         {
-            "checksum": "ffae7b6c476f60816c2ad15381ec960d",
-            "size": 2680,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-opt_on_opt_side--Debug_/opt.yql_patched"
+            "checksum": "e9b92e68a2b1ebc018686930ab0dd9b4",
+            "size": 2688,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-opt_on_opt_side--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-opt_on_opt_side--Plan]": [
@@ -1373,9 +1373,9 @@
     ],
     "test.test[join-premap_common_inner--Debug]": [
         {
-            "checksum": "2a3e4894588782b8554f7e7cee034123",
-            "size": 2863,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-premap_common_inner--Debug_/opt.yql_patched"
+            "checksum": "8aad6144d4506590243d2ef14920eb2b",
+            "size": 2871,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-premap_common_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner--Plan]": [
@@ -1387,9 +1387,9 @@
     ],
     "test.test[join-premap_merge_extrasort2--Debug]": [
         {
-            "checksum": "3407698daa9cd62798fa55f7054e36ec",
-            "size": 4498,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-premap_merge_extrasort2--Debug_/opt.yql_patched"
+            "checksum": "cdcdbd25ccb2dd9e26135884d24e888c",
+            "size": 4506,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-premap_merge_extrasort2--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_extrasort2--Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-pullup_random--Debug]": [
         {
-            "checksum": "2329163e088b4a2de46ceb1d4b7339c5",
-            "size": 3018,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-pullup_random--Debug_/opt.yql_patched"
+            "checksum": "5df4eb789f411c408ef874e49ca143a8",
+            "size": 3026,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-pullup_random--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_random--Plan]": [
@@ -1415,9 +1415,9 @@
     ],
     "test.test[join-pushdown_filter_over_left--Debug]": [
         {
-            "checksum": "98bfc17232cd6670518331cf4b47936d",
-            "size": 2660,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-pushdown_filter_over_left--Debug_/opt.yql_patched"
+            "checksum": "91eec90daf804f2568784a34cec24005",
+            "size": 2668,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-pushdown_filter_over_left--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_left--Plan]": [
@@ -1429,9 +1429,9 @@
     ],
     "test.test[join-star_join--Debug]": [
         {
-            "checksum": "fee3be4892870cf7a73c9f42c11d10ee",
-            "size": 9408,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-star_join--Debug_/opt.yql_patched"
+            "checksum": "86fffed5a8c2ce08321f60c4d04c0f08",
+            "size": 9456,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-star_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join--Plan]": [
@@ -1457,9 +1457,9 @@
     ],
     "test.test[join-yql-4275--Debug]": [
         {
-            "checksum": "5d398fc798dc28e84423d26f4bf482e7",
-            "size": 2733,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_join-yql-4275--Debug_/opt.yql_patched"
+            "checksum": "1d74ec84a2ce395070d155db8c4618b3",
+            "size": 2739,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_join-yql-4275--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-4275--Plan]": [
@@ -1611,9 +1611,9 @@
     ],
     "test.test[optimizers-yql-5978_fill_multi_usage--Debug]": [
         {
-            "checksum": "bedca95bdedd949a56572c946e60f758",
-            "size": 4696,
-            "uri": "https://{canondata_backend}/937458/86cd9556e848ee086e123481cd12ceae5d55267c/resource.tar.gz#test.test_optimizers-yql-5978_fill_multi_usage--Debug_/opt.yql_patched"
+            "checksum": "74d30f72102683002eab98f15de1a7fa",
+            "size": 4704,
+            "uri": "https://{canondata_backend}/1936842/2549828342e494c863ab9746607ebce291e8ac4a/resource.tar.gz#test.test_optimizers-yql-5978_fill_multi_usage--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-5978_fill_multi_usage--Plan]": [
@@ -1779,9 +1779,9 @@
     ],
     "test.test[pg-select_alias_partial-default.txt-Debug]": [
         {
-            "checksum": "25cc2a9812df3ff065149a71debb246d",
-            "size": 2771,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_pg-select_alias_partial-default.txt-Debug_/opt.yql_patched"
+            "checksum": "023f09fe163fb1ff62f9e6db4c17ae7e",
+            "size": 2779,
+            "uri": "https://{canondata_backend}/1773845/1fb22e6f6730979afa380ca25a720b1c01051f45/resource.tar.gz#test.test_pg-select_alias_partial-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_alias_partial-default.txt-Plan]": [
@@ -1849,9 +1849,9 @@
     ],
     "test.test[pg-select_subquery2-default.txt-Debug]": [
         {
-            "checksum": "32acc821b735e5a7c1ba21f55e6868b7",
-            "size": 3199,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_pg-select_subquery2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c5396bb2e81b65c4542de6b65bc6df76",
+            "size": 3207,
+            "uri": "https://{canondata_backend}/1937027/c54918690b9e8a33b5d4252d7ad55a10f0cc12f3/resource.tar.gz#test.test_pg-select_subquery2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_subquery2-default.txt-Plan]": [
@@ -2479,9 +2479,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Debug]": [
         {
-            "checksum": "e174a8c409f083934e3743c40d6cc533",
-            "size": 3109,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Debug_/opt.yql_patched"
+            "checksum": "bc631af0998283e8d7e4cfc520c534fb",
+            "size": 3143,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_all_key_without-default.txt-Plan]": [
@@ -2493,9 +2493,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key-default.txt-Debug]": [
         {
-            "checksum": "bae85f57de0f0cf7494793177b2460ed",
-            "size": 2779,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1a21287569da6427f984d8ca53afa648",
+            "size": 2785,
+            "uri": "https://{canondata_backend}/1936947/bd531627c6a06d964bc3d96f52a1c7b00e4b5ab4/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key-default.txt-Plan]": [
@@ -2591,9 +2591,9 @@
     ],
     "test.test[tpch-q4-default.txt-Debug]": [
         {
-            "checksum": "fa9567b878d063f74cb6ea65d1db01ec",
-            "size": 6511,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_tpch-q4-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3b1dbba11fb824724ad7d206d697c6f5",
+            "size": 6532,
+            "uri": "https://{canondata_backend}/1777230/12c4ca4c9d772567f31b5f71971fbd6b3ef21f40/resource.tar.gz#test.test_tpch-q4-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q4-default.txt-Plan]": [
@@ -2605,9 +2605,9 @@
     ],
     "test.test[tpch-q7-default.txt-Debug]": [
         {
-            "checksum": "705e3362c501edbc47881303cba1dd66",
-            "size": 13688,
-            "uri": "https://{canondata_backend}/1936947/581aa6d896ffe57e25bdb8006459e912860e61fa/resource.tar.gz#test.test_tpch-q7-default.txt-Debug_/opt.yql_patched"
+            "checksum": "28cb18b870141265b7d797191fac22f4",
+            "size": 13797,
+            "uri": "https://{canondata_backend}/1777230/12c4ca4c9d772567f31b5f71971fbd6b3ef21f40/resource.tar.gz#test.test_tpch-q7-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q7-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part1/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part1/canondata/result.json
index 9e3423b0e48..2fe9eda8b10 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part1/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part1/canondata/result.json
@@ -309,9 +309,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_star-default.txt-Debug]": [
         {
-            "checksum": "38f359a5915bd4826c8a928d8910f430",
-            "size": 4184,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_aggregate-group_by_ru_join_star-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ce8cabf3346c32a245d33549961b8bfd",
+            "size": 4190,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_aggregate-group_by_ru_join_star-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_star-default.txt-Plan]": [
@@ -995,9 +995,9 @@
     ],
     "test.test[in-in_compact_distinct--Debug]": [
         {
-            "checksum": "f1adc67452eae8c858b94c1c3f1d8eeb",
-            "size": 3177,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_in-in_compact_distinct--Debug_/opt.yql_patched"
+            "checksum": "a3ced4351d90b96badb8517000167e4e",
+            "size": 3185,
+            "uri": "https://{canondata_backend}/1880306/1f6b0567cc6794ca9c219756983f27dbb8b921b9/resource.tar.gz#test.test_in-in_compact_distinct--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_compact_distinct--Plan]": [
@@ -1009,9 +1009,9 @@
     ],
     "test.test[in-in_compact_distinct-empty-Debug]": [
         {
-            "checksum": "cddbcc56b9a60a008f99c281b98e30a0",
-            "size": 3178,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_in-in_compact_distinct-empty-Debug_/opt.yql_patched"
+            "checksum": "7f8959ef3da6322b195f858a4b14f014",
+            "size": 3186,
+            "uri": "https://{canondata_backend}/1880306/1f6b0567cc6794ca9c219756983f27dbb8b921b9/resource.tar.gz#test.test_in-in_compact_distinct-empty-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_compact_distinct-empty-Plan]": [
@@ -1037,9 +1037,9 @@
     ],
     "test.test[in-in_noansi_join--Debug]": [
         {
-            "checksum": "4aa75eec33834ed285546dc84996dae7",
-            "size": 11200,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_in-in_noansi_join--Debug_/opt.yql_patched"
+            "checksum": "cfdd569bd49cbd7d842ef193f43aad63",
+            "size": 11256,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_in-in_noansi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_noansi_join--Plan]": [
@@ -1051,9 +1051,9 @@
     ],
     "test.test[in-in_scalar_vector_subquery-default.txt-Debug]": [
         {
-            "checksum": "4d7776c163d6c551f0445d9df14318ac",
-            "size": 8390,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_in-in_scalar_vector_subquery-default.txt-Debug_/opt.yql_patched"
+            "checksum": "92dce94af9d54a919f57e22551e3a008",
+            "size": 8422,
+            "uri": "https://{canondata_backend}/1880306/1f6b0567cc6794ca9c219756983f27dbb8b921b9/resource.tar.gz#test.test_in-in_scalar_vector_subquery-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_scalar_vector_subquery-default.txt-Plan]": [
@@ -1163,9 +1163,9 @@
     ],
     "test.test[join-full_equal_null--Debug]": [
         {
-            "checksum": "0e5ef2fe73d24008febe79b970d6689a",
-            "size": 3021,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-full_equal_null--Debug_/opt.yql_patched"
+            "checksum": "dfa0043ed7ce82081986fa357a6cc715",
+            "size": 3055,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-full_equal_null--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_equal_null--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-inner_all--Debug]": [
         {
-            "checksum": "c3b0e3dac7a582443a32ad7856a60ae6",
-            "size": 2343,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-inner_all--Debug_/opt.yql_patched"
+            "checksum": "41868c039cd51686461474dd5e865cdd",
+            "size": 2351,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-inner_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_all--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-join_and_distinct_key--Debug]": [
         {
-            "checksum": "5cddc18dbbe6c49f17fd307bf4c1550d",
-            "size": 4827,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-join_and_distinct_key--Debug_/opt.yql_patched"
+            "checksum": "79a00d308bae0e104e9539dcc23588c9",
+            "size": 4862,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-join_and_distinct_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_and_distinct_key--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-join_semi_correlation_in_order_by--Debug]": [
         {
-            "checksum": "c9e7b668423a4785443cd95286065e66",
-            "size": 2609,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-join_semi_correlation_in_order_by--Debug_/opt.yql_patched"
+            "checksum": "6dafeaebb94fcfd19f2354bf23aa012d",
+            "size": 2643,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-join_semi_correlation_in_order_by--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_semi_correlation_in_order_by--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-left_all--Debug]": [
         {
-            "checksum": "2142b3b585caab78c16d9e633097ac09",
-            "size": 2342,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-left_all--Debug_/opt.yql_patched"
+            "checksum": "e76b68137e7303877dc8922c9d197e22",
+            "size": 2350,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-left_all--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_all--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_nested--Debug]": [
         {
-            "checksum": "dbc09622c3bd934eca7f198acb715e62",
-            "size": 4642,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nested--Debug_/opt.yql_patched"
+            "checksum": "c0ab1bc22bb7fb8bb325a6b4c862863d",
+            "size": 4658,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nested--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_nested--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_nonsorted--Debug]": [
         {
-            "checksum": "84eca44003610921f7b7694d1a525bd2",
-            "size": 3650,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nonsorted--Debug_/opt.yql_patched"
+            "checksum": "3e1d2ead951ccbff40bcc5c34b3e95c3",
+            "size": 3670,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_nonsorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_nonsorted--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-nopushdown_filter_over_inner--Debug]": [
         {
-            "checksum": "b257c4e36ebcc27244534f5f6454659f",
-            "size": 2663,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-nopushdown_filter_over_inner--Debug_/opt.yql_patched"
+            "checksum": "010e00c2f4df048d65a50739224caad6",
+            "size": 2671,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-nopushdown_filter_over_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nopushdown_filter_over_inner--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-star_join_inners_premap--Debug]": [
         {
-            "checksum": "a0318e58d2165cbf06241c680f5716ef",
-            "size": 6695,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-star_join_inners_premap--Debug_/opt.yql_patched"
+            "checksum": "910d6b2851fb237d5342072daa17d51f",
+            "size": 6707,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-star_join_inners_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners_premap--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-star_join_mirror--Debug]": [
         {
-            "checksum": "4f6a3aac75a356b983d0ccccc20ef5b1",
-            "size": 9350,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-star_join_mirror--Debug_/opt.yql_patched"
+            "checksum": "bbfe2888f2d66f2af0da2a62b6fa07e5",
+            "size": 9392,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-star_join_mirror--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_mirror--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-star_join_semionly_premap--Debug]": [
         {
-            "checksum": "2c0b33655aa1f4032b47c3121afc6559",
-            "size": 4978,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_join-star_join_semionly_premap--Debug_/opt.yql_patched"
+            "checksum": "44fe818a98ec3af0faa6a2314f0f2539",
+            "size": 5006,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_join-star_join_semionly_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_semionly_premap--Plan]": [
@@ -1933,9 +1933,9 @@
     ],
     "test.test[pg-tpch-q11-default.txt-Debug]": [
         {
-            "checksum": "004d4825493112d0473e353d207306c2",
-            "size": 9823,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_pg-tpch-q11-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c145c9b77cceec07f82ebfa06854cba9",
+            "size": 9902,
+            "uri": "https://{canondata_backend}/1777230/9f6922e788c4bd355c8d5f511e085079ebfb6fdb/resource.tar.gz#test.test_pg-tpch-q11-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q11-default.txt-Plan]": [
@@ -1947,9 +1947,9 @@
     ],
     "test.test[pg-tpch-q16-default.txt-Debug]": [
         {
-            "checksum": "277690665926b7339374d5367e407dd6",
-            "size": 11446,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_pg-tpch-q16-default.txt-Debug_/opt.yql_patched"
+            "checksum": "7cacc1d54dca1349b0ae2079897a07c2",
+            "size": 11523,
+            "uri": "https://{canondata_backend}/1777230/9f6922e788c4bd355c8d5f511e085079ebfb6fdb/resource.tar.gz#test.test_pg-tpch-q16-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q16-default.txt-Plan]": [
@@ -2115,9 +2115,9 @@
     ],
     "test.test[sampling-join_right_sample-default.txt-Debug]": [
         {
-            "checksum": "cdaa39f903ff55b938484c8cd6f8411f",
-            "size": 2177,
-            "uri": "https://{canondata_backend}/1936273/85968a675c17dd0728c8d7ba5fd43bd0b237dc65/resource.tar.gz#test.test_sampling-join_right_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3731394f44a23dce3d924be04799ca49",
+            "size": 2185,
+            "uri": "https://{canondata_backend}/1923547/1b4a972137d59518a45bc2d9c94a570ac530b789/resource.tar.gz#test.test_sampling-join_right_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-join_right_sample-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json
index 8367bd3c3dc..e1ca9e6ee57 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part10/canondata/result.json
@@ -337,9 +337,9 @@
     ],
     "test.test[aggregate-group_by_expr_semi_join--Debug]": [
         {
-            "checksum": "5867bfc2f96c0861369ddf95a1ffb826",
-            "size": 3980,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_aggregate-group_by_expr_semi_join--Debug_/opt.yql_patched"
+            "checksum": "5f5f70de4327f4a3da82158e67f92cf3",
+            "size": 3983,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_aggregate-group_by_expr_semi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_expr_semi_join--Plan]": [
@@ -1079,9 +1079,9 @@
     ],
     "test.test[hor_join-row_num_per_sect--Debug]": [
         {
-            "checksum": "f7ab6d77adf2c2b081b76f213843f77e",
-            "size": 4802,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_hor_join-row_num_per_sect--Debug_/opt.yql_patched"
+            "checksum": "637c43ddaa6cfdd5255736edc4c1a150",
+            "size": 4810,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_hor_join-row_num_per_sect--Debug_/opt.yql_patched"
         }
     ],
     "test.test[hor_join-row_num_per_sect--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-bush_dis_in_in_in--Debug]": [
         {
-            "checksum": "3c72e3f6f7d9fb6744a0ecd596ab6523",
-            "size": 8055,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-bush_dis_in_in_in--Debug_/opt.yql_patched"
+            "checksum": "18fab9e505a2802b29694a4e7853e211",
+            "size": 8104,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-bush_dis_in_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in_in_in--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-bush_in_in--Debug]": [
         {
-            "checksum": "df862b8514222bb506503bb08ba9d704",
-            "size": 5437,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-bush_in_in--Debug_/opt.yql_patched"
+            "checksum": "cd7bf4223ff8e349dc386843968a9a49",
+            "size": 5476,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-bush_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in_in--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-convert_key--Debug]": [
         {
-            "checksum": "d89e4710b0bfd82a7efd81de3fa83b53",
-            "size": 2942,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-convert_key--Debug_/opt.yql_patched"
+            "checksum": "c901e427fe3178eb7f6f35de4b26b1ee",
+            "size": 2962,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-convert_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-convert_key--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-join_with_duplicate_keys_on_sorted--Debug]": [
         {
-            "checksum": "2cabd3dcf4edcb71e45a277bef4ea7df",
-            "size": 3372,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-join_with_duplicate_keys_on_sorted--Debug_/opt.yql_patched"
+            "checksum": "0a227e14ec691e26ec9d2732f1ee5818",
+            "size": 3394,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-join_with_duplicate_keys_on_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_with_duplicate_keys_on_sorted--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-left_cast_to_string--Debug]": [
         {
-            "checksum": "103aeacb3f14493640e31fb1e7f58551",
-            "size": 2769,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-left_cast_to_string--Debug_/opt.yql_patched"
+            "checksum": "135d932176056828d96e611f0d5b45a1",
+            "size": 2777,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-left_cast_to_string--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_cast_to_string--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-left_only_with_other--Debug]": [
         {
-            "checksum": "7cdfcd0ecd93ec7e3efc03a63e48bdf7",
-            "size": 3597,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-left_only_with_other--Debug_/opt.yql_patched"
+            "checksum": "237f2047c943760bd7f33af5206dd4bb",
+            "size": 3609,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-left_only_with_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_only_with_other--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-lookupjoin_not_selected--Debug]": [
         {
-            "checksum": "cb64ce9da4a3313f7a64978b698c713b",
-            "size": 3142,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-lookupjoin_not_selected--Debug_/opt.yql_patched"
+            "checksum": "16e4ac663d730fe101e09516e5364245",
+            "size": 3178,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-lookupjoin_not_selected--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_not_selected--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-mergejoin_choose_primary--Debug]": [
         {
-            "checksum": "165aee391d62abf5f191756c30ef4576",
-            "size": 3374,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-mergejoin_choose_primary--Debug_/opt.yql_patched"
+            "checksum": "c3dae65a68dade87a7ca5bdc421c8667",
+            "size": 3410,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-mergejoin_choose_primary--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_choose_primary--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-nopushdown_filter_with_depends_on--Debug]": [
         {
-            "checksum": "f61cc57a143e7e6f709ee69e25624b9b",
-            "size": 2711,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-nopushdown_filter_with_depends_on--Debug_/opt.yql_patched"
+            "checksum": "67e3bed7df4d4e74acbd2481d96b57e7",
+            "size": 2719,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-nopushdown_filter_with_depends_on--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nopushdown_filter_with_depends_on--Plan]": [
@@ -1331,9 +1331,9 @@
     ],
     "test.test[join-premap_common_semi--Debug]": [
         {
-            "checksum": "00f4273b80b41abed3dabb687194b183",
-            "size": 2623,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-premap_common_semi--Debug_/opt.yql_patched"
+            "checksum": "28d8b2ce3c06135965fe67de541b69f4",
+            "size": 2631,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-premap_common_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_semi--Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-premap_no_premap--Debug]": [
         {
-            "checksum": "c5b17a3bf3caa5353b29cea3e0b06305",
-            "size": 5454,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-premap_no_premap--Debug_/opt.yql_patched"
+            "checksum": "580442987d5793ad2a1f43ca43962cec",
+            "size": 5478,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-premap_no_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_no_premap--Plan]": [
@@ -1359,9 +1359,9 @@
     ],
     "test.test[join-star_join_multi--Debug]": [
         {
-            "checksum": "49827bc701955127a98fe509f6cd5921",
-            "size": 13747,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-star_join_multi--Debug_/opt.yql_patched"
+            "checksum": "fcd3bda70d1461608c3b310e04db34b0",
+            "size": 13837,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-star_join_multi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_multi--Plan]": [
@@ -1373,9 +1373,9 @@
     ],
     "test.test[join-two_aggrs-default.txt-Debug]": [
         {
-            "checksum": "1fb74c7973010c98bb9f1753be50767d",
-            "size": 3982,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-two_aggrs-default.txt-Debug_/opt.yql_patched"
+            "checksum": "45ba6dedc35449232d1ebd9b682a64e8",
+            "size": 3988,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-two_aggrs-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-two_aggrs-default.txt-Plan]": [
@@ -1387,9 +1387,9 @@
     ],
     "test.test[join-yql-12022--Debug]": [
         {
-            "checksum": "57c352d3a2bd0a1361db2da3019368df",
-            "size": 1901,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-yql-12022--Debug_/opt.yql_patched"
+            "checksum": "6a413e08494c09d2f65636d28e16658f",
+            "size": 1907,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-yql-12022--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-12022--Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-yql-14847--Debug]": [
         {
-            "checksum": "2b60454e3ce1b205f95329b4a646fce8",
-            "size": 3610,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_join-yql-14847--Debug_/opt.yql_patched"
+            "checksum": "61127a1bebb404a31131cc3f3b49d8d4",
+            "size": 3646,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_join-yql-14847--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-14847--Plan]": [
@@ -1849,9 +1849,9 @@
     ],
     "test.test[pg-select_columnref2-default.txt-Debug]": [
         {
-            "checksum": "ec5152b0fa17c59e257ffcca4a94a7dc",
-            "size": 3141,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_pg-select_columnref2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3b0482585e6e4334757745ae75940562",
+            "size": 3149,
+            "uri": "https://{canondata_backend}/1814674/0be04b440d1e726126b37dd41a041540ffafcef4/resource.tar.gz#test.test_pg-select_columnref2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_columnref2-default.txt-Plan]": [
@@ -2171,9 +2171,9 @@
     ],
     "test.test[pg-tpch-q04-default.txt-Debug]": [
         {
-            "checksum": "6f9eeb752c65162148deba911f0cf909",
-            "size": 9177,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_pg-tpch-q04-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9f08154361ba0ca5511a95e41d50de8d",
+            "size": 9225,
+            "uri": "https://{canondata_backend}/1871182/fddb4fe2e6c27b416dbd37718b7a51164ac78eca/resource.tar.gz#test.test_pg-tpch-q04-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q04-default.txt-Plan]": [
@@ -2185,9 +2185,9 @@
     ],
     "test.test[pg-tpch-q15-default.txt-Debug]": [
         {
-            "checksum": "766b018b8b51dd77c46fe51cb732be45",
-            "size": 9029,
-            "uri": "https://{canondata_backend}/1777230/3c117824725bda13a89aad6b07b22541746fa215/resource.tar.gz#test.test_pg-tpch-q15-default.txt-Debug_/opt.yql_patched"
+            "checksum": "87958d48d310ed5d4694c4959e57bc84",
+            "size": 9068,
+            "uri": "https://{canondata_backend}/1871182/fddb4fe2e6c27b416dbd37718b7a51164ac78eca/resource.tar.gz#test.test_pg-tpch-q15-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q15-default.txt-Plan]": [
@@ -2199,9 +2199,9 @@
     ],
     "test.test[pg-tpch-q17-default.txt-Debug]": [
         {
-            "checksum": "c0ef2ae0acf02926a114a7b1e1556687",
-            "size": 12727,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_pg-tpch-q17-default.txt-Debug_/opt.yql_patched"
+            "checksum": "eaf5efa8c5ed5430495d5677b8dbb02d",
+            "size": 12767,
+            "uri": "https://{canondata_backend}/1871182/fddb4fe2e6c27b416dbd37718b7a51164ac78eca/resource.tar.gz#test.test_pg-tpch-q17-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q17-default.txt-Plan]": [
@@ -2213,9 +2213,9 @@
     ],
     "test.test[pg-tpch-q22-default.txt-Debug]": [
         {
-            "checksum": "46290fd7a91dc73780b239bb8eba26b9",
-            "size": 12633,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_pg-tpch-q22-default.txt-Debug_/opt.yql_patched"
+            "checksum": "77ebf5a107cd0900144974cdec42edd3",
+            "size": 12665,
+            "uri": "https://{canondata_backend}/1871182/fddb4fe2e6c27b416dbd37718b7a51164ac78eca/resource.tar.gz#test.test_pg-tpch-q22-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q22-default.txt-Plan]": [
@@ -2297,9 +2297,9 @@
     ],
     "test.test[sampling-join_left_sample-default.txt-Debug]": [
         {
-            "checksum": "aa51d7329d9526cdb6cefa29198514e6",
-            "size": 2177,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_sampling-join_left_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "4ece3ffe18eb72d03a153c4bb3747120",
+            "size": 2185,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_sampling-join_left_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-join_left_sample-default.txt-Plan]": [
@@ -2451,9 +2451,9 @@
     ],
     "test.test[select-discard-default.txt-Debug]": [
         {
-            "checksum": "c5028ff5c0a83a69dfe34ac6cf76ee48",
-            "size": 7984,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_select-discard-default.txt-Debug_/opt.yql_patched"
+            "checksum": "f4b6ff0737ea2d944407d1f8536b6bdd",
+            "size": 7996,
+            "uri": "https://{canondata_backend}/1775319/95a9345c5f50bbf034e28fbb7e3144004f9dcb53/resource.tar.gz#test.test_select-discard-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[select-discard-default.txt-Plan]": [
@@ -2577,9 +2577,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_all-default.txt-Debug]": [
         {
-            "checksum": "2edf48cc7f956207c91525c1389347b7",
-            "size": 3152,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_simple_columns-simple_columns_join_all-default.txt-Debug_/opt.yql_patched"
+            "checksum": "6e7d02557bd9fad85832fc4a66667719",
+            "size": 3186,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_simple_columns-simple_columns_join_all-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_all-default.txt-Plan]": [
@@ -2591,9 +2591,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Debug]": [
         {
-            "checksum": "190fae3651283fb919865981b9f93fca",
-            "size": 2924,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Debug_/opt.yql_patched"
+            "checksum": "2047c838ca07dec29be57b450068e4cf",
+            "size": 2958,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_without-default.txt-Plan]": [
@@ -2605,9 +2605,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Debug]": [
         {
-            "checksum": "d517e52a5a526c525fd92e9306045cc5",
-            "size": 3203,
-            "uri": "https://{canondata_backend}/1775319/3515b86fb929979a6751f93bd43a0291eaa01262/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Debug_/opt.yql_patched"
+            "checksum": "87984906e5ee2f322e9f86d52e11ac66",
+            "size": 3237,
+            "uri": "https://{canondata_backend}/1031349/3fb25bad7a135d8493b2fd4782bc9ca920c7e4e4/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json
index b5f260c9897..2088d874357 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json
@@ -225,9 +225,9 @@
     ],
     "test.test[aggregate-group_by_column_alias_reuse_for_join--Debug]": [
         {
-            "checksum": "313627fe0190ad8df004b26eef9f8525",
-            "size": 3440,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_aggregate-group_by_column_alias_reuse_for_join--Debug_/opt.yql_patched"
+            "checksum": "815a4ce93cecdb0fb3ef856735831870",
+            "size": 3476,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_aggregate-group_by_column_alias_reuse_for_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_column_alias_reuse_for_join--Plan]": [
@@ -323,9 +323,9 @@
     ],
     "test.test[aggregate-group_by_ru_join--Debug]": [
         {
-            "checksum": "126c8a6831df698300193bfd271d3779",
-            "size": 4135,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_aggregate-group_by_ru_join--Debug_/opt.yql_patched"
+            "checksum": "4f8a4ce13eecdcf5951746c0d09ff0b9",
+            "size": 4141,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_aggregate-group_by_ru_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join--Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-equi_join_by_expr--Debug]": [
         {
-            "checksum": "c6f1ab402f4d8d9949a3bb1fe18ee577",
-            "size": 3365,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-equi_join_by_expr--Debug_/opt.yql_patched"
+            "checksum": "b90f5b4cba807803058837ce5f914de9",
+            "size": 3401,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-equi_join_by_expr--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_by_expr--Plan]": [
@@ -1163,9 +1163,9 @@
     ],
     "test.test[join-filter_joined--Debug]": [
         {
-            "checksum": "604f0321204b9e8315f445e4b9768fc1",
-            "size": 2417,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-filter_joined--Debug_/opt.yql_patched"
+            "checksum": "acf055544aaa39db7f4d6df364f4077f",
+            "size": 2425,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-filter_joined--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-filter_joined--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-from_in_front_join--Debug]": [
         {
-            "checksum": "531e6664d72e24f9e210329defaf58b3",
-            "size": 2438,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-from_in_front_join--Debug_/opt.yql_patched"
+            "checksum": "7f236d5cb1ed15ef27711dcb25cb7246",
+            "size": 2446,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-from_in_front_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-from_in_front_join--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-group_compact_by--Debug]": [
         {
-            "checksum": "34be39137502291748fd96014fbc85a9",
-            "size": 2857,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-group_compact_by--Debug_/opt.yql_patched"
+            "checksum": "e88f398df216b640cc4520132d02a2a2",
+            "size": 2863,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-group_compact_by--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-group_compact_by--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-inner_with_order--Debug]": [
         {
-            "checksum": "2f1dd81ca088dd0415150378284f497f",
-            "size": 2786,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-inner_with_order--Debug_/opt.yql_patched"
+            "checksum": "32828548edbafbcefe702ee8734866a0",
+            "size": 2794,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-inner_with_order--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_with_order--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-join_without_correlation_names--Debug]": [
         {
-            "checksum": "3d2655b54fa6d389d76746620039a642",
-            "size": 2816,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-join_without_correlation_names--Debug_/opt.yql_patched"
+            "checksum": "e753c2f8d297ff5f0e51672b2264c992",
+            "size": 2850,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-join_without_correlation_names--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_names--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-left_join_null_column--Debug]": [
         {
-            "checksum": "b5e0db3db415a0a1ab822283af0bfeaa",
-            "size": 2009,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-left_join_null_column--Debug_/opt.yql_patched"
+            "checksum": "093c938e5061166ad903435a1a6aefd3",
+            "size": 2027,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-left_join_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_join_null_column--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-lookupjoin_semi--Debug]": [
         {
-            "checksum": "3dd0f1c6fce7f965db662d9a839f41e7",
-            "size": 3120,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-lookupjoin_semi--Debug_/opt.yql_patched"
+            "checksum": "ed63c358c0c1a50ea94366a8b786d1f2",
+            "size": 3142,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-lookupjoin_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-premap_common_cross--Debug]": [
         {
-            "checksum": "5f167206720d3370fa08a85bcc81a2b0",
-            "size": 2715,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-premap_common_cross--Debug_/opt.yql_patched"
+            "checksum": "c2a066dbd8cc1a70e80d8bfd138f48da",
+            "size": 2723,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-premap_common_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_cross--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-premap_common_inner_filter--Debug]": [
         {
-            "checksum": "0b0d2c118c865bdc89b5e2274aae18e7",
-            "size": 2934,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-premap_common_inner_filter--Debug_/opt.yql_patched"
+            "checksum": "2c90257c3510c4268ae86461848a3dcc",
+            "size": 2942,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-premap_common_inner_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner_filter--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-premap_common_multiparents--Debug]": [
         {
-            "checksum": "5cddbd5e20127596b6c4aed4e004f42e",
-            "size": 4380,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-premap_common_multiparents--Debug_/opt.yql_patched"
+            "checksum": "006d6d54cb4269278458c34ddf95d83e",
+            "size": 4396,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-premap_common_multiparents--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_multiparents--Plan]": [
@@ -1331,9 +1331,9 @@
     ],
     "test.test[join-premap_nonseq_flatmap--Debug]": [
         {
-            "checksum": "259249fb768dcc23f7efd318c61ed071",
-            "size": 1786,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-premap_nonseq_flatmap--Debug_/opt.yql_patched"
+            "checksum": "d7a887d6f7854e14ba37f8452316cfc0",
+            "size": 1794,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-premap_nonseq_flatmap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_nonseq_flatmap--Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-pullup_context_dep--Debug]": [
         {
-            "checksum": "628e2dc060d4774cfca3c580c424dfc8",
-            "size": 2977,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-pullup_context_dep--Debug_/opt.yql_patched"
+            "checksum": "e13ab8080922ff797900d639539bada3",
+            "size": 2985,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-pullup_context_dep--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_context_dep--Plan]": [
@@ -1359,9 +1359,9 @@
     ],
     "test.test[join-pullup_left_semi--Debug]": [
         {
-            "checksum": "f583981f70bb031908ee479817c5172d",
-            "size": 2618,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-pullup_left_semi--Debug_/opt.yql_patched"
+            "checksum": "4a2ec338676333e5272a2e1ed6ad2cf0",
+            "size": 2626,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-pullup_left_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_left_semi--Plan]": [
@@ -1373,9 +1373,9 @@
     ],
     "test.test[join-pullup_null_column--Debug]": [
         {
-            "checksum": "dbeee311bf506da3921f5e09da03edf5",
-            "size": 2970,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-pullup_null_column--Debug_/opt.yql_patched"
+            "checksum": "37fb67a3c13129e7901701e48837e090",
+            "size": 2978,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-pullup_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_null_column--Plan]": [
@@ -1387,9 +1387,9 @@
     ],
     "test.test[join-split_to_list_as_key--Debug]": [
         {
-            "checksum": "6f1e2beafa6ee5f540351f839bdee19c",
-            "size": 3563,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-split_to_list_as_key--Debug_/opt.yql_patched"
+            "checksum": "deb07017140eb5b3146c48a85924c8cc",
+            "size": 3599,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-split_to_list_as_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-split_to_list_as_key--Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-star_join_inners--Debug]": [
         {
-            "checksum": "5d66d0e3803cb94215963afd2769cd81",
-            "size": 6327,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_join-star_join_inners--Debug_/opt.yql_patched"
+            "checksum": "f8570f158b3f9a736ba0964d62c387a0",
+            "size": 6339,
+            "uri": "https://{canondata_backend}/937458/4cd269fd165cc800e711eee6a99bc7dcdcd1ec69/resource.tar.gz#test.test_join-star_join_inners--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners--Plan]": [
@@ -1471,9 +1471,9 @@
     ],
     "test.test[key_filter-lambda_with_null_filter--Debug]": [
         {
-            "checksum": "c04701b2b3bd644cb7d2e7449c1177e4",
-            "size": 3111,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_key_filter-lambda_with_null_filter--Debug_/opt.yql_patched"
+            "checksum": "9270014e6e5f803bda69e9ecfd09018f",
+            "size": 3114,
+            "uri": "https://{canondata_backend}/1924537/d10ec5def921b84aa2b73c405144017d3ba5a220/resource.tar.gz#test.test_key_filter-lambda_with_null_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[key_filter-lambda_with_null_filter--Plan]": [
@@ -2017,9 +2017,9 @@
     ],
     "test.test[pg-tpch-q09-default.txt-Debug]": [
         {
-            "checksum": "670bdfe7c8bc01f4e2417b1188416019",
-            "size": 15461,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_pg-tpch-q09-default.txt-Debug_/opt.yql_patched"
+            "checksum": "057f21fe6d259ad9cc3f6f4c95a2297e",
+            "size": 15678,
+            "uri": "https://{canondata_backend}/937458/7768ee3da976b0cc5bbc4f9f7e0803bb5d6c905e/resource.tar.gz#test.test_pg-tpch-q09-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q09-default.txt-Plan]": [
@@ -2031,9 +2031,9 @@
     ],
     "test.test[pg-tpch-q12-default.txt-Debug]": [
         {
-            "checksum": "2aa4b6daa06727c13e135f269cdcd97b",
-            "size": 8301,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_pg-tpch-q12-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3b9a355a8e691bdcf9321431e2666fa3",
+            "size": 8342,
+            "uri": "https://{canondata_backend}/937458/7768ee3da976b0cc5bbc4f9f7e0803bb5d6c905e/resource.tar.gz#test.test_pg-tpch-q12-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q12-default.txt-Plan]": [
@@ -2045,9 +2045,9 @@
     ],
     "test.test[pg-tpch-q14-default.txt-Debug]": [
         {
-            "checksum": "023334a073b48677e786bddfbb22a8f1",
-            "size": 8292,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_pg-tpch-q14-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9b903bdf2aa62ce03d02263a63297235",
+            "size": 8334,
+            "uri": "https://{canondata_backend}/937458/7768ee3da976b0cc5bbc4f9f7e0803bb5d6c905e/resource.tar.gz#test.test_pg-tpch-q14-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q14-default.txt-Plan]": [
@@ -2059,9 +2059,9 @@
     ],
     "test.test[pg-tpch-q18-default.txt-Debug]": [
         {
-            "checksum": "83b6147b75f81c88e41a1a10bfc6ad1a",
-            "size": 13147,
-            "uri": "https://{canondata_backend}/1903885/2084963a606d92a86d0b46a109618174dca0d324/resource.tar.gz#test.test_pg-tpch-q18-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3165980aed50ffb9bcf90e1df280d436",
+            "size": 13264,
+            "uri": "https://{canondata_backend}/937458/7768ee3da976b0cc5bbc4f9f7e0803bb5d6c905e/resource.tar.gz#test.test_pg-tpch-q18-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q18-default.txt-Plan]": [
@@ -2563,9 +2563,9 @@
     ],
     "test.test[tpch-q16-default.txt-Debug]": [
         {
-            "checksum": "18e5aa7fdaae2375d3fbf434ead01dcd",
-            "size": 9476,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_tpch-q16-default.txt-Debug_/opt.yql_patched"
+            "checksum": "e309a7817aef6480b23fbbecc1227dd9",
+            "size": 9523,
+            "uri": "https://{canondata_backend}/937458/7768ee3da976b0cc5bbc4f9f7e0803bb5d6c905e/resource.tar.gz#test.test_tpch-q16-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q16-default.txt-Plan]": [
@@ -2577,9 +2577,9 @@
     ],
     "test.test[tpch-q19-default.txt-Debug]": [
         {
-            "checksum": "1cb1620a035679ccefa6609ee5f36132",
-            "size": 7169,
-            "uri": "https://{canondata_backend}/1936842/51593b2a750dbb036388d012a30fa937edaab5f0/resource.tar.gz#test.test_tpch-q19-default.txt-Debug_/opt.yql_patched"
+            "checksum": "be7eadaed4eefab4283b217094ff4fa6",
+            "size": 7192,
+            "uri": "https://{canondata_backend}/937458/7768ee3da976b0cc5bbc4f9f7e0803bb5d6c905e/resource.tar.gz#test.test_tpch-q19-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q19-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part3/canondata/result.json
index 9d483ca18f6..8d0dda9b6bc 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part3/canondata/result.json
@@ -491,9 +491,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_agg--Debug]": [
         {
-            "checksum": "ad9f6486820ef839bb15337480e8edd1",
-            "size": 6362,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_aggregate-group_by_ru_join_agg--Debug_/opt.yql_patched"
+            "checksum": "b0614137530554c33c3ed158de877315",
+            "size": 6368,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_aggregate-group_by_ru_join_agg--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_agg--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[in-in_immediate_subquery-default.txt-Debug]": [
         {
-            "checksum": "d6fef687ec492ec2a3b717928f385e07",
-            "size": 3463,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_in-in_immediate_subquery-default.txt-Debug_/opt.yql_patched"
+            "checksum": "7f3ba78c35838d3f93cac1780ebcadf4",
+            "size": 3475,
+            "uri": "https://{canondata_backend}/1871182/855d98f5b1db78c91df8e3b3af515aa83bfc5ecf/resource.tar.gz#test.test_in-in_immediate_subquery-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_immediate_subquery-default.txt-Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[in-in_sorted_by_tuple--Debug]": [
         {
-            "checksum": "44215295f296c11528ba8811d7ea324b",
-            "size": 6152,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_in-in_sorted_by_tuple--Debug_/opt.yql_patched"
+            "checksum": "dde8245a364ca14ddee4a46b772ec9b0",
+            "size": 6160,
+            "uri": "https://{canondata_backend}/1871182/855d98f5b1db78c91df8e3b3af515aa83bfc5ecf/resource.tar.gz#test.test_in-in_sorted_by_tuple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_sorted_by_tuple--Plan]": [
@@ -1359,9 +1359,9 @@
     ],
     "test.test[join-inner_all_right--Debug]": [
         {
-            "checksum": "d503b7f4011ba8751a3518c3df8496ee",
-            "size": 2378,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-inner_all_right--Debug_/opt.yql_patched"
+            "checksum": "b545a70239a6c8eb7336928d7f6b1744",
+            "size": 2386,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-inner_all_right--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_all_right--Plan]": [
@@ -1373,9 +1373,9 @@
     ],
     "test.test[join-inner_with_select--Debug]": [
         {
-            "checksum": "e1cc0768e5e202402943ff76fb56ff06",
-            "size": 2828,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-inner_with_select--Debug_/opt.yql_patched"
+            "checksum": "95036dfc88ec180343c7d9008bb968c3",
+            "size": 2836,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-inner_with_select--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_with_select--Plan]": [
@@ -1387,9 +1387,9 @@
     ],
     "test.test[join-join_cbo_3_tables--Debug]": [
         {
-            "checksum": "b7fe7584f1c97292f8fa8dca21622d9d",
-            "size": 4621,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-join_cbo_3_tables--Debug_/opt.yql_patched"
+            "checksum": "f27ef887b296dec25b2b76ee051b75f1",
+            "size": 4645,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-join_cbo_3_tables--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_cbo_3_tables--Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-join_comp_common_table--Debug]": [
         {
-            "checksum": "06335d3988fe2e06bd0b9ceea5f1a076",
-            "size": 9465,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-join_comp_common_table--Debug_/opt.yql_patched"
+            "checksum": "fd4c325c579f99247a927542e9ed8717",
+            "size": 9519,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-join_comp_common_table--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_comp_common_table--Plan]": [
@@ -1415,9 +1415,9 @@
     ],
     "test.test[join-left_only_semi_and_other--Debug]": [
         {
-            "checksum": "48cbe9ffedc2ee2d2a7dc7e4c4126765",
-            "size": 4706,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-left_only_semi_and_other--Debug_/opt.yql_patched"
+            "checksum": "607c09e793c32ecf96e8f307de5df49c",
+            "size": 4730,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-left_only_semi_and_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_only_semi_and_other--Plan]": [
@@ -1429,9 +1429,9 @@
     ],
     "test.test[join-lookupjoin_bug8533--Debug]": [
         {
-            "checksum": "6c5dd94773091d1e8e622e92313f2aee",
-            "size": 3152,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-lookupjoin_bug8533--Debug_/opt.yql_patched"
+            "checksum": "d541b695993306e5240d34637ba64b11",
+            "size": 3188,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-lookupjoin_bug8533--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_bug8533--Plan]": [
@@ -1443,9 +1443,9 @@
     ],
     "test.test[join-lookupjoin_semi_2o--Debug]": [
         {
-            "checksum": "11e28c23c224efa6d319545c16c782fc",
-            "size": 3474,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-lookupjoin_semi_2o--Debug_/opt.yql_patched"
+            "checksum": "11a2aad53edd62d5b7db5e5fd44b11db",
+            "size": 3494,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-lookupjoin_semi_2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_2o--Plan]": [
@@ -1457,9 +1457,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_star--Debug]": [
         {
-            "checksum": "ab1326f9ce5ff1e3ab18eb6296184b6f",
-            "size": 2979,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star--Debug_/opt.yql_patched"
+            "checksum": "b3b623016b78d5b9a276cc8ab088d239",
+            "size": 3000,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-mapjoin_early_rewrite_star--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_star--Plan]": [
@@ -1471,9 +1471,9 @@
     ],
     "test.test[join-premap_common_inner_both_sides--Debug]": [
         {
-            "checksum": "8d3534064d021fdeb5662a8dd9561cd3",
-            "size": 3156,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-premap_common_inner_both_sides--Debug_/opt.yql_patched"
+            "checksum": "ff6f3c96023d8172a71ca642b025d600",
+            "size": 3164,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-premap_common_inner_both_sides--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_inner_both_sides--Plan]": [
@@ -1485,9 +1485,9 @@
     ],
     "test.test[join-premap_common_multiparents_no_premap--Debug]": [
         {
-            "checksum": "bce34933296f79d975d4184b8752f6cc",
-            "size": 3480,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-premap_common_multiparents_no_premap--Debug_/opt.yql_patched"
+            "checksum": "3072890fc009d38120c1c0c226387516",
+            "size": 3488,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-premap_common_multiparents_no_premap--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_multiparents_no_premap--Plan]": [
@@ -1499,9 +1499,9 @@
     ],
     "test.test[join-premap_common_right_tablecontent--Debug]": [
         {
-            "checksum": "e2da04c001a42f4dbefabf25ced7aec1",
-            "size": 4061,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-premap_common_right_tablecontent--Debug_/opt.yql_patched"
+            "checksum": "04ca5cf7300837c20a113061ddb002a6",
+            "size": 4069,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-premap_common_right_tablecontent--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_right_tablecontent--Plan]": [
@@ -1513,9 +1513,9 @@
     ],
     "test.test[join-premap_merge_inner--Debug]": [
         {
-            "checksum": "aa5b303b8844433189d2fb712f462594",
-            "size": 3444,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-premap_merge_inner--Debug_/opt.yql_patched"
+            "checksum": "15ae09d4214f48c9a55eb17cf8f1aa7f",
+            "size": 3480,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-premap_merge_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_inner--Plan]": [
@@ -1527,9 +1527,9 @@
     ],
     "test.test[join-right_trivial--Debug]": [
         {
-            "checksum": "79b70dbe200a46d72b4d8a8d9d798ab3",
-            "size": 2954,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_join-right_trivial--Debug_/opt.yql_patched"
+            "checksum": "f8e4d4aa4cf131c2fe8319ca377a5c1c",
+            "size": 2962,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_join-right_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-right_trivial--Plan]": [
@@ -1765,9 +1765,9 @@
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input--Debug]": [
         {
-            "checksum": "bf9719efcd43fa461fc6da98089b82ea",
-            "size": 3298,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input--Debug_/opt.yql_patched"
+            "checksum": "26811ca0aec6b002a40163def049ce10",
+            "size": 3306,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input--Plan]": [
@@ -1779,9 +1779,9 @@
     ],
     "test.test[optimizers-yql-6038_direct_row--Debug]": [
         {
-            "checksum": "2a07db3869fe555a6fde3684fdf72012",
-            "size": 4752,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_optimizers-yql-6038_direct_row--Debug_/opt.yql_patched"
+            "checksum": "94e934683de5ba519025df239f25b149",
+            "size": 4760,
+            "uri": "https://{canondata_backend}/1937367/49abf200ba7948f5fa69adeceda30eefcf4cc997/resource.tar.gz#test.test_optimizers-yql-6038_direct_row--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-6038_direct_row--Plan]": [
@@ -2339,9 +2339,9 @@
     ],
     "test.test[pg-tpch-q07-default.txt-Debug]": [
         {
-            "checksum": "06d9c9f1de73585e2c868a62a67505e8",
-            "size": 15078,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_pg-tpch-q07-default.txt-Debug_/opt.yql_patched"
+            "checksum": "195fa3469c3a522539f3fa1e44167397",
+            "size": 15235,
+            "uri": "https://{canondata_backend}/212715/a0d25403eb7f2b5722144b2c77456e0064c0b9cf/resource.tar.gz#test.test_pg-tpch-q07-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q07-default.txt-Plan]": [
@@ -2353,9 +2353,9 @@
     ],
     "test.test[pg-tpch-q10-default.txt-Debug]": [
         {
-            "checksum": "3549c95e999f0f25923186d6489b5819",
-            "size": 14270,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_pg-tpch-q10-default.txt-Debug_/opt.yql_patched"
+            "checksum": "dc57c0e4af50dd3b46107b4d5a600d14",
+            "size": 14392,
+            "uri": "https://{canondata_backend}/212715/a0d25403eb7f2b5722144b2c77456e0064c0b9cf/resource.tar.gz#test.test_pg-tpch-q10-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q10-default.txt-Plan]": [
@@ -2689,9 +2689,9 @@
     ],
     "test.test[tpch-q13-default.txt-Debug]": [
         {
-            "checksum": "5c1c221a6db36fd77acc856f56cc553d",
-            "size": 7089,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_tpch-q13-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ff050e22d2d1d7c706c0473ed0d38d77",
+            "size": 7111,
+            "uri": "https://{canondata_backend}/212715/a0d25403eb7f2b5722144b2c77456e0064c0b9cf/resource.tar.gz#test.test_tpch-q13-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q13-default.txt-Plan]": [
@@ -2703,9 +2703,9 @@
     ],
     "test.test[tpch-q20-default.txt-Debug]": [
         {
-            "checksum": "9faa55f008b664f48c1dbaf1f616d325",
-            "size": 11602,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_tpch-q20-default.txt-Debug_/opt.yql_patched"
+            "checksum": "122ba5c807370742ca29d270aa980294",
+            "size": 11662,
+            "uri": "https://{canondata_backend}/212715/a0d25403eb7f2b5722144b2c77456e0064c0b9cf/resource.tar.gz#test.test_tpch-q20-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q20-default.txt-Plan]": [
@@ -2717,9 +2717,9 @@
     ],
     "test.test[tpch-q21-default.txt-Debug]": [
         {
-            "checksum": "2437581bddeb0e2412b384e69b30f5c6",
-            "size": 11657,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_tpch-q21-default.txt-Debug_/opt.yql_patched"
+            "checksum": "4a801072eed702dbb03d643a9dd7e0e5",
+            "size": 11744,
+            "uri": "https://{canondata_backend}/212715/a0d25403eb7f2b5722144b2c77456e0064c0b9cf/resource.tar.gz#test.test_tpch-q21-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q21-default.txt-Plan]": [
@@ -2745,9 +2745,9 @@
     ],
     "test.test[type_v3-mergejoin_with_sort--Debug]": [
         {
-            "checksum": "45e6e2012e9f21068f5330afdbad7883",
-            "size": 3068,
-            "uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_type_v3-mergejoin_with_sort--Debug_/opt.yql_patched"
+            "checksum": "a24670b09a381da8ccf23be8459a5897",
+            "size": 3076,
+            "uri": "https://{canondata_backend}/1936947/8dffaeb14bc4ecf02dc7cda8c7f4fd6f93da78d6/resource.tar.gz#test.test_type_v3-mergejoin_with_sort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[type_v3-mergejoin_with_sort--Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json
index 95cfff8edc3..2bffe5f6b82 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part4/canondata/result.json
@@ -1009,9 +1009,9 @@
     ],
     "test.test[in-in_sorted--Debug]": [
         {
-            "checksum": "90a76348b0b186b496b9eef5daff9f59",
-            "size": 2664,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_in-in_sorted--Debug_/opt.yql_patched"
+            "checksum": "18b3e5ebcc6fac45ef3878585e2470d0",
+            "size": 2672,
+            "uri": "https://{canondata_backend}/1936842/9b640fe3db426a96de1ae9b2c4cf087e3b818e02/resource.tar.gz#test.test_in-in_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_sorted--Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-anyjoin_merge_nodup--Debug]": [
         {
-            "checksum": "f40c305e263d1ff5ac0b0fde72904de9",
-            "size": 5278,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-anyjoin_merge_nodup--Debug_/opt.yql_patched"
+            "checksum": "87a218dc70704c218be2e167e6e2dbed",
+            "size": 5310,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-anyjoin_merge_nodup--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_merge_nodup--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-equi_join_two_mult_keys--Debug]": [
         {
-            "checksum": "afa4265f8d294934d5db97ff9d779617",
-            "size": 2334,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-equi_join_two_mult_keys--Debug_/opt.yql_patched"
+            "checksum": "9f0c2351cba399499ac921fca337bbe1",
+            "size": 2342,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-equi_join_two_mult_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_two_mult_keys--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-left_semi_with_other--Debug]": [
         {
-            "checksum": "8774cd688b85a4d280d12aef2216f4bd",
-            "size": 4060,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-left_semi_with_other--Debug_/opt.yql_patched"
+            "checksum": "7a8d668f57e2a29a6a32318c6433927e",
+            "size": 4076,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-left_semi_with_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_semi_with_other--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-lookupjoin_inner--Debug]": [
         {
-            "checksum": "86f58f25a4f4144136d514274a7274cd",
-            "size": 3132,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-lookupjoin_inner--Debug_/opt.yql_patched"
+            "checksum": "c9afa19fa741e114843026c9e0f2db69",
+            "size": 3140,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-lookupjoin_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-mapjoin_dup_key--Debug]": [
         {
-            "checksum": "528deefc00667805e71b3d129a070ed4",
-            "size": 2443,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-mapjoin_dup_key--Debug_/opt.yql_patched"
+            "checksum": "9f0ce5818208a57efcdf87eabc6b4dad",
+            "size": 2479,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-mapjoin_dup_key--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_dup_key--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-mapjoin_with_empty_struct--Debug]": [
         {
-            "checksum": "0a269895bbb2c8ab00e67b28184e8c9f",
-            "size": 1911,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-mapjoin_with_empty_struct--Debug_/opt.yql_patched"
+            "checksum": "9ea00daa3bc6ba44bf8d264bac98181b",
+            "size": 1919,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-mapjoin_with_empty_struct--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_with_empty_struct--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-mergejoin_force_no_sorted--Debug]": [
         {
-            "checksum": "9f731104af88a8561956c1d4952464cd",
-            "size": 2525,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-mergejoin_force_no_sorted--Debug_/opt.yql_patched"
+            "checksum": "b6a707fb967b438f7f12ab6c89ad6a20",
+            "size": 2533,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-mergejoin_force_no_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_no_sorted--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-mergejoin_narrows_output_sort--Debug]": [
         {
-            "checksum": "fb3d6eae4ac0189e52ef31280c0e9038",
-            "size": 5694,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-mergejoin_narrows_output_sort--Debug_/opt.yql_patched"
+            "checksum": "12409685107980cd10e8dc734543cc95",
+            "size": 5736,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-mergejoin_narrows_output_sort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_narrows_output_sort--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-nested_semi_join--Debug]": [
         {
-            "checksum": "8116adf036af387eda23e9211f97b542",
-            "size": 2469,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-nested_semi_join--Debug_/opt.yql_patched"
+            "checksum": "d6754fa311213ac8509ea475a5e40034",
+            "size": 2495,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-nested_semi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-nested_semi_join--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-premap_context_dep--Debug]": [
         {
-            "checksum": "314dc55be063fd5fe9117b1986371005",
-            "size": 3061,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-premap_context_dep--Debug_/opt.yql_patched"
+            "checksum": "c3491c395914c25e91bff563cb607f72",
+            "size": 3069,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-premap_context_dep--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_context_dep--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-pullup_cross--Debug]": [
         {
-            "checksum": "237b20675e171c28af353d51afc3c8a7",
-            "size": 2692,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-pullup_cross--Debug_/opt.yql_patched"
+            "checksum": "7166229517b312505fe8d7fafb9ccadd",
+            "size": 2700,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-pullup_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_cross--Plan]": [
@@ -1331,9 +1331,9 @@
     ],
     "test.test[join-pullup_left--Debug]": [
         {
-            "checksum": "f62e510ab6c0aff02e5ff228ceee4370",
-            "size": 3124,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-pullup_left--Debug_/opt.yql_patched"
+            "checksum": "ca9fa514d5a707066991fed8ee2743ff",
+            "size": 3132,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-pullup_left--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_left--Plan]": [
@@ -1345,23 +1345,23 @@
     ],
     "test.test[join-pullup_renaming--Debug]": [
         {
-            "checksum": "0e89855f73dd3eaa4fe36023ff3f349e",
-            "size": 3237,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-pullup_renaming--Debug_/opt.yql_patched"
+            "checksum": "ddca0061ad106fc39c0469d7db851aba",
+            "size": 3251,
+            "uri": "https://{canondata_backend}/1937027/60773cd07fcd1ac5e35e51b851bbbd92b84fb8f1/resource.tar.gz#test.test_join-pullup_renaming--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_renaming--Plan]": [
         {
             "checksum": "21b1cefd30e1410fbfbfcdbe51647898",
             "size": 7016,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-pullup_renaming--Plan_/plan.txt"
+            "uri": "https://{canondata_backend}/1937027/60773cd07fcd1ac5e35e51b851bbbd92b84fb8f1/resource.tar.gz#test.test_join-pullup_renaming--Plan_/plan.txt"
         }
     ],
     "test.test[join-pushdown_filter_over_inner_with_strict_udf--Debug]": [
         {
-            "checksum": "1494747542d22aab411c027d51973517",
-            "size": 2990,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_strict_udf--Debug_/opt.yql_patched"
+            "checksum": "accbc2a8d9392993ca9565c8a18d8f36",
+            "size": 2998,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_strict_udf--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_inner_with_strict_udf--Plan]": [
@@ -1373,9 +1373,9 @@
     ],
     "test.test[join-selfjoin_on_sorted--Debug]": [
         {
-            "checksum": "5d98c0b408c5d0255186c5c352c54d83",
-            "size": 2074,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-selfjoin_on_sorted--Debug_/opt.yql_patched"
+            "checksum": "3f3432797172cbc8ec502bae3d183b8b",
+            "size": 2080,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-selfjoin_on_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted--Plan]": [
@@ -1387,9 +1387,9 @@
     ],
     "test.test[join-selfjoin_on_sorted_with_filter--Debug]": [
         {
-            "checksum": "7c259fd8ac2e0e74cf3b48c824c2d083",
-            "size": 2250,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_filter--Debug_/opt.yql_patched"
+            "checksum": "13d1cca3659bd652cf2410211f219c91",
+            "size": 2256,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_filter--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted_with_filter--Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-simple_columns_partial--Debug]": [
         {
-            "checksum": "adda16e5b41be44f89ed9094c3cde247",
-            "size": 4326,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-simple_columns_partial--Debug_/opt.yql_patched"
+            "checksum": "18c54cf98cc7db45f4fa83171249c3be",
+            "size": 4358,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-simple_columns_partial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-simple_columns_partial--Plan]": [
@@ -1415,9 +1415,9 @@
     ],
     "test.test[join-star_join_semionly--Debug]": [
         {
-            "checksum": "974a8e6935fd2dac7c1083dcb8a8f2be",
-            "size": 4648,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_join-star_join_semionly--Debug_/opt.yql_patched"
+            "checksum": "2ec77d70a76239c56196191c6a50aeeb",
+            "size": 4676,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_join-star_join_semionly--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_semionly--Plan]": [
@@ -1625,9 +1625,9 @@
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input_other--Debug]": [
         {
-            "checksum": "bee730d62a0c38e7980d4355fc51c549",
-            "size": 4009,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input_other--Debug_/opt.yql_patched"
+            "checksum": "30c786f970470b948332582ee1026279",
+            "size": 4017,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_optimizers-yql-2582_limit_for_join_input_other--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-2582_limit_for_join_input_other--Plan]": [
@@ -2017,9 +2017,9 @@
     ],
     "test.test[pg-select_subquery2_qstar-default.txt-Debug]": [
         {
-            "checksum": "bf67a317fca4418f82ff1b5dfdc9e198",
-            "size": 3199,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_pg-select_subquery2_qstar-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1079da2012165546f7c3d03d431e2059",
+            "size": 3207,
+            "uri": "https://{canondata_backend}/1814674/e1dac4beb20d8fb1166d1176cc34cf347793dc0c/resource.tar.gz#test.test_pg-select_subquery2_qstar-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_subquery2_qstar-default.txt-Plan]": [
@@ -2227,9 +2227,9 @@
     ],
     "test.test[pg-tpch-q02-default.txt-Debug]": [
         {
-            "checksum": "63196416ff89e91f3787a38fc70adc78",
-            "size": 20280,
-            "uri": "https://{canondata_backend}/1600758/20bb0998dc12a8e0bd202fe7a254431e3192f87d/resource.tar.gz#test.test_pg-tpch-q02-default.txt-Debug_/opt.yql_patched"
+            "checksum": "b612a5343aaa8c9d7cb92da1d36d6784",
+            "size": 20447,
+            "uri": "https://{canondata_backend}/1936947/b01bfb001a8a49b0c22eb5525a77866740554066/resource.tar.gz#test.test_pg-tpch-q02-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q02-default.txt-Plan]": [
@@ -2241,9 +2241,9 @@
     ],
     "test.test[pg-tpch-q13-default.txt-Debug]": [
         {
-            "checksum": "d03aa1a098975ef256b7d2a63d9438cc",
-            "size": 8861,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_pg-tpch-q13-default.txt-Debug_/opt.yql_patched"
+            "checksum": "04a06dfbc8169ec3e0fdbf184fd8b388",
+            "size": 8886,
+            "uri": "https://{canondata_backend}/1936947/b01bfb001a8a49b0c22eb5525a77866740554066/resource.tar.gz#test.test_pg-tpch-q13-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q13-default.txt-Plan]": [
@@ -2633,9 +2633,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Debug]": [
         {
-            "checksum": "1df5e319652b5d9322b945bfdeda2a5e",
-            "size": 2353,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Debug_/opt.yql_patched"
+            "checksum": "83cf4d8c25a3278af7ad6766c3d9341f",
+            "size": 2359,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_1-default.txt-Plan]": [
@@ -2647,9 +2647,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Debug]": [
         {
-            "checksum": "72e082e8487ea5d23fdd59864829d3e0",
-            "size": 3244,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ead93d56b954e018880386dd672cfb0c",
+            "size": 3278,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_without_resolve_dublicates_mult-default.txt-Plan]": [
@@ -2689,9 +2689,9 @@
     ],
     "test.test[tpch-q14-default.txt-Debug]": [
         {
-            "checksum": "fa26777ba6f41dd36e603e860409f4b5",
-            "size": 6074,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_tpch-q14-default.txt-Debug_/opt.yql_patched"
+            "checksum": "7898fa6c6670ca337f4b5baf517f6b4f",
+            "size": 6096,
+            "uri": "https://{canondata_backend}/1936947/b01bfb001a8a49b0c22eb5525a77866740554066/resource.tar.gz#test.test_tpch-q14-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q14-default.txt-Plan]": [
@@ -2703,9 +2703,9 @@
     ],
     "test.test[tpch-q2-default.txt-Debug]": [
         {
-            "checksum": "4a893428ae276bbf22c69427f37a7abf",
-            "size": 14420,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_tpch-q2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "a42b3275ad11ea1110a8ca4ebdadc6b4",
+            "size": 14548,
+            "uri": "https://{canondata_backend}/1936947/b01bfb001a8a49b0c22eb5525a77866740554066/resource.tar.gz#test.test_tpch-q2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q2-default.txt-Plan]": [
@@ -2871,9 +2871,9 @@
     ],
     "test.test[weak_field-weak_field_join_condition--Debug]": [
         {
-            "checksum": "2acd4813450a175e42bec32aea164847",
-            "size": 4159,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_weak_field-weak_field_join_condition--Debug_/opt.yql_patched"
+            "checksum": "1884dd355cd97ec04961f57b70702e01",
+            "size": 4195,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_weak_field-weak_field_join_condition--Debug_/opt.yql_patched"
         }
     ],
     "test.test[weak_field-weak_field_join_condition--Plan]": [
@@ -2885,9 +2885,9 @@
     ],
     "test.test[weak_field-weak_field_join_where--Debug]": [
         {
-            "checksum": "82da6b64c36ab02f82787e4bef0dd688",
-            "size": 4706,
-            "uri": "https://{canondata_backend}/1889210/431569691fa60b20bf9ef4cc94610d8f1b1518e2/resource.tar.gz#test.test_weak_field-weak_field_join_where--Debug_/opt.yql_patched"
+            "checksum": "21366ef6b38b14ec3322cf690c7fc438",
+            "size": 4742,
+            "uri": "https://{canondata_backend}/1924537/0a41dcc78172e6535728bee88fd92593cdce821c/resource.tar.gz#test.test_weak_field-weak_field_join_where--Debug_/opt.yql_patched"
         }
     ],
     "test.test[weak_field-weak_field_join_where--Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part5/canondata/result.json
index 4dba903d5d1..b3008b6e1ed 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part5/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part5/canondata/result.json
@@ -1121,9 +1121,9 @@
     ],
     "test.test[in-in_ansi_join--Debug]": [
         {
-            "checksum": "63be4aaa4afe001235f434f1950c8697",
-            "size": 14479,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_in-in_ansi_join--Debug_/opt.yql_patched"
+            "checksum": "7ef9f0704d6f7f6a4b27631a12d6d036",
+            "size": 14535,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_in-in_ansi_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_ansi_join--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-anyjoin_common_nodup--Debug]": [
         {
-            "checksum": "cba1f594ac5a6a14375472efda7b23fb",
-            "size": 5148,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-anyjoin_common_nodup--Debug_/opt.yql_patched"
+            "checksum": "e6e7cf7b857cc18de19d2a43d601a85b",
+            "size": 5180,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-anyjoin_common_nodup--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_nodup--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-count_bans--Debug]": [
         {
-            "checksum": "845156c5f0c2859ae708c435a5de64d6",
-            "size": 5440,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-count_bans--Debug_/opt.yql_patched"
+            "checksum": "c562b98b99e1a45e41e66843ff581818",
+            "size": 5460,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-count_bans--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-count_bans--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-full_trivial_udf_call--Debug]": [
         {
-            "checksum": "3d0b21eefe75ff360fde81bd10007a09",
-            "size": 3370,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-full_trivial_udf_call--Debug_/opt.yql_patched"
+            "checksum": "bfe2277ce62ecf4eed8533ef482e47cc",
+            "size": 3378,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-full_trivial_udf_call--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_trivial_udf_call--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-inner_trivial--Debug]": [
         {
-            "checksum": "531e6664d72e24f9e210329defaf58b3",
-            "size": 2438,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-inner_trivial--Debug_/opt.yql_patched"
+            "checksum": "7f236d5cb1ed15ef27711dcb25cb7246",
+            "size": 2446,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-inner_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_trivial--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-lookupjoin_inner_1o2o--Debug]": [
         {
-            "checksum": "bb95ade42a940d6cfd70a382c6a5af8b",
-            "size": 4087,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o--Debug_/opt.yql_patched"
+            "checksum": "8981cadb4b2831fc26c590c626d9c194",
+            "size": 4091,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-lookupjoin_inner_1o2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_1o2o--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite_sequence--Debug]": [
         {
-            "checksum": "8e9cab2cc931f2061df40c62eee11bc5",
-            "size": 4850,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence--Debug_/opt.yql_patched"
+            "checksum": "c5509f6ca84c41e4b901b8ea1f521cd6",
+            "size": 4894,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-mapjoin_early_rewrite_sequence--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite_sequence--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-premap_map_cross--Debug]": [
         {
-            "checksum": "688ad7836e220f713863462a60f9edd4",
-            "size": 3287,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-premap_map_cross--Debug_/opt.yql_patched"
+            "checksum": "a9fa9d5b3762188279f961db3d4f3ed4",
+            "size": 3295,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-premap_map_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_cross--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-premap_map_inner--Debug]": [
         {
-            "checksum": "2e0de553f4487bd18e9e99bd84d15bef",
-            "size": 3436,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-premap_map_inner--Debug_/opt.yql_patched"
+            "checksum": "38c439255611d1861bbb144e76b7fe41",
+            "size": 3472,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-premap_map_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_inner--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-star_join_inners_vk_sorted--Debug]": [
         {
-            "checksum": "623d76096150b01b5b98d9a1ebc55ac3",
-            "size": 6340,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_join-star_join_inners_vk_sorted--Debug_/opt.yql_patched"
+            "checksum": "e6142f30b15cb410552d5010ddab9863",
+            "size": 6410,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_join-star_join_inners_vk_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-star_join_inners_vk_sorted--Plan]": [
@@ -1737,9 +1737,9 @@
     ],
     "test.test[pg-select_table2-default.txt-Debug]": [
         {
-            "checksum": "e05d88a4fa24de9db0af6a20005cca25",
-            "size": 2346,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_pg-select_table2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "65bfa057b63a4e24af4a21695ff80f5c",
+            "size": 2354,
+            "uri": "https://{canondata_backend}/1937027/3423e4b4827904e9c958ae32fc400e91b7478258/resource.tar.gz#test.test_pg-select_table2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_table2-default.txt-Plan]": [
@@ -2031,9 +2031,9 @@
     ],
     "test.test[pg-tpch-q05-default.txt-Debug]": [
         {
-            "checksum": "34659b31862ae9b9e6508d8ade57ad1a",
-            "size": 14772,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_pg-tpch-q05-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ed203afff767906b0c1b33fb92acc281",
+            "size": 14976,
+            "uri": "https://{canondata_backend}/1871182/4f0817d179be9a2b57bbd300921ec125945e4fde/resource.tar.gz#test.test_pg-tpch-q05-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q05-default.txt-Plan]": [
@@ -2045,9 +2045,9 @@
     ],
     "test.test[pg-tpch-q19-default.txt-Debug]": [
         {
-            "checksum": "2c9085be6d88f4826d74d2d0aecebe1a",
-            "size": 9294,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_pg-tpch-q19-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1601991f72ba52e979a155d68cd4b749",
+            "size": 9335,
+            "uri": "https://{canondata_backend}/1871182/4f0817d179be9a2b57bbd300921ec125945e4fde/resource.tar.gz#test.test_pg-tpch-q19-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q19-default.txt-Plan]": [
@@ -2311,9 +2311,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Debug]": [
         {
-            "checksum": "1df5e319652b5d9322b945bfdeda2a5e",
-            "size": 2353,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "83cf4d8c25a3278af7ad6766c3d9341f",
+            "size": 2359,
+            "uri": "https://{canondata_backend}/1936947/1c5b0119d6f1d9befc5c483dd9c85349921850b5/resource.tar.gz#test.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_coalesce_without_left_semi_2-default.txt-Plan]": [
@@ -2339,9 +2339,9 @@
     ],
     "test.test[tpch-q12-default.txt-Debug]": [
         {
-            "checksum": "631481a38278825e00b83786fe273f2d",
-            "size": 6740,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_tpch-q12-default.txt-Debug_/opt.yql_patched"
+            "checksum": "97298f96ec8957954e500f1767ea5e77",
+            "size": 6763,
+            "uri": "https://{canondata_backend}/1871182/4f0817d179be9a2b57bbd300921ec125945e4fde/resource.tar.gz#test.test_tpch-q12-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q12-default.txt-Plan]": [
@@ -2353,9 +2353,9 @@
     ],
     "test.test[tpch-q22-default.txt-Debug]": [
         {
-            "checksum": "004478ace4dcfcaaa604c77b62aa04e9",
-            "size": 7626,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_tpch-q22-default.txt-Debug_/opt.yql_patched"
+            "checksum": "61e59d100a3f0be84cc51363feb49e3c",
+            "size": 7641,
+            "uri": "https://{canondata_backend}/1871182/4f0817d179be9a2b57bbd300921ec125945e4fde/resource.tar.gz#test.test_tpch-q22-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q22-default.txt-Plan]": [
@@ -2367,9 +2367,9 @@
     ],
     "test.test[tpch-q3-default.txt-Debug]": [
         {
-            "checksum": "f81a7a9315b8862ad244041d920ffade",
-            "size": 8885,
-            "uri": "https://{canondata_backend}/1936947/a5f83e5d38179c14126d53519dc062cef98113ec/resource.tar.gz#test.test_tpch-q3-default.txt-Debug_/opt.yql_patched"
+            "checksum": "fb222b3ac38d7a7cc37a40fdd86fef37",
+            "size": 8936,
+            "uri": "https://{canondata_backend}/1871182/4f0817d179be9a2b57bbd300921ec125945e4fde/resource.tar.gz#test.test_tpch-q3-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q3-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part6/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part6/canondata/result.json
index 9eecc3f966e..fb9f2b5cd16 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part6/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part6/canondata/result.json
@@ -365,9 +365,9 @@
     ],
     "test.test[aggregate-group_by_expr_only_join--Debug]": [
         {
-            "checksum": "a7f1c5c0e60e925f07b8f5600d3f4589",
-            "size": 3363,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_aggregate-group_by_expr_only_join--Debug_/opt.yql_patched"
+            "checksum": "cf568f693f896b34c8e191d1bcb092a2",
+            "size": 3369,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_aggregate-group_by_expr_only_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_expr_only_join--Plan]": [
@@ -771,9 +771,9 @@
     ],
     "test.test[expr-double_join_with_list_from_range--Debug]": [
         {
-            "checksum": "2c3b65a84fd00574cdd44460cc1b1c9d",
-            "size": 2744,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_expr-double_join_with_list_from_range--Debug_/opt.yql_patched"
+            "checksum": "802e5afa0e611a85bbe54aa37080ef82",
+            "size": 2803,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_expr-double_join_with_list_from_range--Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-double_join_with_list_from_range--Plan]": [
@@ -1037,9 +1037,9 @@
     ],
     "test.test[in-yql-14677-default.txt-Debug]": [
         {
-            "checksum": "09c45b0378ad9d579dbaabfbc8debdb9",
-            "size": 2337,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_in-yql-14677-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c47d6509bba3231eb6b4557586e4408f",
+            "size": 2343,
+            "uri": "https://{canondata_backend}/1871182/e66a26afe2c1997e78be6b246adf3c090ccd217c/resource.tar.gz#test.test_in-yql-14677-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-yql-14677-default.txt-Plan]": [
@@ -1121,9 +1121,9 @@
     ],
     "test.test[join-alias_where_group--Debug]": [
         {
-            "checksum": "c657c4fc7e9ef63dd89a0e260c5e5e25",
-            "size": 3152,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-alias_where_group--Debug_/opt.yql_patched"
+            "checksum": "0c90d0b8468bd15dfd22c434450d0454",
+            "size": 3160,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-alias_where_group--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-alias_where_group--Plan]": [
@@ -1135,9 +1135,9 @@
     ],
     "test.test[join-anyjoin_common_dup--Debug]": [
         {
-            "checksum": "d7718d1daccaeb73e84452d0b5d3e2ee",
-            "size": 5152,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-anyjoin_common_dup--Debug_/opt.yql_patched"
+            "checksum": "a5d3c4920b9633e6a729afa65bde10da",
+            "size": 5184,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-anyjoin_common_dup--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-anyjoin_common_dup--Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-force_merge_join-default.txt-Debug]": [
         {
-            "checksum": "355515e810465730adca4757b0816bf4",
-            "size": 2408,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-force_merge_join-default.txt-Debug_/opt.yql_patched"
+            "checksum": "72ea0ea0e2e3a778d7fe2e9780aef511",
+            "size": 2414,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-force_merge_join-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-force_merge_join-default.txt-Plan]": [
@@ -1163,9 +1163,9 @@
     ],
     "test.test[join-full_equal_not_null--Debug]": [
         {
-            "checksum": "969700d4ad6d0194e39e59b69a405d3d",
-            "size": 3025,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-full_equal_not_null--Debug_/opt.yql_patched"
+            "checksum": "5d85a540dba6d78e45e6c2f28a466e91",
+            "size": 3059,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-full_equal_not_null--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_equal_not_null--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-full_trivial--Debug]": [
         {
-            "checksum": "f99a10a7cae1956a5737b5b15ac5ee08",
-            "size": 2967,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-full_trivial--Debug_/opt.yql_patched"
+            "checksum": "dc243f4e2b8cbc8f4f4b6580dfe1708d",
+            "size": 2975,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-full_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_trivial--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-join_comp_map_table--Debug]": [
         {
-            "checksum": "bec33cc2f8d429654d5503d16dc5dc8d",
-            "size": 7002,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-join_comp_map_table--Debug_/opt.yql_patched"
+            "checksum": "bb93713752e1e0aa4c656487e329a016",
+            "size": 7044,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-join_comp_map_table--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_comp_map_table--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-join_key_cmp_udf--Debug]": [
         {
-            "checksum": "13d751beec0ce52e5ba21e29b510ae4a",
-            "size": 2936,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-join_key_cmp_udf--Debug_/opt.yql_patched"
+            "checksum": "fa041016e111c6e209191681eb849f02",
+            "size": 2970,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-join_key_cmp_udf--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_key_cmp_udf--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-lookupjoin_semi_subq--Debug]": [
         {
-            "checksum": "0508abd8cb8faf5628278b76ffea6f6c",
-            "size": 3349,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-lookupjoin_semi_subq--Debug_/opt.yql_patched"
+            "checksum": "1f152155cf23cdb0935ba3b7735387fb",
+            "size": 3371,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-lookupjoin_semi_subq--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_subq--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-mergejoin_choose_primary_with_retry--Debug]": [
         {
-            "checksum": "0548afcd515cbb07f2a0cbe0bc85d4e2",
-            "size": 3447,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-mergejoin_choose_primary_with_retry--Debug_/opt.yql_patched"
+            "checksum": "9bda961162d5bc990e70064eea0c90e3",
+            "size": 3483,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-mergejoin_choose_primary_with_retry--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_choose_primary_with_retry--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-pushdown_filter_over_inner_with_assume_strict--Debug]": [
         {
-            "checksum": "5b02082703fd32ecc553323c6580dff9",
-            "size": 2711,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_assume_strict--Debug_/opt.yql_patched"
+            "checksum": "ca05f9962098f4bd8b040881e95f0c8f",
+            "size": 2719,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_join-pushdown_filter_over_inner_with_assume_strict--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pushdown_filter_over_inner_with_assume_strict--Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[key_filter-multiusage--Debug]": [
         {
-            "checksum": "390b76566e0e39303b6d3563fd466ecd",
-            "size": 3798,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_key_filter-multiusage--Debug_/opt.yql_patched"
+            "checksum": "ed777e0f1ac0855ddfd8c37b81e0102b",
+            "size": 3804,
+            "uri": "https://{canondata_backend}/1775319/608686f92bcc453859d63d6d76218b18495c8e03/resource.tar.gz#test.test_key_filter-multiusage--Debug_/opt.yql_patched"
         }
     ],
     "test.test[key_filter-multiusage--Plan]": [
@@ -2381,9 +2381,9 @@
     ],
     "test.test[tpch-q15-default.txt-Debug]": [
         {
-            "checksum": "cbb26628aec5ac25cd9bf11dfc82180e",
-            "size": 9062,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_tpch-q15-default.txt-Debug_/opt.yql_patched"
+            "checksum": "90834c699cae63fbd27546578d6f8b9a",
+            "size": 9112,
+            "uri": "https://{canondata_backend}/1777230/0b7f9e0d8c5239cd24b58568ad735a725399bc97/resource.tar.gz#test.test_tpch-q15-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q15-default.txt-Plan]": [
@@ -2521,9 +2521,9 @@
     ],
     "test.test[weak_field-weak_field_join--Debug]": [
         {
-            "checksum": "ca6ddf163aafe43ff5ffb03581a3055d",
-            "size": 3946,
-            "uri": "https://{canondata_backend}/1775059/3cb7d014d70b84dbcb84645fa987dd9d47d7fd6c/resource.tar.gz#test.test_weak_field-weak_field_join--Debug_/opt.yql_patched"
+            "checksum": "a4657865d6ede8fcb9fa65ee83d7134e",
+            "size": 3954,
+            "uri": "https://{canondata_backend}/1923547/20d7b6451882c08d4fd891e241823dc7ac318022/resource.tar.gz#test.test_weak_field-weak_field_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[weak_field-weak_field_join--Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part7/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part7/canondata/result.json
index d45bb3ad9bb..568a5912c5a 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part7/canondata/result.json
@@ -379,9 +379,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_qualified-default.txt-Debug]": [
         {
-            "checksum": "98c8af541e53934e9e073622370a636c",
-            "size": 6275,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_aggregate-group_by_ru_join_qualified-default.txt-Debug_/opt.yql_patched"
+            "checksum": "67b09a772ecaf6a53c1dd329bff86187",
+            "size": 6281,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_aggregate-group_by_ru_join_qualified-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_qualified-default.txt-Plan]": [
@@ -995,9 +995,9 @@
     ],
     "test.test[in-in_tablesource_to_equijoin--Debug]": [
         {
-            "checksum": "520f8d74ba620bb948db93a28c5757c7",
-            "size": 9265,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_in-in_tablesource_to_equijoin--Debug_/opt.yql_patched"
+            "checksum": "7ef7412b710977e9ea0969297e6e133c",
+            "size": 9363,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_in-in_tablesource_to_equijoin--Debug_/opt.yql_patched"
         }
     ],
     "test.test[in-in_tablesource_to_equijoin--Plan]": [
@@ -1079,9 +1079,9 @@
     ],
     "test.test[join-equi_join_three_asterisk_eval--Debug]": [
         {
-            "checksum": "300593bdfaf3d107162f1c904ba8ca2a",
-            "size": 4431,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-equi_join_three_asterisk_eval--Debug_/opt.yql_patched"
+            "checksum": "8e4f2397db7eab0a33451bb0d2dce67c",
+            "size": 4461,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-equi_join_three_asterisk_eval--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_asterisk_eval--Plan]": [
@@ -1093,9 +1093,9 @@
     ],
     "test.test[join-equi_join_three_simple--Debug]": [
         {
-            "checksum": "8ee828afcc1c0e8149c5025b91c5647d",
-            "size": 3442,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-equi_join_three_simple--Debug_/opt.yql_patched"
+            "checksum": "75f440e65d2daaba01a361cb038c2444",
+            "size": 3472,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-equi_join_three_simple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_simple--Plan]": [
@@ -1107,9 +1107,9 @@
     ],
     "test.test[join-full_join--Debug]": [
         {
-            "checksum": "b3b8e0bd6e95d21343506cc5282e243e",
-            "size": 2996,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-full_join--Debug_/opt.yql_patched"
+            "checksum": "8065fc1ad8ba454c33672801a361d152",
+            "size": 3032,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-full_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-full_join--Plan]": [
@@ -1135,9 +1135,9 @@
     ],
     "test.test[join-join_left_cbo--Debug]": [
         {
-            "checksum": "6aa3b83400bb97ea0824e5b2ba4df5f0",
-            "size": 2584,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-join_left_cbo--Debug_/opt.yql_patched"
+            "checksum": "98679dc275a33d82ed862304e8f2dce5",
+            "size": 2594,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-join_left_cbo--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_left_cbo--Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-left_trivial--Debug]": [
         {
-            "checksum": "d88742846fabd9f4363f5af00cf09963",
-            "size": 2625,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-left_trivial--Debug_/opt.yql_patched"
+            "checksum": "1db5bdbfbc230358af864217628b6372",
+            "size": 2633,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-left_trivial--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-left_trivial--Plan]": [
@@ -1163,9 +1163,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_only_single--Debug]": [
         {
-            "checksum": "e0fbdbd37186705f3c86d35d8ee947bb",
-            "size": 2485,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_only_single--Debug_/opt.yql_patched"
+            "checksum": "1e4115a1680ecebffe3208893776c8e3",
+            "size": 2499,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_only_single--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_only_single--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_single--Debug]": [
         {
-            "checksum": "18573c40c43f6e3e32f325be8e3065e6",
-            "size": 2485,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_single--Debug_/opt.yql_patched"
+            "checksum": "03dbcd623b66f27fae7fa231bf3127a2",
+            "size": 2499,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_single--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_single--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-mapjoin_partial_uniq_keys--Debug]": [
         {
-            "checksum": "341e622d521cce80f808ef6650abdc9f",
-            "size": 3234,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys--Debug_/opt.yql_patched"
+            "checksum": "61d1bd40b5672bbad5c52f6e143e0ba2",
+            "size": 3240,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-mapjoin_partial_uniq_keys--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_partial_uniq_keys--Plan]": [
@@ -1205,9 +1205,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort_cross--Debug]": [
         {
-            "checksum": "8bf54c9b27711073f659f3c6e824047e",
-            "size": 4522,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_cross--Debug_/opt.yql_patched"
+            "checksum": "6fdfca89b40988de5ce937e3f169e1cd",
+            "size": 4538,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort_cross--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort_nested--Debug]": [
         {
-            "checksum": "70b9a3039a346bbd2712921a4e4076a9",
-            "size": 6015,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_nested--Debug_/opt.yql_patched"
+            "checksum": "95af0ec2220008dda89f5f3fb0bba9a0",
+            "size": 6027,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-mergejoin_saves_output_sort_nested--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort_nested--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-mergejoin_semi_to_inner--Debug]": [
         {
-            "checksum": "81e0447488ec58a04802299544dc2ee9",
-            "size": 3731,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-mergejoin_semi_to_inner--Debug_/opt.yql_patched"
+            "checksum": "4308a8b9d56a29823b91881c61a1b8f3",
+            "size": 3737,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-mergejoin_semi_to_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_semi_to_inner--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-order_of_qualified--Debug]": [
         {
-            "checksum": "e464b56081e0e0899a0b72d3187e5504",
-            "size": 2742,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-order_of_qualified--Debug_/opt.yql_patched"
+            "checksum": "8e3f132b2805c18b9db60b4b06028f9c",
+            "size": 2750,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-order_of_qualified--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-order_of_qualified--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-premap_map_semi--Debug]": [
         {
-            "checksum": "5fab2117a9b18987f86749bdf36dd0ec",
-            "size": 3257,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-premap_map_semi--Debug_/opt.yql_patched"
+            "checksum": "012774c0b3c492797821d9a43b8d96bd",
+            "size": 3279,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-premap_map_semi--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_map_semi--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-pullup_exclusion--Debug]": [
         {
-            "checksum": "70c488063d78fdaaf7597e77809b0884",
-            "size": 3694,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-pullup_exclusion--Debug_/opt.yql_patched"
+            "checksum": "2497f91073256dd77ef13e3f8226a297",
+            "size": 3702,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-pullup_exclusion--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_exclusion--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-three_equalities--Debug]": [
         {
-            "checksum": "f0f0237f09566446b46817207c182b47",
-            "size": 3620,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-three_equalities--Debug_/opt.yql_patched"
+            "checksum": "75374e9730813b87e4bef12ae87edd30",
+            "size": 3698,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-three_equalities--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-three_equalities--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-trivial_view--Debug]": [
         {
-            "checksum": "fdc73f60188ad426c1f1b86fe9edd3a5",
-            "size": 2734,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_join-trivial_view--Debug_/opt.yql_patched"
+            "checksum": "cc9101d743fb1822acc8c812fcb48f31",
+            "size": 2742,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_join-trivial_view--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-trivial_view--Plan]": [
@@ -1457,9 +1457,9 @@
     ],
     "test.test[optimizers-test_no_aggregate_split--Debug]": [
         {
-            "checksum": "f8b770ea02ebfabf69ec4f6ae3271303",
-            "size": 4386,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_optimizers-test_no_aggregate_split--Debug_/opt.yql_patched"
+            "checksum": "167ea0bee44abc8f969e9e22b126a8c6",
+            "size": 4392,
+            "uri": "https://{canondata_backend}/1942671/a6ce0633f68a5454d2ba9fd4b5512df193505e99/resource.tar.gz#test.test_optimizers-test_no_aggregate_split--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-test_no_aggregate_split--Plan]": [
@@ -1485,9 +1485,9 @@
     ],
     "test.test[optimizers-yql_5830_fuse_outer_with_extra_deps--Debug]": [
         {
-            "checksum": "5ce28b95bfb8f31248474429719ab8c5",
-            "size": 3533,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_optimizers-yql_5830_fuse_outer_with_extra_deps--Debug_/opt.yql_patched"
+            "checksum": "e3dc6b96fdfa12bc6c6150985e4ac84e",
+            "size": 3539,
+            "uri": "https://{canondata_backend}/1937367/7e0979436110cea1676e5633e9ea6b123723a274/resource.tar.gz#test.test_optimizers-yql_5830_fuse_outer_with_extra_deps--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql_5830_fuse_outer_with_extra_deps--Plan]": [
@@ -2059,9 +2059,9 @@
     ],
     "test.test[pg-tpch-q20-default.txt-Debug]": [
         {
-            "checksum": "357a510b24a7dad6e654445690760e0c",
-            "size": 16471,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ef849f1e3ac01a6a39b28eefe6c5de02",
+            "size": 16624,
+            "uri": "https://{canondata_backend}/937458/a100b52d77c820d8172336ad05a0c412d6770d4d/resource.tar.gz#test.test_pg-tpch-q20-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q20-default.txt-Plan]": [
@@ -2521,9 +2521,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_qualified-default.txt-Debug]": [
         {
-            "checksum": "ff1f9eddc205c8e88d3e7441ee9641b9",
-            "size": 3030,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_simple_columns-simple_columns_join_qualified-default.txt-Debug_/opt.yql_patched"
+            "checksum": "8cbf3409ed6486599e82e52e0c910160",
+            "size": 3064,
+            "uri": "https://{canondata_backend}/1923547/ead63b9a87b4b6e379c18600309bfa00d47b0006/resource.tar.gz#test.test_simple_columns-simple_columns_join_qualified-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_qualified-default.txt-Plan]": [
@@ -2535,9 +2535,9 @@
     ],
     "test.test[tpch-q10-default.txt-Debug]": [
         {
-            "checksum": "d0e0913bbcfd0a6a4ee005737f79678e",
-            "size": 12431,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_tpch-q10-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1bc9fcb0abf393d1c23641431b751a13",
+            "size": 12498,
+            "uri": "https://{canondata_backend}/937458/a100b52d77c820d8172336ad05a0c412d6770d4d/resource.tar.gz#test.test_tpch-q10-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q10-default.txt-Plan]": [
@@ -2549,9 +2549,9 @@
     ],
     "test.test[tpch-q11-default.txt-Debug]": [
         {
-            "checksum": "35035e13f7e217c2677ab494cd0d7a9a",
-            "size": 8569,
-            "uri": "https://{canondata_backend}/1781765/028f42f897160b53900546b39900217bb2eb9fb1/resource.tar.gz#test.test_tpch-q11-default.txt-Debug_/opt.yql_patched"
+            "checksum": "74ba1b2800db2782bd88cdd643106fa7",
+            "size": 8622,
+            "uri": "https://{canondata_backend}/937458/a100b52d77c820d8172336ad05a0c412d6770d4d/resource.tar.gz#test.test_tpch-q11-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q11-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part8/canondata/result.json
index 667e0852035..39664255633 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part8/canondata/result.json
@@ -1,9 +1,9 @@
 {
     "test.test[action-eval_column--Debug]": [
         {
-            "checksum": "143677221988607d21e054b612f83982",
-            "size": 7823,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_action-eval_column--Debug_/opt.yql_patched"
+            "checksum": "ab6cb977565d7f58210f0eb358e69d9b",
+            "size": 7829,
+            "uri": "https://{canondata_backend}/1942100/4543aeedf0ceb10a54d6b6dab3efe169750636d0/resource.tar.gz#test.test_action-eval_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[action-eval_column--Plan]": [
@@ -295,9 +295,9 @@
     ],
     "test.test[aggregate-group_by_cube_join_count--Debug]": [
         {
-            "checksum": "041053cab2cf105b0054efd356f15fea",
-            "size": 6988,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_aggregate-group_by_cube_join_count--Debug_/opt.yql_patched"
+            "checksum": "69461fe007f74e213be40d305c509e1c",
+            "size": 6994,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_aggregate-group_by_cube_join_count--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_cube_join_count--Plan]": [
@@ -407,9 +407,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_simple_fs_multiusage--Debug]": [
         {
-            "checksum": "1a161f73dcbb2d718ff00be84eb00c8f",
-            "size": 5933,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple_fs_multiusage--Debug_/opt.yql_patched"
+            "checksum": "31055b83164f539606c3f33aed01cc72",
+            "size": 5939,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple_fs_multiusage--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_simple_fs_multiusage--Plan]": [
@@ -491,9 +491,9 @@
     ],
     "test.test[ansi_idents-join_using-default.txt-Debug]": [
         {
-            "checksum": "40694630055766bae8cd6939e48e3056",
-            "size": 3155,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_ansi_idents-join_using-default.txt-Debug_/opt.yql_patched"
+            "checksum": "fa34ad0e36befee9cfb0de4daf397f91",
+            "size": 3163,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_ansi_idents-join_using-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[ansi_idents-join_using-default.txt-Plan]": [
@@ -897,9 +897,9 @@
     ],
     "test.test[distinct-distinct_and_join--Debug]": [
         {
-            "checksum": "5275879879a45dd23624f569b319c8d4",
-            "size": 2836,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_distinct-distinct_and_join--Debug_/opt.yql_patched"
+            "checksum": "8b5c97d54617c02ee43dbe05c99a08f6",
+            "size": 2870,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_distinct-distinct_and_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[distinct-distinct_and_join--Plan]": [
@@ -953,9 +953,9 @@
     ],
     "test.test[distinct-distinct_join-default.txt-Debug]": [
         {
-            "checksum": "d461a3bc7f31bd6ce34f07e7a367d6c7",
-            "size": 2586,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_distinct-distinct_join-default.txt-Debug_/opt.yql_patched"
+            "checksum": "6f97766550b89bb46defb9b8e0ab14ff",
+            "size": 2610,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_distinct-distinct_join-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[distinct-distinct_join-default.txt-Plan]": [
@@ -1345,9 +1345,9 @@
     ],
     "test.test[join-bush_in_in_in--Debug]": [
         {
-            "checksum": "1865596a30a81aba15fecb0aeefb94bb",
-            "size": 6957,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-bush_in_in_in--Debug_/opt.yql_patched"
+            "checksum": "2ac2ab3369290721d85408e6ca0a7f57",
+            "size": 7015,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-bush_in_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_in_in_in--Plan]": [
@@ -1359,9 +1359,9 @@
     ],
     "test.test[join-equi_join_three_asterisk--Debug]": [
         {
-            "checksum": "00224af0e8b2ac4833b64e443a4279e6",
-            "size": 4042,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-equi_join_three_asterisk--Debug_/opt.yql_patched"
+            "checksum": "df899cb18b76fd326d2a524b8bab6a7b",
+            "size": 4058,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-equi_join_three_asterisk--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-equi_join_three_asterisk--Plan]": [
@@ -1401,9 +1401,9 @@
     ],
     "test.test[join-inner_grouped--Debug]": [
         {
-            "checksum": "ea8ca4aae03e84ef8dae14ee06dbd106",
-            "size": 3458,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-inner_grouped--Debug_/opt.yql_patched"
+            "checksum": "b1b229e5f52a77c5c428fbfa280e2fa6",
+            "size": 3466,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-inner_grouped--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_grouped--Plan]": [
@@ -1415,9 +1415,9 @@
     ],
     "test.test[join-inner_grouped_by_expr--Debug]": [
         {
-            "checksum": "ede4b80094f8d8eaa5d94bbc454996e5",
-            "size": 3474,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-inner_grouped_by_expr--Debug_/opt.yql_patched"
+            "checksum": "c4dbae60fe403732cd9b1a8abf16adce",
+            "size": 3482,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-inner_grouped_by_expr--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_grouped_by_expr--Plan]": [
@@ -1429,9 +1429,9 @@
     ],
     "test.test[join-lookupjoin_inner_empty_subq--Debug]": [
         {
-            "checksum": "544afb24765d700a8a4ecaea80127e18",
-            "size": 3294,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-lookupjoin_inner_empty_subq--Debug_/opt.yql_patched"
+            "checksum": "a26f969fd1da3d14f92da8ba5353e6bd",
+            "size": 3330,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-lookupjoin_inner_empty_subq--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_inner_empty_subq--Plan]": [
@@ -1443,9 +1443,9 @@
     ],
     "test.test[join-lookupjoin_semi_1o2o--Debug]": [
         {
-            "checksum": "0c658e29ca176223dff3c983af1ad655",
-            "size": 3802,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o--Debug_/opt.yql_patched"
+            "checksum": "89b95d33be28961d88c94025b686ccd7",
+            "size": 3822,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-lookupjoin_semi_1o2o--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-lookupjoin_semi_1o2o--Plan]": [
@@ -1457,9 +1457,9 @@
     ],
     "test.test[join-mapjoin_left_null_column--Debug]": [
         {
-            "checksum": "aedbfafc3299e20e50c689130caab348",
-            "size": 2109,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mapjoin_left_null_column--Debug_/opt.yql_patched"
+            "checksum": "ebd017747446cabe53d8957c0213f139",
+            "size": 2127,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mapjoin_left_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_left_null_column--Plan]": [
@@ -1471,9 +1471,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_non_optional_left_only_single--Debug]": [
         {
-            "checksum": "8a507d70a244420263128dbe1781c96d",
-            "size": 2833,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mapjoin_on_complex_type_non_optional_left_only_single--Debug_/opt.yql_patched"
+            "checksum": "8350d1eceb8d323c17db1c195aae2e67",
+            "size": 2847,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mapjoin_on_complex_type_non_optional_left_only_single--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_non_optional_left_only_single--Plan]": [
@@ -1485,9 +1485,9 @@
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_many--Debug]": [
         {
-            "checksum": "36a41258bf70d7c549054c001c78c4bd",
-            "size": 3426,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_many--Debug_/opt.yql_patched"
+            "checksum": "e4024f5c167bd291384f74ceb611325b",
+            "size": 3448,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mapjoin_on_complex_type_optional_left_semi_many--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_on_complex_type_optional_left_semi_many--Plan]": [
@@ -1499,9 +1499,9 @@
     ],
     "test.test[join-mergejoin_saves_output_sort--Debug]": [
         {
-            "checksum": "efde7c22561807cbbebbb65b28be66e3",
-            "size": 9765,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Debug_/opt.yql_patched"
+            "checksum": "efcb9f7a1f15584589e97e1ff2bc7df7",
+            "size": 9837,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mergejoin_saves_output_sort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_saves_output_sort--Plan]": [
@@ -1513,9 +1513,9 @@
     ],
     "test.test[join-mergejoin_small_primary--Debug]": [
         {
-            "checksum": "d2f1625bdbba297be46794a0db9048d3",
-            "size": 3451,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mergejoin_small_primary--Debug_/opt.yql_patched"
+            "checksum": "88d90822658bbc874ca648c94daf8b17",
+            "size": 3487,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mergejoin_small_primary--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_small_primary--Plan]": [
@@ -1527,9 +1527,9 @@
     ],
     "test.test[join-mergejoin_with_different_key_names_norename--Debug]": [
         {
-            "checksum": "af52c6e271e889408b3cac468decb282",
-            "size": 5601,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_norename--Debug_/opt.yql_patched"
+            "checksum": "38e68258ad62d96f9333ac2e3557f264",
+            "size": 5625,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mergejoin_with_different_key_names_norename--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_different_key_names_norename--Plan]": [
@@ -1541,9 +1541,9 @@
     ],
     "test.test[join-mergejoin_with_reverse_key_order--Debug]": [
         {
-            "checksum": "0e20fde0942f81b4bff49fca7480d050",
-            "size": 4356,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mergejoin_with_reverse_key_order--Debug_/opt.yql_patched"
+            "checksum": "5cdb3dc546d58d66772404d17e99234b",
+            "size": 4364,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mergejoin_with_reverse_key_order--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_reverse_key_order--Plan]": [
@@ -1555,9 +1555,9 @@
     ],
     "test.test[join-mergejoin_with_table_range--Debug]": [
         {
-            "checksum": "72bb0ccb87c14be7b7c19149a036dcf3",
-            "size": 3125,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-mergejoin_with_table_range--Debug_/opt.yql_patched"
+            "checksum": "b7a2c46823ba99ae0396c2d3db41f7a2",
+            "size": 3131,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-mergejoin_with_table_range--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_with_table_range--Plan]": [
@@ -1569,9 +1569,9 @@
     ],
     "test.test[join-opt_on_opt_side_with_group--Debug]": [
         {
-            "checksum": "9cab79b579d417337a61244931ca5c65",
-            "size": 3809,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-opt_on_opt_side_with_group--Debug_/opt.yql_patched"
+            "checksum": "4a58308e17556e35da9f0deb54a1fb21",
+            "size": 3817,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-opt_on_opt_side_with_group--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-opt_on_opt_side_with_group--Plan]": [
@@ -1583,9 +1583,9 @@
     ],
     "test.test[join-premap_merge_extrasort1--Debug]": [
         {
-            "checksum": "4fcb34358651583d340a8cb3c7b5c871",
-            "size": 4462,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-premap_merge_extrasort1--Debug_/opt.yql_patched"
+            "checksum": "137e484932a176c3d007c6b445f0c3ba",
+            "size": 4470,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-premap_merge_extrasort1--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_merge_extrasort1--Plan]": [
@@ -1597,9 +1597,9 @@
     ],
     "test.test[join-pullup_inner--Debug]": [
         {
-            "checksum": "f61b9ff6720cb1dfd1a9f62b4256d88a",
-            "size": 2818,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-pullup_inner--Debug_/opt.yql_patched"
+            "checksum": "17ed7824fb46a57f7ff2828103be8b6f",
+            "size": 2826,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-pullup_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_inner--Plan]": [
@@ -1611,9 +1611,9 @@
     ],
     "test.test[join-pullup_rownumber--Debug]": [
         {
-            "checksum": "a5078d9052b3f5e3ec32359ba0eb4730",
-            "size": 3758,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-pullup_rownumber--Debug_/opt.yql_patched"
+            "checksum": "80a2dad04403ff0dd1ec8a0c6ead7be1",
+            "size": 3766,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-pullup_rownumber--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-pullup_rownumber--Plan]": [
@@ -1625,9 +1625,9 @@
     ],
     "test.test[join-selfjoin_on_sorted_with_rename--Debug]": [
         {
-            "checksum": "b0fc06b78051d65c681418ec377192ea",
-            "size": 2211,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_rename--Debug_/opt.yql_patched"
+            "checksum": "018099feb2fa8a01bebbda3ed1340706",
+            "size": 2217,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-selfjoin_on_sorted_with_rename--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-selfjoin_on_sorted_with_rename--Plan]": [
@@ -1639,9 +1639,9 @@
     ],
     "test.test[join-three_equalities_paren--Debug]": [
         {
-            "checksum": "95841d5258717296270de2fa3a690a0f",
-            "size": 2327,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-three_equalities_paren--Debug_/opt.yql_patched"
+            "checksum": "e2d8c1a283ed2a18394fb2d16eba41af",
+            "size": 2335,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-three_equalities_paren--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-three_equalities_paren--Plan]": [
@@ -1653,9 +1653,9 @@
     ],
     "test.test[join-yql-10654_pullup_with_sys_columns--Debug]": [
         {
-            "checksum": "b5104776d90b94d4977a20f4c9c73669",
-            "size": 2806,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_join-yql-10654_pullup_with_sys_columns--Debug_/opt.yql_patched"
+            "checksum": "1f3b829aa76f9613cb8041f493496a9d",
+            "size": 2812,
+            "uri": "https://{canondata_backend}/1936947/f248d2d3ca7416aed1501ba1fe597fede39825d3/resource.tar.gz#test.test_join-yql-10654_pullup_with_sys_columns--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-10654_pullup_with_sys_columns--Plan]": [
@@ -1821,9 +1821,9 @@
     ],
     "test.test[optimizers-yql-8223_direct_row_and_skipnullmembers--Debug]": [
         {
-            "checksum": "bdb6366155aedfe1ae038bb3b0e869f7",
-            "size": 3765,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_optimizers-yql-8223_direct_row_and_skipnullmembers--Debug_/opt.yql_patched"
+            "checksum": "caa8c1be46814f970a251ea2b0e9d936",
+            "size": 3771,
+            "uri": "https://{canondata_backend}/212715/577bb43a4680fd329e2b0761a25ac5dc15416716/resource.tar.gz#test.test_optimizers-yql-8223_direct_row_and_skipnullmembers--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-8223_direct_row_and_skipnullmembers--Plan]": [
@@ -2731,9 +2731,9 @@
     ],
     "test.test[select-table_content_with_tmp_folder--Debug]": [
         {
-            "checksum": "ab1bd38aa806c4ebf64353c550e5aa9a",
-            "size": 2960,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_select-table_content_with_tmp_folder--Debug_/opt.yql_patched"
+            "checksum": "4920352cabcadf156266dcfbdd81fc24",
+            "size": 2968,
+            "uri": "https://{canondata_backend}/1937492/6bc2ecea7af0b506427596734b34e36bc943c010/resource.tar.gz#test.test_select-table_content_with_tmp_folder--Debug_/opt.yql_patched"
         }
     ],
     "test.test[select-table_content_with_tmp_folder--Plan]": [
@@ -2843,9 +2843,9 @@
     ],
     "test.test[tpch-q17-default.txt-Debug]": [
         {
-            "checksum": "ca48f44af0f45204b1625541b5a445fa",
-            "size": 7420,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_tpch-q17-default.txt-Debug_/opt.yql_patched"
+            "checksum": "1e1bd1c2eb20f194b05616521c1565f1",
+            "size": 7436,
+            "uri": "https://{canondata_backend}/1936947/132f13b565e3a200d06dba00bcba67acb5ccb401/resource.tar.gz#test.test_tpch-q17-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q17-default.txt-Plan]": [
@@ -2857,9 +2857,9 @@
     ],
     "test.test[tpch-q18-default.txt-Debug]": [
         {
-            "checksum": "f91448047fc99a7026bea52ed0d05386",
-            "size": 9811,
-            "uri": "https://{canondata_backend}/1923547/94f377eaa1d93890e1345ac4940cc6fa07bddd4f/resource.tar.gz#test.test_tpch-q18-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3e93c00904f68125f616921125198011",
+            "size": 9840,
+            "uri": "https://{canondata_backend}/1936947/132f13b565e3a200d06dba00bcba67acb5ccb401/resource.tar.gz#test.test_tpch-q18-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q18-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/hybrid_file/part9/canondata/result.json b/ydb/library/yql/tests/sql/hybrid_file/part9/canondata/result.json
index ce0812ea9bb..de2cda5c977 100644
--- a/ydb/library/yql/tests/sql/hybrid_file/part9/canondata/result.json
+++ b/ydb/library/yql/tests/sql/hybrid_file/part9/canondata/result.json
@@ -421,9 +421,9 @@
     ],
     "test.test[aggregate-group_by_gs_join_aliases-default.txt-Debug]": [
         {
-            "checksum": "818c32695b1772d779bc1cf29175fe58",
-            "size": 5458,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_aggregate-group_by_gs_join_aliases-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3c245bd24ac81a900e221380ec843ba8",
+            "size": 5464,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_aggregate-group_by_gs_join_aliases-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_gs_join_aliases-default.txt-Plan]": [
@@ -477,9 +477,9 @@
     ],
     "test.test[aggregate-group_by_ru_join_simple--Debug]": [
         {
-            "checksum": "d3e17d0089786f5da0b71049afb85cfe",
-            "size": 6104,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple--Debug_/opt.yql_patched"
+            "checksum": "cd9a0adf303e62f8141b75bfbe40da52",
+            "size": 6110,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_aggregate-group_by_ru_join_simple--Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggregate-group_by_ru_join_simple--Plan]": [
@@ -953,9 +953,9 @@
     ],
     "test.test[flatten_by-flatten_with_join--Debug]": [
         {
-            "checksum": "f114168a0d895ad2e390b2218eaeac25",
-            "size": 4007,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_flatten_by-flatten_with_join--Debug_/opt.yql_patched"
+            "checksum": "610008e90d86ceba44d5a96c7081dbaf",
+            "size": 4027,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_flatten_by-flatten_with_join--Debug_/opt.yql_patched"
         }
     ],
     "test.test[flatten_by-flatten_with_join--Plan]": [
@@ -1079,9 +1079,9 @@
     ],
     "test.test[join-aggr_diff_order-default.txt-Debug]": [
         {
-            "checksum": "ee16060067eed52f2bc47ae9378d8e1e",
-            "size": 2877,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-aggr_diff_order-default.txt-Debug_/opt.yql_patched"
+            "checksum": "928500f40a3910ece91706d79ef0aeb7",
+            "size": 2883,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-aggr_diff_order-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-aggr_diff_order-default.txt-Plan]": [
@@ -1107,9 +1107,9 @@
     ],
     "test.test[join-bush_dis_in--Debug]": [
         {
-            "checksum": "92bd9444433b4384471afb4a071fa056",
-            "size": 6171,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-bush_dis_in--Debug_/opt.yql_patched"
+            "checksum": "8b0e598cf35888ff4f256a059ab726c4",
+            "size": 6222,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-bush_dis_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in--Plan]": [
@@ -1121,9 +1121,9 @@
     ],
     "test.test[join-bush_dis_in_in--Debug]": [
         {
-            "checksum": "2fd325567805db34c59b86fa9bb82c3c",
-            "size": 6079,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-bush_dis_in_in--Debug_/opt.yql_patched"
+            "checksum": "0f29b0c7c5ca836afc591b5ec1139982",
+            "size": 6120,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-bush_dis_in_in--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-bush_dis_in_in--Plan]": [
@@ -1135,9 +1135,9 @@
     ],
     "test.test[join-flatten_columns1--Debug]": [
         {
-            "checksum": "2936634a61427ecd7fb397cc6ef84c0e",
-            "size": 2878,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-flatten_columns1--Debug_/opt.yql_patched"
+            "checksum": "2c5a423d9d926b77f265e3e0a3401b72",
+            "size": 2886,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-flatten_columns1--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-flatten_columns1--Plan]": [
@@ -1149,9 +1149,9 @@
     ],
     "test.test[join-inner_on_key_only--Debug]": [
         {
-            "checksum": "531e6664d72e24f9e210329defaf58b3",
-            "size": 2438,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-inner_on_key_only--Debug_/opt.yql_patched"
+            "checksum": "7f236d5cb1ed15ef27711dcb25cb7246",
+            "size": 2446,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-inner_on_key_only--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-inner_on_key_only--Plan]": [
@@ -1163,9 +1163,9 @@
     ],
     "test.test[join-join_no_correlation_in_order_by--Debug]": [
         {
-            "checksum": "c9e7b668423a4785443cd95286065e66",
-            "size": 2609,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-join_no_correlation_in_order_by--Debug_/opt.yql_patched"
+            "checksum": "6dafeaebb94fcfd19f2354bf23aa012d",
+            "size": 2643,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-join_no_correlation_in_order_by--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_no_correlation_in_order_by--Plan]": [
@@ -1177,9 +1177,9 @@
     ],
     "test.test[join-join_without_column--Debug]": [
         {
-            "checksum": "3671fd6ec16c28078265fc9180f82175",
-            "size": 2806,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-join_without_column--Debug_/opt.yql_patched"
+            "checksum": "568095f88d4844865a185a2d1d3a8c8e",
+            "size": 2840,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-join_without_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_column--Plan]": [
@@ -1191,9 +1191,9 @@
     ],
     "test.test[join-join_without_correlation_and_dict_access--Debug]": [
         {
-            "checksum": "6dbcde54a0393940d0581f1f5338b203",
-            "size": 4251,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-join_without_correlation_and_dict_access--Debug_/opt.yql_patched"
+            "checksum": "7092c5212849760d58e6fa0735bc20e8",
+            "size": 4271,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-join_without_correlation_and_dict_access--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-join_without_correlation_and_dict_access--Plan]": [
@@ -1219,9 +1219,9 @@
     ],
     "test.test[join-mapjoin_early_rewrite--Debug]": [
         {
-            "checksum": "603eb291737284e7e6f84ace34efa5f6",
-            "size": 2896,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-mapjoin_early_rewrite--Debug_/opt.yql_patched"
+            "checksum": "d080c95ab9267cbae0eec8f93383920e",
+            "size": 2916,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-mapjoin_early_rewrite--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mapjoin_early_rewrite--Plan]": [
@@ -1233,9 +1233,9 @@
     ],
     "test.test[join-mergejoin_big_primary--Debug]": [
         {
-            "checksum": "9f3cad9e1a5e2ab85931b8a69ba78dc1",
-            "size": 3454,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-mergejoin_big_primary--Debug_/opt.yql_patched"
+            "checksum": "48dfb075b49625731b99c9569e4bf07b",
+            "size": 3490,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-mergejoin_big_primary--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_big_primary--Plan]": [
@@ -1247,9 +1247,9 @@
     ],
     "test.test[join-mergejoin_big_primary_unique--Debug]": [
         {
-            "checksum": "abb7ec07d4a86c78cf5a0991d6578725",
-            "size": 3220,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-mergejoin_big_primary_unique--Debug_/opt.yql_patched"
+            "checksum": "da07c34aaa8e2a35cb240782fd6dbb31",
+            "size": 3228,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-mergejoin_big_primary_unique--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_big_primary_unique--Plan]": [
@@ -1261,9 +1261,9 @@
     ],
     "test.test[join-mergejoin_force_one_sorted--Debug]": [
         {
-            "checksum": "d52f1de7c6b6077036a0cdb77d56a81a",
-            "size": 2825,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-mergejoin_force_one_sorted--Debug_/opt.yql_patched"
+            "checksum": "4089a0d6089c1f83394526835a2d99fb",
+            "size": 2833,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-mergejoin_force_one_sorted--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_force_one_sorted--Plan]": [
@@ -1275,9 +1275,9 @@
     ],
     "test.test[join-mergejoin_left_null_column--Debug]": [
         {
-            "checksum": "82b4fc466ed485c896cecbe1a80ca47d",
-            "size": 2397,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-mergejoin_left_null_column--Debug_/opt.yql_patched"
+            "checksum": "d904f46427a7e2a19a6e6c83bc815d47",
+            "size": 2414,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-mergejoin_left_null_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_left_null_column--Plan]": [
@@ -1289,9 +1289,9 @@
     ],
     "test.test[join-mergejoin_semi_composite_to_inner--Debug]": [
         {
-            "checksum": "00b732a8abb262956f685f479dccc7a2",
-            "size": 7555,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-mergejoin_semi_composite_to_inner--Debug_/opt.yql_patched"
+            "checksum": "1dc272f84b0f6368dcfa720ccd0e5821",
+            "size": 7591,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-mergejoin_semi_composite_to_inner--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-mergejoin_semi_composite_to_inner--Plan]": [
@@ -1303,9 +1303,9 @@
     ],
     "test.test[join-premap_common_left_cross--Debug]": [
         {
-            "checksum": "5a32c29a41d95de1221dd5572c8c4719",
-            "size": 3849,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-premap_common_left_cross--Debug_/opt.yql_patched"
+            "checksum": "eed63c63bec25faee27d6c0193833afa",
+            "size": 3865,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-premap_common_left_cross--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-premap_common_left_cross--Plan]": [
@@ -1317,9 +1317,9 @@
     ],
     "test.test[join-yql-8980--Debug]": [
         {
-            "checksum": "f24b6cb9997f8773174ff5df350e2b8f",
-            "size": 3702,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-yql-8980--Debug_/opt.yql_patched"
+            "checksum": "f22bacd5700e163ea1b94b85226920d8",
+            "size": 3742,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-yql-8980--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql-8980--Plan]": [
@@ -1331,9 +1331,9 @@
     ],
     "test.test[join-yql_465--Debug]": [
         {
-            "checksum": "fad1a67bad134b4f7947b25618c5c05b",
-            "size": 2411,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_join-yql_465--Debug_/opt.yql_patched"
+            "checksum": "664bc13cfdee29b9c5cacb3b02bfa220",
+            "size": 2419,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_join-yql_465--Debug_/opt.yql_patched"
         }
     ],
     "test.test[join-yql_465--Plan]": [
@@ -1849,9 +1849,9 @@
     ],
     "test.test[pg-select_qstarref2-default.txt-Debug]": [
         {
-            "checksum": "32acc821b735e5a7c1ba21f55e6868b7",
-            "size": 3199,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_pg-select_qstarref2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "c5396bb2e81b65c4542de6b65bc6df76",
+            "size": 3207,
+            "uri": "https://{canondata_backend}/1937027/a499fe9bcfdbb4c9efbc9ebb08a71279c40027d0/resource.tar.gz#test.test_pg-select_qstarref2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_qstarref2-default.txt-Plan]": [
@@ -1863,9 +1863,9 @@
     ],
     "test.test[pg-select_starref2-default.txt-Debug]": [
         {
-            "checksum": "7a5b6fed0ee1b7b0694bdc70f860d1df",
-            "size": 3253,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_pg-select_starref2-default.txt-Debug_/opt.yql_patched"
+            "checksum": "580be5beda3ef3174e75d0f59cbcafc8",
+            "size": 3261,
+            "uri": "https://{canondata_backend}/1937027/a499fe9bcfdbb4c9efbc9ebb08a71279c40027d0/resource.tar.gz#test.test_pg-select_starref2-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-select_starref2-default.txt-Plan]": [
@@ -2143,9 +2143,9 @@
     ],
     "test.test[pg-tpch-q03-default.txt-Debug]": [
         {
-            "checksum": "a3a14c755a89fc477c2da9d3cac18dc5",
-            "size": 10321,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_pg-tpch-q03-default.txt-Debug_/opt.yql_patched"
+            "checksum": "0fcc6d9f8252305e7dcf18bd7bc41c8e",
+            "size": 10402,
+            "uri": "https://{canondata_backend}/1936947/b14365c0952114963187cbee00dc1b3a4979f77d/resource.tar.gz#test.test_pg-tpch-q03-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q03-default.txt-Plan]": [
@@ -2157,9 +2157,9 @@
     ],
     "test.test[pg-tpch-q08-default.txt-Debug]": [
         {
-            "checksum": "2e515ef080d6e9486d92b50f6bd9f7b2",
-            "size": 20329,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_pg-tpch-q08-default.txt-Debug_/opt.yql_patched"
+            "checksum": "64916bfd0f2d693c283b9a59b25efaa4",
+            "size": 20561,
+            "uri": "https://{canondata_backend}/1936947/b14365c0952114963187cbee00dc1b3a4979f77d/resource.tar.gz#test.test_pg-tpch-q08-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q08-default.txt-Plan]": [
@@ -2171,9 +2171,9 @@
     ],
     "test.test[pg-tpch-q21-default.txt-Debug]": [
         {
-            "checksum": "444f85adf431094d43b43d9bf5143eac",
-            "size": 17303,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_pg-tpch-q21-default.txt-Debug_/opt.yql_patched"
+            "checksum": "9d7e8dfb3e0d4ea1e3eff1abbfffadd2",
+            "size": 17509,
+            "uri": "https://{canondata_backend}/1936947/b14365c0952114963187cbee00dc1b3a4979f77d/resource.tar.gz#test.test_pg-tpch-q21-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-tpch-q21-default.txt-Plan]": [
@@ -2227,9 +2227,9 @@
     ],
     "test.test[sampling-mapjoin_left_sample-default.txt-Debug]": [
         {
-            "checksum": "8c1f6f5f0f64181bac1fb7d254f7b83b",
-            "size": 2277,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_sampling-mapjoin_left_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "982781758d7caf7f671e8d093bdcb586",
+            "size": 2285,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_sampling-mapjoin_left_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-mapjoin_left_sample-default.txt-Plan]": [
@@ -2241,9 +2241,9 @@
     ],
     "test.test[sampling-mapjoin_right_sample-default.txt-Debug]": [
         {
-            "checksum": "15741edd1f92637ccb697fb25dcbc610",
-            "size": 2277,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_sampling-mapjoin_right_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "137f2e0f1e56893c3cf8e305eb0fde22",
+            "size": 2285,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_sampling-mapjoin_right_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-mapjoin_right_sample-default.txt-Plan]": [
@@ -2255,9 +2255,9 @@
     ],
     "test.test[sampling-orderedjoin_left_sample-default.txt-Debug]": [
         {
-            "checksum": "f7e8ac206b785abd88c8a49eea96811c",
-            "size": 2282,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_sampling-orderedjoin_left_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "f9bbe711f25b46417ee91998513fcb25",
+            "size": 2290,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_sampling-orderedjoin_left_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-orderedjoin_left_sample-default.txt-Plan]": [
@@ -2269,9 +2269,9 @@
     ],
     "test.test[sampling-orderedjoin_right_sample-default.txt-Debug]": [
         {
-            "checksum": "c6cdb2418a72519f79222a7eb16ebf42",
-            "size": 2282,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_sampling-orderedjoin_right_sample-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ce1d1a9135e3fa7cf824c393d0ba00fb",
+            "size": 2290,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_sampling-orderedjoin_right_sample-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[sampling-orderedjoin_right_sample-default.txt-Plan]": [
@@ -2535,9 +2535,9 @@
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Debug]": [
         {
-            "checksum": "721ad556d22c4b83ec17254d9393cc68",
-            "size": 2795,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Debug_/opt.yql_patched"
+            "checksum": "306260bcb99d6e6d9f58c03d5f207ff8",
+            "size": 2801,
+            "uri": "https://{canondata_backend}/1924537/7e443cecbedc2ebcee4ff4f3c6247dd6fd1767b4/resource.tar.gz#test.test_simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[simple_columns-simple_columns_join_subreq_same_key_by_all-default.txt-Plan]": [
@@ -2577,9 +2577,9 @@
     ],
     "test.test[tpch-q5-default.txt-Debug]": [
         {
-            "checksum": "8470155a6e1feb3b08c15b66063f701c",
-            "size": 13672,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_tpch-q5-default.txt-Debug_/opt.yql_patched"
+            "checksum": "0fbd7d53fcff063050b969a078732e5d",
+            "size": 13812,
+            "uri": "https://{canondata_backend}/1936947/b14365c0952114963187cbee00dc1b3a4979f77d/resource.tar.gz#test.test_tpch-q5-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q5-default.txt-Plan]": [
@@ -2591,9 +2591,9 @@
     ],
     "test.test[tpch-q8-default.txt-Debug]": [
         {
-            "checksum": "27406da11727a27a4c98162d7f705409",
-            "size": 19058,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_tpch-q8-default.txt-Debug_/opt.yql_patched"
+            "checksum": "d2f1710f0d2f12302fd410d1ba5605ff",
+            "size": 19208,
+            "uri": "https://{canondata_backend}/1936947/b14365c0952114963187cbee00dc1b3a4979f77d/resource.tar.gz#test.test_tpch-q8-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q8-default.txt-Plan]": [
@@ -2605,9 +2605,9 @@
     ],
     "test.test[tpch-q9-default.txt-Debug]": [
         {
-            "checksum": "4c39d31c4a7eac9f220149a988a709e2",
-            "size": 14919,
-            "uri": "https://{canondata_backend}/1889210/796baf28896eb5aaad8828a0b6000e7d17563447/resource.tar.gz#test.test_tpch-q9-default.txt-Debug_/opt.yql_patched"
+            "checksum": "4637633ec50ab3501580a80c8bb2cc1e",
+            "size": 15065,
+            "uri": "https://{canondata_backend}/1936947/b14365c0952114963187cbee00dc1b3a4979f77d/resource.tar.gz#test.test_tpch-q9-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[tpch-q9-default.txt-Plan]": [