Lowered threshold for MapJoin (#8147)

pavelvelikhov · web-flow · commit ba138ae20ffb · 2024-08-22T12:16:42.000Z
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_cbo.cpp b/ydb/core/kqp/opt/logical/kqp_opt_cbo.cpp
@@ -163,7 +163,7 @@ bool TKqpProviderContext::IsJoinApplicable(const std::shared_ptr<IBaseOptimizerN
             return IsLookupJoinApplicable(right, left, joinConditions, rightJoinKeys, leftJoinKeys, *this);
 
         case EJoinAlgoType::MapJoin:
-            return joinKind != EJoinKind::OuterJoin && joinKind != EJoinKind::Exclusion && right->Stats->ByteSize < 5e8;
+            return joinKind != EJoinKind::OuterJoin && joinKind != EJoinKind::Exclusion && right->Stats->ByteSize < 1e8;
         case EJoinAlgoType::GraceJoin:
             return true;
         default:
diff --git a/ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s.json b/ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s.json
@@ -89,7 +89,7 @@
                                                                                       "table":"test\/ds\/customer_address"
                                                                                     },
                                                                                     {
-                                                                                      "op_name":"InnerJoin (MapJoin)",
+                                                                                      "op_name":"InnerJoin (Grace)",
                                                                                       "args":
                                                                                         [
                                                                                           {
@@ -273,7 +273,7 @@
                                                                                       "table":"test\/ds\/customer_address"
                                                                                     },
                                                                                     {
-                                                                                      "op_name":"InnerJoin (MapJoin)",
+                                                                                      "op_name":"InnerJoin (Grace)",
                                                                                       "args":
                                                                                         [
                                                                                           {
diff --git a/ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s_column_store.json b/ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s_column_store.json
@@ -89,7 +89,7 @@
                                                                                       "table":"test\/ds\/customer_address"
                                                                                     },
                                                                                     {
-                                                                                      "op_name":"InnerJoin (MapJoin)",
+                                                                                      "op_name":"InnerJoin (Grace)",
                                                                                       "args":
                                                                                         [
                                                                                           {
@@ -273,7 +273,7 @@
                                                                                       "table":"test\/ds\/customer_address"
                                                                                     },
                                                                                     {
-                                                                                      "op_name":"InnerJoin (MapJoin)",
+                                                                                      "op_name":"InnerJoin (Grace)",
                                                                                       "args":
                                                                                         [
                                                                                           {
diff --git a/ydb/core/kqp/ut/join/data/join_order/tpch2_1000s.json b/ydb/core/kqp/ut/join/data/join_order/tpch2_1000s.json
@@ -1,9 +1,9 @@
 {
-  "op_name":"InnerJoin (MapJoin)",
+  "op_name":"InnerJoin (Grace)",
   "args":
     [
       {
-        "op_name":"InnerJoin (MapJoin)",
+        "op_name":"InnerJoin (Grace)",
         "args":
           [
             {
@@ -41,7 +41,7 @@
         "args":
           [
             {
-              "op_name":"InnerJoin (MapJoin)",
+              "op_name":"InnerJoin (Grace)",
               "args":
                 [
                   {
diff --git a/ydb/core/kqp/ut/join/data/join_order/tpch2_1000s_column_store.json b/ydb/core/kqp/ut/join/data/join_order/tpch2_1000s_column_store.json
@@ -1,9 +1,9 @@
 {
-  "op_name":"InnerJoin (MapJoin)",
+  "op_name":"InnerJoin (Grace)",
   "args":
     [
       {
-        "op_name":"InnerJoin (MapJoin)",
+        "op_name":"InnerJoin (Grace)",
         "args":
           [
             {
@@ -41,7 +41,7 @@
         "args":
           [
             {
-              "op_name":"InnerJoin (MapJoin)",
+              "op_name":"InnerJoin (Grace)",
               "args":
                 [
                   {
diff --git a/ydb/core/kqp/ut/join/data/join_order/tpch9_1000s.json b/ydb/core/kqp/ut/join/data/join_order/tpch9_1000s.json
@@ -1,5 +1,5 @@
 {
-  "op_name":"InnerJoin (MapJoin)",
+  "op_name":"InnerJoin (Grace)",
   "args":
     [
       {
@@ -19,7 +19,7 @@
                     "table":"lineitem"
                   },
                   {
-                    "op_name":"InnerJoin (MapJoin)",
+                    "op_name":"InnerJoin (Grace)",
                     "args":
                       [
                         {
diff --git a/ydb/core/kqp/ut/join/data/join_order/tpch9_1000s_column_store.json b/ydb/core/kqp/ut/join/data/join_order/tpch9_1000s_column_store.json
@@ -1,5 +1,5 @@
 {
-  "op_name":"InnerJoin (MapJoin)",
+  "op_name":"InnerJoin (Grace)",
   "args":
     [
       {
@@ -19,7 +19,7 @@
                     "table":"lineitem"
                   },
                   {
-                    "op_name":"InnerJoin (MapJoin)",
+                    "op_name":"InnerJoin (Grace)",
                     "args":
                       [
                         {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`"table":"test\/ds\/customer_address"`
`90`	`90`	`},`
`91`	`91`	`{`
`92`		`- "op_name":"InnerJoin (MapJoin)",`
	`92`	`+ "op_name":"InnerJoin (Grace)",`
`93`	`93`	`"args":`
`94`	`94`	`[`
`95`	`95`	`{`
`@@ -273,7 +273,7 @@`
`273`	`273`	`"table":"test\/ds\/customer_address"`
`274`	`274`	`},`
`275`	`275`	`{`
`276`		`- "op_name":"InnerJoin (MapJoin)",`
	`276`	`+ "op_name":"InnerJoin (Grace)",`
`277`	`277`	`"args":`
`278`	`278`	`[`
`279`	`279`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "op_name":"InnerJoin (MapJoin)",`
	`2`	`+ "op_name":"InnerJoin (Grace)",`
`3`	`3`	`"args":`
`4`	`4`	`[`
`5`	`5`	`{`
`6`		`- "op_name":"InnerJoin (MapJoin)",`
	`6`	`+ "op_name":"InnerJoin (Grace)",`
`7`	`7`	`"args":`
`8`	`8`	`[`
`9`	`9`	`{`
`@@ -41,7 +41,7 @@`
`41`	`41`	`"args":`
`42`	`42`	`[`
`43`	`43`	`{`
`44`		`- "op_name":"InnerJoin (MapJoin)",`
	`44`	`+ "op_name":"InnerJoin (Grace)",`
`45`	`45`	`"args":`
`46`	`46`	`[`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "op_name":"InnerJoin (MapJoin)",`
	`2`	`+ "op_name":"InnerJoin (Grace)",`
`3`	`3`	`"args":`
`4`	`4`	`[`
`5`	`5`	`{`
`@@ -19,7 +19,7 @@`
`19`	`19`	`"table":"lineitem"`
`20`	`20`	`},`
`21`	`21`	`{`
`22`		`- "op_name":"InnerJoin (MapJoin)",`
	`22`	`+ "op_name":"InnerJoin (Grace)",`
`23`	`23`	`"args":`
`24`	`24`	`[`
`25`	`25`	`{`