You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@datafusion.apache.org by "eejbyfeldt (via GitHub)" <gi...@apache.org> on 2024/07/29 07:28:27 UTC
[PR] fix: Supported nested types in HashJoin [datafusion-comet]
eejbyfeldt opened a new pull request, #735:
URL: https://github.com/apache/datafusion-comet/pull/735
## Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
Closes #.
## Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
## What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
## How are these changes tested?
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "andygrove (via GitHub)" <gi...@apache.org>.
andygrove commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1714438762
##########
spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala:
##########
@@ -192,6 +192,13 @@ class CometJoinSuite extends CometTestBase {
// DataFusion HashJoin LeftAnti has bugs in handling nulls and is disabled for now.
// left.join(right, left("_2") === right("_1"), "leftanti")
+
+ // Full join: struct key
Review Comment:
Good point about map not being supported by Spark.
I think we should fall back for array for now because we don't really support array yet.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1710123942
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -2718,11 +2718,6 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
return None
}
- if ((join.leftKeys ++ join.rightKeys).exists(_.dataType.isInstanceOf[StructType])) {
- withInfo(join, "Unsupported struct data type in join keys")
- return None
- }
Review Comment:
We should further check if the data types are supported using `supportedDataType`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "andygrove (via GitHub)" <gi...@apache.org>.
andygrove commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1714437945
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -2724,8 +2724,9 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
return None
}
- if ((join.leftKeys ++ join.rightKeys).exists(_.dataType.isInstanceOf[StructType])) {
- withInfo(join, "Unsupported struct data type in join keys")
+ val keyTypes = (join.leftKeys ++ join.rightKeys).map(_.dataType)
Review Comment:
nit: could probably add a `.distinct` on the end of this line and reduce the number of calls to check supported types?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "eejbyfeldt (via GitHub)" <gi...@apache.org>.
eejbyfeldt commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1710164761
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -2718,11 +2718,6 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
return None
}
- if ((join.leftKeys ++ join.rightKeys).exists(_.dataType.isInstanceOf[StructType])) {
- withInfo(join, "Unsupported struct data type in join keys")
- return None
- }
Review Comment:
So instead of removing this condition we change it to something like
```scala
if ((join.leftKeys ++ join.rightKeys).exists(e => !supportedDataType(e.dataType, allowStruct = true))) {
withInfo(join, "Unsupported data type in join keys")
return None
}
```
?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "andygrove (via GitHub)" <gi...@apache.org>.
andygrove commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1715605905
##########
spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala:
##########
@@ -192,6 +192,13 @@ class CometJoinSuite extends CometTestBase {
// DataFusion HashJoin LeftAnti has bugs in handling nulls and is disabled for now.
// left.join(right, left("_2") === right("_1"), "leftanti")
+
+ // Full join: struct key
Review Comment:
I think we could improve our test framework to make it easier to test for fallback but it is possible with code like this (must be used after calling collect on a DataFrame). I think we can improve the tests in a future PR.
```
val str =
new ExtendedExplainInfo().generateExtendedInfo(df.queryExecution.executedPlan)
assert(str.contains(expectedMessage))
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "andygrove (via GitHub)" <gi...@apache.org>.
andygrove merged PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "andygrove (via GitHub)" <gi...@apache.org>.
andygrove commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1708187757
##########
spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala:
##########
@@ -192,6 +192,13 @@ class CometJoinSuite extends CometTestBase {
// DataFusion HashJoin LeftAnti has bugs in handling nulls and is disabled for now.
// left.join(right, left("_2") === right("_1"), "leftanti")
+
+ // Full join: struct key
Review Comment:
Thanks for adding the test. I wonder if we should make this more comprehensive to cover structs containing different types, nulls, and nested structs?
Also, what happens with structs containing unsupported types such as array and map? Do we still fall back for those? It would be good to have a test for this case as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "eejbyfeldt (via GitHub)" <gi...@apache.org>.
eejbyfeldt commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1710119011
##########
spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala:
##########
@@ -192,6 +192,13 @@ class CometJoinSuite extends CometTestBase {
// DataFusion HashJoin LeftAnti has bugs in handling nulls and is disabled for now.
// left.join(right, left("_2") === right("_1"), "leftanti")
+
+ // Full join: struct key
Review Comment:
Good call will add more test cases. Created #797 to make it easier to create nulls of struct type.
> Also, what happens with structs containing unsupported types such as array and map?
Do you mean unsupported by comet here? I think the answer for `map` is that spark does not support joining on `map` so it will fail during the Spark planning stage. I will add a test for array by I guess that requires something like #793 first since we do not support reading arrays from parquet. Or is there some other way testing with arrays?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1714452934
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -2718,11 +2718,6 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
return None
}
- if ((join.leftKeys ++ join.rightKeys).exists(_.dataType.isInstanceOf[StructType])) {
- withInfo(join, "Unsupported struct data type in join keys")
- return None
- }
Review Comment:
Oh, I rethink about this. `supportedDataType` doesn't mean Join operator key support. We don't need it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "eejbyfeldt (via GitHub)" <gi...@apache.org>.
eejbyfeldt commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1714808516
##########
spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala:
##########
@@ -192,6 +192,13 @@ class CometJoinSuite extends CometTestBase {
// DataFusion HashJoin LeftAnti has bugs in handling nulls and is disabled for now.
// left.join(right, left("_2") === right("_1"), "leftanti")
+
+ // Full join: struct key
Review Comment:
We do fallback currently. Is there someway or even desired to add a test for that?
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -2718,11 +2718,6 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
return None
}
- if ((join.leftKeys ++ join.rightKeys).exists(_.dataType.isInstanceOf[StructType])) {
- withInfo(join, "Unsupported struct data type in join keys")
- return None
- }
Review Comment:
Removed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] fix: Supported nested types in HashJoin [datafusion-comet]
Posted by "eejbyfeldt (via GitHub)" <gi...@apache.org>.
eejbyfeldt commented on code in PR #735:
URL: https://github.com/apache/datafusion-comet/pull/735#discussion_r1714810508
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -2724,8 +2724,9 @@ object QueryPlanSerde extends Logging with ShimQueryPlanSerde with CometExprShim
return None
}
- if ((join.leftKeys ++ join.rightKeys).exists(_.dataType.isInstanceOf[StructType])) {
- withInfo(join, "Unsupported struct data type in join keys")
+ val keyTypes = (join.leftKeys ++ join.rightKeys).map(_.dataType)
Review Comment:
This got removed due to this comment: https://github.com/apache/datafusion-comet/pull/735#discussion_r1714452934
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org