[SPARK-48000][SQL] Enable hash join support for all collations (StringType) #46599
Conversation
This file contains 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
dbatomic
reviewed
May 16, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/CollationKey.scala
Outdated
Show resolved
Hide resolved
dbatomic
reviewed
May 16, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/joins.scala
Outdated
Show resolved
Hide resolved
dbatomic
reviewed
May 16, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
dbatomic
reviewed
May 16, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 16, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/RewriteCollationJoin.scala
Outdated
Show resolved
Hide resolved
uros-db
changed the title
dbatomic
reviewed
May 17, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
dbatomic
reviewed
May 17, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/CollationKey.scala
Outdated
Show resolved
Hide resolved
dbatomic
reviewed
May 17, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
dbatomic
approved these changes
May 17, 2024
cloud-fan
reviewed
May 22, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/RewriteCollationJoin.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 22, 2024
common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
Show resolved
Hide resolved
cloud-fan
reviewed
May 22, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/RewriteCollationJoin.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 24, 2024
| @@ -250,7 +250,8 @@ abstract class Optimizer(catalogManager: CatalogManager) | |||
| InsertMapSortInGroupingExpressions) :+ | |||
| // This batch must be executed after the `RewriteSubquery` batch, which creates joins. | |||
| Batch("NormalizeFloatingNumbers", Once, NormalizeFloatingNumbers) :+ | |||
| Batch("ReplaceUpdateFieldsExpression", Once, ReplaceUpdateFieldsExpression) | |||
| Batch("ReplaceUpdateFieldsExpression", Once, ReplaceUpdateFieldsExpression) :+ | |||
| Batch("RewriteCollationJoin", Once, RewriteCollationJoin) | |||
There was a problem hiding this comment.
since this enlarges the query plan (adding CollationKey), we should do it as late as possible: the last rule in SparkOptimizer
There was a problem hiding this comment.
moved RewriteCollationJoin to SparkOptimizer.postHocOptimizationBatches (I think this would be the last possible place)
cloud-fan
approved these changes
May 24, 2024
uros-db
commented
May 24, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 28, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 28, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 28, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
Outdated
Show resolved
Hide resolved
|
@uros-db unfortunately it has merge conflicts now... |
cloud-fan
approved these changes
May 28, 2024
|
thanks, merging to master! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changes were proposed in this pull request?
Enable collation support for hash join on StringType. Note: support for complex types will be added separately.
CollationKeyCollationKeyis a unary expression that transformsStringTypetoBinaryTypeWhy are the changes needed?
Improve JOIN performance for collated strings.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
CollationKeyinCollationExpressionSuiteRewriteCollationJoininCollationSuiteWas this patch authored or co-authored using generative AI tooling?
No.