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.

Sign up for GitHub

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

Fix Support of MapType in joins on Databricks #3086

Merged
merged 2 commits into from
Jul 29, 2021
Merged

Fix Support of MapType in joins on Databricks #3086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1db614
Enable MapType for Joins in Databricks
tgravescs Jul 29, 2021
bfe33e4
Add maptype for join in spark301db shim
tgravescs Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions .../spark301db/src/main/scala/com/nvidia/spark/rapids/shims/spark301db/Spark301dbShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,20 +166,33 @@ class Spark301dbShims extends Spark301Shims {
GpuOverrides.exec[SortMergeJoinExec](
"Sort merge join, replacing with shuffled hash join",
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT).nested(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL
), TypeSig.all),
TypeSig.STRUCT + TypeSig.MAP)
.withPsNote(TypeEnum.ARRAY, "Cannot be used as join key")
.withPsNote(TypeEnum.STRUCT, "Cannot be used as join key")
.withPsNote(TypeEnum.MAP, "Cannot be used as join key")
.nested(TypeSig.commonCudfTypes + TypeSig.NULL +
TypeSig.DECIMAL), TypeSig.all),
(join, conf, p, r) => new GpuSortMergeJoinMeta(join, conf, p, r)),
GpuOverrides.exec[BroadcastHashJoinExec](
"Implementation of join using broadcast data",
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT).nested(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL
), TypeSig.all),
TypeSig.STRUCT + TypeSig.MAP)
.withPsNote(TypeEnum.ARRAY, "Cannot be used as join key")
.withPsNote(TypeEnum.STRUCT, "Cannot be used as join key")
.withPsNote(TypeEnum.MAP, "Cannot be used as join key")
.nested(TypeSig.commonCudfTypes + TypeSig.NULL +
TypeSig.DECIMAL)
, TypeSig.all),
(join, conf, p, r) => new GpuBroadcastHashJoinMeta(join, conf, p, r)),
GpuOverrides.exec[ShuffledHashJoinExec](
"Implementation of join using hashed shuffled data",
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT).nested(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL
), TypeSig.all),
TypeSig.STRUCT + TypeSig.MAP)
.withPsNote(TypeEnum.ARRAY, "Cannot be used as join key")
.withPsNote(TypeEnum.STRUCT, "Cannot be used as join key")
.withPsNote(TypeEnum.MAP, "Cannot be used as join key")
.nested(TypeSig.commonCudfTypes + TypeSig.NULL +
TypeSig.DECIMAL), TypeSig.all),
(join, conf, p, r) => new GpuShuffledHashJoinMeta(join, conf, p, r)),
GpuOverrides.exec[ArrowEvalPythonExec](
"The backend of the Scalar Pandas UDFs. Accelerates the data transfer between the" +
Expand Down
27 changes: 20 additions & 7 deletions .../spark311db/src/main/scala/com/nvidia/spark/rapids/shims/spark311db/Spark311dbShims.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,20 +169,33 @@ class Spark311dbShims extends Spark311Shims {
GpuOverrides.exec[SortMergeJoinExec](
"Sort merge join, replacing with shuffled hash join",
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT).nested(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL
), TypeSig.all),
TypeSig.STRUCT + TypeSig.MAP)
.withPsNote(TypeEnum.ARRAY, "Cannot be used as join key")
.withPsNote(TypeEnum.STRUCT, "Cannot be used as join key")
.withPsNote(TypeEnum.MAP, "Cannot be used as join key")
.nested(TypeSig.commonCudfTypes + TypeSig.NULL +
TypeSig.DECIMAL), TypeSig.all),
(join, conf, p, r) => new GpuSortMergeJoinMeta(join, conf, p, r)),
GpuOverrides.exec[BroadcastHashJoinExec](
"Implementation of join using broadcast data",
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT).nested(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL
), TypeSig.all),
TypeSig.STRUCT + TypeSig.MAP)
.withPsNote(TypeEnum.ARRAY, "Cannot be used as join key")
.withPsNote(TypeEnum.STRUCT, "Cannot be used as join key")
.withPsNote(TypeEnum.MAP, "Cannot be used as join key")
.nested(TypeSig.commonCudfTypes + TypeSig.NULL +
TypeSig.DECIMAL)
, TypeSig.all),
(join, conf, p, r) => new GpuBroadcastHashJoinMeta(join, conf, p, r)),
GpuOverrides.exec[ShuffledHashJoinExec](
"Implementation of join using hashed shuffled data",
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT).nested(TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL
), TypeSig.all),
ExecChecks((TypeSig.commonCudfTypes + TypeSig.NULL + TypeSig.DECIMAL + TypeSig.ARRAY +
TypeSig.STRUCT + TypeSig.MAP)
.withPsNote(TypeEnum.ARRAY, "Cannot be used as join key")
.withPsNote(TypeEnum.STRUCT, "Cannot be used as join key")
.withPsNote(TypeEnum.MAP, "Cannot be used as join key")
.nested(TypeSig.commonCudfTypes + TypeSig.NULL +
TypeSig.DECIMAL), TypeSig.all),
(join, conf, p, r) => new GpuShuffledHashJoinMeta(join, conf, p, r)),
GpuOverrides.exec[ArrowEvalPythonExec](
"The backend of the Scalar Pandas UDFs. Accelerates the data transfer between the" +
Expand Down