Lowered MapJoin threshold to avoid excessive broadcasts (#10288)

pavelvelikhov · web-flow · commit cb4e8c54df64 · 2024-10-10T18:27:54.000+03:00
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_cbo.cpp b/ydb/core/kqp/opt/logical/kqp_opt_cbo.cpp
@@ -165,7 +165,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 < 1e8;
+            return joinKind != EJoinKind::OuterJoin && joinKind != EJoinKind::Exclusion && right->Stats->ByteSize < 1e6;
         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
@@ -23,7 +23,7 @@
                                 "args":
                                   [
                                     {
-                                      "op_name":"InnerJoin (MapJoin)",
+                                      "op_name":"InnerJoin (Grace)",
                                       "args":
                                         [
                                           {
@@ -137,7 +137,7 @@
                                 "args":
                                   [
                                     {
-                                      "op_name":"InnerJoin (MapJoin)",
+                                      "op_name":"InnerJoin (Grace)",
                                       "args":
                                         [
                                           {
@@ -207,7 +207,7 @@
                                 "args":
                                   [
                                     {
-                                      "op_name":"InnerJoin (MapJoin)",
+                                      "op_name":"InnerJoin (Grace)",
                                       "args":
                                         [
                                           {
@@ -321,7 +321,7 @@
                                 "args":
                                   [
                                     {
-                                      "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
@@ -23,7 +23,7 @@
                                 "args":
                                   [
                                     {
-                                      "op_name":"InnerJoin (MapJoin)",
+                                      "op_name":"InnerJoin (Grace)",
                                       "args":
                                         [
                                           {
@@ -137,7 +137,7 @@
                                 "args":
                                   [
                                     {
-                                      "op_name":"InnerJoin (MapJoin)",
+                                      "op_name":"InnerJoin (Grace)",
                                       "args":
                                         [
                                           {
@@ -207,7 +207,7 @@
                                 "args":
                                   [
                                     {
-                                      "op_name":"InnerJoin (MapJoin)",
+                                      "op_name":"InnerJoin (Grace)",
                                       "args":
                                         [
                                           {
@@ -321,7 +321,7 @@
                                 "args":
                                   [
                                     {
-                                      "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
@@ -37,7 +37,7 @@
           ]
       },
       {
-        "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
@@ -37,7 +37,7 @@
           ]
       },
       {
-        "op_name":"InnerJoin (MapJoin)",
+        "op_name":"InnerJoin (Grace)",
         "args":
           [
             {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"args":`
`24`	`24`	`[`
`25`	`25`	`{`
`26`		`- "op_name":"InnerJoin (MapJoin)",`
	`26`	`+ "op_name":"InnerJoin (Grace)",`
`27`	`27`	`"args":`
`28`	`28`	`[`
`29`	`29`	`{`
`@@ -137,7 +137,7 @@`
`137`	`137`	`"args":`
`138`	`138`	`[`
`139`	`139`	`{`
`140`		`- "op_name":"InnerJoin (MapJoin)",`
	`140`	`+ "op_name":"InnerJoin (Grace)",`
`141`	`141`	`"args":`
`142`	`142`	`[`
`143`	`143`	`{`
`@@ -207,7 +207,7 @@`
`207`	`207`	`"args":`
`208`	`208`	`[`
`209`	`209`	`{`
`210`		`- "op_name":"InnerJoin (MapJoin)",`
	`210`	`+ "op_name":"InnerJoin (Grace)",`
`211`	`211`	`"args":`
`212`	`212`	`[`
`213`	`213`	`{`
`@@ -321,7 +321,7 @@`
`321`	`321`	`"args":`
`322`	`322`	`[`
`323`	`323`	`{`
`324`		`- "op_name":"InnerJoin (MapJoin)",`
	`324`	`+ "op_name":"InnerJoin (Grace)",`
`325`	`325`	`"args":`
`326`	`326`	`[`
`327`	`327`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`]`
`38`	`38`	`},`
`39`	`39`	`{`
`40`		`- "op_name":"InnerJoin (MapJoin)",`
	`40`	`+ "op_name":"InnerJoin (Grace)",`
`41`	`41`	`"args":`
`42`	`42`	`[`
`43`	`43`	`{`