Switched off GraceSelfJoinCore (#7308)

Author: pavelvelikhov

ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s.json

@@ -1 +1 @@
-{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/income_band"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/income_band"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/promotion"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/date_dim"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/date_dim"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (Grace)","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/catalog_returns"}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/store_returns"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/item"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/date_dim"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/store_sales"},{"op_name":"TableFullScan","table":"test\/ds\/store"}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/income_band"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/income_band"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/promotion"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/date_dim"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/date_dim"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (Grace)","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/catalog_returns"}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/store_returns"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/item"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/date_dim"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/store_sales"},{"op_name":"TableFullScan","table":"test\/ds\/store"}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}
+{"op_name":"InnerJoin (Grace)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (Grace)","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/catalog_returns"}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/store_returns"},{"op_name":"TableFullScan","table":"test\/ds\/item"}]}]}]}]},{"op_name":"TableFullScan","table":"test\/ds\/date_dim"}]},{"op_name":"TableFullScan","table":"test\/ds\/store"}]}]}]},{"op_name":"TableFullScan","table":"test\/ds\/date_dim"}]},{"op_name":"TableFullScan","table":"test\/ds\/date_dim"}]},{"op_name":"TableFullScan","table":"test\/ds\/promotion"}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"TableFullScan","table":"test\/ds\/income_band"}]}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"TableFullScan","table":"test\/ds\/income_band"}]}]}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (Grace)","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/catalog_returns"}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_demographics"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/customer_address"},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/store_returns"},{"op_name":"TableFullScan","table":"test\/ds\/item"}]}]}]}]},{"op_name":"TableFullScan","table":"test\/ds\/date_dim"}]},{"op_name":"TableFullScan","table":"test\/ds\/store"}]}]}]},{"op_name":"TableFullScan","table":"test\/ds\/date_dim"}]},{"op_name":"TableFullScan","table":"test\/ds\/date_dim"}]},{"op_name":"TableFullScan","table":"test\/ds\/promotion"}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"TableFullScan","table":"test\/ds\/income_band"}]}]},{"op_name":"InnerJoin (MapJoin)","args":[{"op_name":"TableFullScan","table":"test\/ds\/household_demographics"},{"op_name":"TableFullScan","table":"test\/ds\/income_band"}]}]}]}]}

ydb/core/kqp/ut/join/data/join_order/tpcds64_small_1000s.json

@@ -0,0 +1 @@
+{"op_name":"InnerJoin (Grace)","args":[{"op_name":"CrossJoin","args":[{"op_name":"CrossJoin","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/store"}]},{"op_name":"TableFullScan","table":"test\/ds\/item"}]},{"op_name":"CrossJoin","args":[{"op_name":"CrossJoin","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/store"}]},{"op_name":"TableFullScan","table":"test\/ds\/item"}]}]}

ydb/core/kqp/ut/join/data/queries/tpcds64_small.sql

@@ -0,0 +1,42 @@
+PRAGMA TablePathPrefix='/Root/test/ds';
+
+--- NB: Subquerys
+
+$cs_ui =
+
+ (select catalog_sales.cs_item_sk
+
+  from catalog_sales as catalog_sales
+
+  group by catalog_sales.cs_item_sk
+);
+
+$cross_sales =
+
+ (select item.i_product_name product_name
+
+     ,store.s_store_name store_name
+
+  FROM  $cs_ui cs_ui
+
+        cross join store as store
+
+        cross join item as item
+
+group by item.i_product_name
+
+       ,store.s_store_name
+
+);
+
+-- start query 1 in stream 0 using template query64.tpl and seed 1220860970
+
+select cs1.product_name
+
+from $cross_sales cs1 cross join $cross_sales cs2
+
+where cs1.store_name = cs2.store_name;
+
+
+
+-- end query 1 in stream 0 using template query64.tpl

ydb/core/kqp/ut/join/kqp_join_order_ut.cpp

@@ -335,13 +335,19 @@ void ExecuteJoinOrderTestDataQueryWithStats(const TString& queryPath, const TStr
         );
     }
 
-/*
+
     Y_UNIT_TEST_TWIN(OverrideStatsTPCDS64, StreamLookupJoin) {
         JoinOrderTestWithOverridenStats(
             "queries/tpcds64.sql", "stats/tpcds1000s.json", "join_order/tpcds64_1000s.json", StreamLookupJoin
         );
     }
-*/
+
+
+    Y_UNIT_TEST_TWIN(OverrideStatsTPCDS64_small, StreamLookupJoin) {
+        JoinOrderTestWithOverridenStats(
+            "queries/tpcds64_small.sql", "stats/tpcds1000s.json", "join_order/tpcds64_small_1000s.json", StreamLookupJoin
+        );
+    }
 
     Y_UNIT_TEST_TWIN(OverrideStatsTPCDS78, StreamLookupJoin) {
         JoinOrderTestWithOverridenStats(

ydb/core/kqp/ut/spilling/kqp_scan_spilling_ut.cpp

@@ -90,7 +90,8 @@ Y_UNIT_TEST_TWIN(SpillingInRuntimeNodes, EnabledSpilling) {
     auto query = R"(
         --!syntax_v1
         PRAGMA ydb.EnableSpillingNodes="GraceJoin";
-        PRAGMA ydb.OverrideStatistics='{"/Root/KeyValue" : {"n_rows":10e9, "byte_size":10e9}}';
+        PRAGMA ydb.CostBasedOptimizationLevel='0';
+        PRAGMA ydb.HashJoinMode='graceandself';
         select t1.Key, t1.Value, t2.Key, t2.Value
         from `/Root/KeyValue` as t1 full join `/Root/KeyValue` as t2 on t1.Value = t2.Value
         order by t1.Value

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

@@ -2626,7 +2626,7 @@ TExprBase DqBuildJoin(const TExprBase& node, TExprContext& ctx, IOptimizationCon
     if (joinAlgo == EJoinAlgoType::MapJoin && mapJoinCanBeApplied) {
         hashJoin = EHashJoinMode::Map;
     } else if (joinAlgo == EJoinAlgoType::GraceJoin) {
-        hashJoin = EHashJoinMode::GraceAndSelf;
+        hashJoin = EHashJoinMode::Grace;
     }
 
     bool useHashJoin = EHashJoinMode::Off != hashJoin