Skip to content
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

Support split broadcast join condition into ast and non-ast [databricks] #9760

Merged
merged 36 commits into from
Dec 12, 2023

Conversation

winningsix
Copy link
Collaborator

This fixes #9759. Following similar approach as nested loop join case.

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
@winningsix winningsix marked this pull request as ready for review November 16, 2023 22:52
@winningsix
Copy link
Collaborator Author

build

@winningsix
Copy link
Collaborator Author

Will take care of DBX failure.

@winningsix
Copy link
Collaborator Author

build

@winningsix
Copy link
Collaborator Author

build

@winningsix
Copy link
Collaborator Author

build

@winningsix winningsix marked this pull request as draft November 22, 2023 23:55
@winningsix
Copy link
Collaborator Author

Trying to avoid wrapping a placeholder project node to workaround output attribute.

@winningsix
Copy link
Collaborator Author

build

@winningsix winningsix marked this pull request as ready for review November 25, 2023 01:05
@winningsix
Copy link
Collaborator Author

build

@winningsix
Copy link
Collaborator Author

build

@winningsix
Copy link
Collaborator Author

Comments addressed. Please help take further look. @jlowe Thanks!

…n/GpuBroadcastHashJoinExecBase.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>
@winningsix
Copy link
Collaborator Author

winningsix commented Dec 7, 2023

DB CI failed due to #9977

@winningsix
Copy link
Collaborator Author

build

Copy link
Member

@jlowe jlowe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall, just minor cleanups

winningsix and others added 9 commits December 8, 2023 06:57
…n/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>
…n/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>
…n/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>
…n/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>
@winningsix
Copy link
Collaborator Author

build

@winningsix
Copy link
Collaborator Author

@NVnavkumar can you help take a look? All comments are addressed with checks passed. Thanks!

@winningsix winningsix merged commit 7c307d4 into NVIDIA:branch-24.02 Dec 12, 2023
38 checks passed
@winningsix winningsix deleted the asthbj branch December 12, 2023 00:00
firestarman pushed a commit to firestarman/spark-rapids that referenced this pull request Dec 12, 2023
…ks] (NVIDIA#9760)

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
Co-authored-by: Jason Lowe <jlowe@nvidia.com>
Co-authored-by: Navin Kumar <97137715+NVnavkumar@users.noreply.github.com>
firestarman added a commit to firestarman/spark-rapids that referenced this pull request Dec 12, 2023
* Merged NVDA/branch-23.12

* Support split broadcast join condition into ast and non-ast [databricks] (NVIDIA#9760)

---------
Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
Co-authored-by: Ferdinand Xu <ferdinandx@nvidia.com>
Co-authored-by: Jason Lowe <jlowe@nvidia.com>
Co-authored-by: Navin Kumar <97137715+NVnavkumar@users.noreply.github.com>
winningsix added a commit to winningsix/spark-rapids that referenced this pull request Dec 18, 2023
winningsix added a commit to winningsix/spark-rapids that referenced this pull request Dec 18, 2023
…databricks] (NVIDIA#9760)"

This reverts commit 7c307d4.

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
jbrennan333 pushed a commit that referenced this pull request Dec 19, 2023
…databricks] (#9760)"

This reverts commit 7c307d4.

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
gerashegalov pushed a commit to gerashegalov/spark-rapids that referenced this pull request Dec 23, 2023
…ks] (NVIDIA#9760)

* Support split broadcast join condition into ast and non-ast

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>

* Fix

* Fix compile

* Fix

* Fix

* Address comments

* Fix

Update all versions

* Fix

* Fix

* Fix Spark 311

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuBroadcastHashJoinExecBase.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Address comments

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Fix scala 2.13, code style, refactor

* Minor fix

* minor

* Fix scala 2.13

* Fix DBX

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Navin Kumar <97137715+NVnavkumar@users.noreply.github.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Fix scala 2.13, refactor

* Revert unnecessary changes

* Fix failed UT

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

---------

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
Co-authored-by: Jason Lowe <jlowe@nvidia.com>
Co-authored-by: Navin Kumar <97137715+NVnavkumar@users.noreply.github.com>
winningsix added a commit to firestarman/spark-rapids that referenced this pull request Jan 22, 2024
…ks] (NVIDIA#9760)

* Support split broadcast join condition into ast and non-ast

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>

* Fix

* Fix compile

* Fix

* Fix

* Address comments

* Fix

Update all versions

* Fix

* Fix

* Fix Spark 311

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuBroadcastHashJoinExecBase.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Address comments

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Fix scala 2.13, code style, refactor

* Minor fix

* minor

* Fix scala 2.13

* Fix DBX

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Navin Kumar <97137715+NVnavkumar@users.noreply.github.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Fix scala 2.13, refactor

* Revert unnecessary changes

* Fix failed UT

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/org/apache/spark/sql/rapids/execution/GpuHashJoin.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update sql-plugin/src/main/scala/com/nvidia/spark/rapids/AstUtil.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

---------

Signed-off-by: Ferdinand Xu <ferdinandx@nvidia.com>
Co-authored-by: Jason Lowe <jlowe@nvidia.com>
Co-authored-by: Navin Kumar <97137715+NVnavkumar@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature request New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEA] support split join condition for broadcast hash join into AST and non-AST
4 participants