Merge ec114e1 into 0032663

pavelvelikhov · web-flow · commit 61f39f219d25 · 2024-07-27T04:38:04.000Z
diff --git a/ydb/library/yql/dq/opt/dq_opt_phy.cpp b/ydb/library/yql/dq/opt/dq_opt_phy.cpp
@@ -2692,7 +2692,7 @@ TExprBase DqBuildJoin(const TExprBase& node, TExprContext& ctx, IOptimizationCon
         return node;
     }
 
-    if (useHashJoin && (hashJoin == EHashJoinMode::GraceAndSelf || shuffleMapJoin)) {
+    if (useHashJoin && (hashJoin == EHashJoinMode::GraceAndSelf || hashJoin == EHashJoinMode::Grace || shuffleMapJoin)) {
         return DqBuildHashJoin(join, hashJoin, ctx, optCtx);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2692,7 +2692,7 @@ TExprBase DqBuildJoin(const TExprBase& node, TExprContext& ctx, IOptimizationCon`
`2692`	`2692`	`return node;`
`2693`	`2693`	`}`
`2694`	`2694`
`2695`		`- if (useHashJoin && (hashJoin == EHashJoinMode::GraceAndSelf \|\| shuffleMapJoin)) {`
	`2695`	`+ if (useHashJoin && (hashJoin == EHashJoinMode::GraceAndSelf \|\| hashJoin == EHashJoinMode::Grace \|\| shuffleMapJoin)) {`
`2696`	`2696`	`return DqBuildHashJoin(join, hashJoin, ctx, optCtx);`
`2697`	`2697`	`}`
`2698`	`2698`