-
Notifications
You must be signed in to change notification settings - Fork 566
[GLUTEN-3559][CORE] Fix output partitioning of Hash join #4342
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
zhli1142015
merged 5 commits into
apache:main
from
ayushi-agarwal:fix-join-partitioning
Jan 12, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
.../spark32/src/main/scala/org/apache/spark/sql/execution/ExpandOutputPartitioningShim.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.sql.execution | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.Expression | ||
| import org.apache.spark.sql.catalyst.plans.{InnerLike, JoinType} | ||
| import org.apache.spark.sql.catalyst.plans.physical.{HashPartitioning, Partitioning, PartitioningCollection} | ||
|
|
||
| import scala.collection.mutable | ||
|
|
||
| // https://issues.apache.org/jira/browse/SPARK-31869 | ||
| class ExpandOutputPartitioningShim( | ||
| streamedKeyExprs: Seq[Expression], | ||
| buildKeyExprs: Seq[Expression], | ||
| expandLimit: Int) { | ||
| // An one-to-many mapping from a streamed key to build keys. | ||
| private lazy val streamedKeyToBuildKeyMapping = { | ||
| val mapping = mutable.Map.empty[Expression, Seq[Expression]] | ||
| streamedKeyExprs.zip(buildKeyExprs).foreach { | ||
| case (streamedKey, buildKey) => | ||
| val key = streamedKey.canonicalized | ||
| mapping.get(key) match { | ||
| case Some(v) => mapping.put(key, v :+ buildKey) | ||
| case None => mapping.put(key, Seq(buildKey)) | ||
| } | ||
| } | ||
| mapping.toMap | ||
| } | ||
|
|
||
| def expandPartitioning(partitioning: Partitioning): Partitioning = { | ||
| partitioning match { | ||
| case h: HashPartitioning => expandOutputPartitioning(h) | ||
| case c: PartitioningCollection => expandOutputPartitioning(c) | ||
| case _ => partitioning | ||
| } | ||
| } | ||
|
|
||
| // Expands the given partitioning collection recursively. | ||
| private def expandOutputPartitioning( | ||
| partitioning: PartitioningCollection): PartitioningCollection = { | ||
| PartitioningCollection(partitioning.partitionings.flatMap { | ||
| case h: HashPartitioning => expandOutputPartitioning(h).partitionings | ||
| case c: PartitioningCollection => Seq(expandOutputPartitioning(c)) | ||
| case other => Seq(other) | ||
| }) | ||
| } | ||
|
|
||
| // Expands the given hash partitioning by substituting streamed keys with build keys. | ||
| // For example, if the expressions for the given partitioning are Seq("a", "b", "c") | ||
| // where the streamed keys are Seq("b", "c") and the build keys are Seq("x", "y"), | ||
| // the expanded partitioning will have the following expressions: | ||
| // Seq("a", "b", "c"), Seq("a", "b", "y"), Seq("a", "x", "c"), Seq("a", "x", "y"). | ||
| // The expanded expressions are returned as PartitioningCollection. | ||
| private def expandOutputPartitioning(partitioning: HashPartitioning): PartitioningCollection = { | ||
| val maxNumCombinations = expandLimit | ||
| var currentNumCombinations = 0 | ||
|
|
||
| def generateExprCombinations( | ||
| current: Seq[Expression], | ||
| accumulated: Seq[Expression]): Seq[Seq[Expression]] = { | ||
| if (currentNumCombinations >= maxNumCombinations) { | ||
| Nil | ||
| } else if (current.isEmpty) { | ||
| currentNumCombinations += 1 | ||
| Seq(accumulated) | ||
| } else { | ||
| val buildKeysOpt = streamedKeyToBuildKeyMapping.get(current.head.canonicalized) | ||
| generateExprCombinations(current.tail, accumulated :+ current.head) ++ | ||
| buildKeysOpt | ||
| .map(_.flatMap(b => generateExprCombinations(current.tail, accumulated :+ b))) | ||
| .getOrElse(Nil) | ||
| } | ||
| } | ||
|
|
||
| PartitioningCollection( | ||
| generateExprCombinations(partitioning.expressions, Nil) | ||
| .map(exprs => partitioning.withNewChildren(exprs).asInstanceOf[HashPartitioning])) | ||
| } | ||
| } |
93 changes: 93 additions & 0 deletions
93
.../spark33/src/main/scala/org/apache/spark/sql/execution/ExpandOutputPartitioningShim.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.sql.execution | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.Expression | ||
| import org.apache.spark.sql.catalyst.plans.{InnerLike, JoinType} | ||
| import org.apache.spark.sql.catalyst.plans.physical.{HashPartitioning, Partitioning, PartitioningCollection} | ||
|
|
||
| import scala.collection.mutable | ||
|
|
||
| // https://issues.apache.org/jira/browse/SPARK-31869 | ||
| class ExpandOutputPartitioningShim( | ||
| streamedKeyExprs: Seq[Expression], | ||
| buildKeyExprs: Seq[Expression], | ||
| expandLimit: Int) { | ||
| // An one-to-many mapping from a streamed key to build keys. | ||
| private lazy val streamedKeyToBuildKeyMapping = { | ||
| val mapping = mutable.Map.empty[Expression, Seq[Expression]] | ||
| streamedKeyExprs.zip(buildKeyExprs).foreach { | ||
| case (streamedKey, buildKey) => | ||
| val key = streamedKey.canonicalized | ||
| mapping.get(key) match { | ||
| case Some(v) => mapping.put(key, v :+ buildKey) | ||
| case None => mapping.put(key, Seq(buildKey)) | ||
| } | ||
| } | ||
| mapping.toMap | ||
| } | ||
|
|
||
| def expandPartitioning(partitioning: Partitioning): Partitioning = { | ||
| partitioning match { | ||
| case h: HashPartitioning => expandOutputPartitioning(h) | ||
| case c: PartitioningCollection => expandOutputPartitioning(c) | ||
| case _ => partitioning | ||
| } | ||
| } | ||
|
|
||
| // Expands the given partitioning collection recursively. | ||
| private def expandOutputPartitioning( | ||
| partitioning: PartitioningCollection): PartitioningCollection = { | ||
| PartitioningCollection(partitioning.partitionings.flatMap { | ||
| case h: HashPartitioning => expandOutputPartitioning(h).partitionings | ||
| case c: PartitioningCollection => Seq(expandOutputPartitioning(c)) | ||
| case other => Seq(other) | ||
| }) | ||
| } | ||
|
|
||
| // Expands the given hash partitioning by substituting streamed keys with build keys. | ||
| // For example, if the expressions for the given partitioning are Seq("a", "b", "c") | ||
| // where the streamed keys are Seq("b", "c") and the build keys are Seq("x", "y"), | ||
| // the expanded partitioning will have the following expressions: | ||
| // Seq("a", "b", "c"), Seq("a", "b", "y"), Seq("a", "x", "c"), Seq("a", "x", "y"). | ||
| // The expanded expressions are returned as PartitioningCollection. | ||
| private def expandOutputPartitioning(partitioning: HashPartitioning): PartitioningCollection = { | ||
| val maxNumCombinations = expandLimit | ||
| var currentNumCombinations = 0 | ||
|
|
||
| def generateExprCombinations( | ||
| current: Seq[Expression], | ||
| accumulated: Seq[Expression]): Seq[Seq[Expression]] = { | ||
| if (currentNumCombinations >= maxNumCombinations) { | ||
| Nil | ||
| } else if (current.isEmpty) { | ||
| currentNumCombinations += 1 | ||
| Seq(accumulated) | ||
| } else { | ||
| val buildKeysOpt = streamedKeyToBuildKeyMapping.get(current.head.canonicalized) | ||
| generateExprCombinations(current.tail, accumulated :+ current.head) ++ | ||
| buildKeysOpt | ||
| .map(_.flatMap(b => generateExprCombinations(current.tail, accumulated :+ b))) | ||
| .getOrElse(Nil) | ||
| } | ||
| } | ||
|
|
||
| PartitioningCollection( | ||
| generateExprCombinations(partitioning.expressions, Nil) | ||
| .map(exprs => partitioning.withNewChildren(exprs).asInstanceOf[HashPartitioning])) | ||
| } | ||
| } |
94 changes: 94 additions & 0 deletions
94
.../spark34/src/main/scala/org/apache/spark/sql/execution/ExpandOutputPartitioningShim.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.sql.execution | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions.Expression | ||
| import org.apache.spark.sql.catalyst.plans.{InnerLike, JoinType} | ||
| import org.apache.spark.sql.catalyst.plans.physical.{HashPartitioningLike, Partitioning, PartitioningCollection} | ||
|
|
||
| import scala.collection.mutable | ||
|
|
||
| // https://issues.apache.org/jira/browse/SPARK-31869 | ||
| class ExpandOutputPartitioningShim( | ||
| streamedKeyExprs: Seq[Expression], | ||
| buildKeyExprs: Seq[Expression], | ||
| expandLimit: Int) { | ||
| // An one-to-many mapping from a streamed key to build keys. | ||
| private lazy val streamedKeyToBuildKeyMapping = { | ||
| val mapping = mutable.Map.empty[Expression, Seq[Expression]] | ||
| streamedKeyExprs.zip(buildKeyExprs).foreach { | ||
| case (streamedKey, buildKey) => | ||
| val key = streamedKey.canonicalized | ||
| mapping.get(key) match { | ||
| case Some(v) => mapping.put(key, v :+ buildKey) | ||
| case None => mapping.put(key, Seq(buildKey)) | ||
| } | ||
| } | ||
| mapping.toMap | ||
| } | ||
|
|
||
| def expandPartitioning(partitioning: Partitioning): Partitioning = { | ||
| partitioning match { | ||
| case h: HashPartitioningLike => expandOutputPartitioning(h) | ||
| case c: PartitioningCollection => expandOutputPartitioning(c) | ||
| case _ => partitioning | ||
| } | ||
| } | ||
|
|
||
| // Expands the given partitioning collection recursively. | ||
| private def expandOutputPartitioning( | ||
| partitioning: PartitioningCollection): PartitioningCollection = { | ||
| PartitioningCollection(partitioning.partitionings.flatMap { | ||
| case h: HashPartitioningLike => expandOutputPartitioning(h).partitionings | ||
| case c: PartitioningCollection => Seq(expandOutputPartitioning(c)) | ||
| case other => Seq(other) | ||
| }) | ||
| } | ||
|
|
||
| // Expands the given hash partitioning by substituting streamed keys with build keys. | ||
| // For example, if the expressions for the given partitioning are Seq("a", "b", "c") | ||
| // where the streamed keys are Seq("b", "c") and the build keys are Seq("x", "y"), | ||
| // the expanded partitioning will have the following expressions: | ||
| // Seq("a", "b", "c"), Seq("a", "b", "y"), Seq("a", "x", "c"), Seq("a", "x", "y"). | ||
| // The expanded expressions are returned as PartitioningCollection. | ||
| private def expandOutputPartitioning( | ||
| partitioning: HashPartitioningLike): PartitioningCollection = { | ||
| val maxNumCombinations = expandLimit | ||
| var currentNumCombinations = 0 | ||
|
|
||
| def generateExprCombinations( | ||
| current: Seq[Expression], | ||
| accumulated: Seq[Expression]): Seq[Seq[Expression]] = { | ||
| if (currentNumCombinations >= maxNumCombinations) { | ||
| Nil | ||
| } else if (current.isEmpty) { | ||
| currentNumCombinations += 1 | ||
| Seq(accumulated) | ||
| } else { | ||
| val buildKeysOpt = streamedKeyToBuildKeyMapping.get(current.head.canonicalized) | ||
| generateExprCombinations(current.tail, accumulated :+ current.head) ++ | ||
| buildKeysOpt | ||
| .map(_.flatMap(b => generateExprCombinations(current.tail, accumulated :+ b))) | ||
| .getOrElse(Nil) | ||
| } | ||
| } | ||
|
|
||
| PartitioningCollection( | ||
| generateExprCombinations(partitioning.expressions, Nil) | ||
| .map(exprs => partitioning.withNewChildren(exprs).asInstanceOf[HashPartitioningLike])) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HashJoinLikeExecTransformer is also extended by ShuffledHashJoinExecTransformer. Do we need this fix for SHJ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I was looking into that, this change will help it there also so I think we can keep it for SHJ also.