[SPARK-42556][CONNECT] Dataset.colregex should link a plan_id when it only matches a single column. #40265
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
… only matches a single column.
hvanhovell
reviewed
Mar 3, 2023
| def colRegex(colName: String): Column = Column { builder => | ||
| builder.getUnresolvedRegexBuilder.setColName(colName) | ||
| def colRegex(colName: String): Column = { | ||
| val planId = if (plan.getRoot.hasCommon && plan.getRoot.getCommon.hasPlanId) { |
There was a problem hiding this comment.
Perhaps put this in a helper function?
|
@beliefer can you add a test to SparkPlannerSuite or ClientE2ESuite to make sure this properly works? |
|
cc @zhengruifeng can you also take a look? |
zhengruifeng
approved these changes
Mar 4, 2023
|
we'd better always add e2e tests, since it was added in |
zhengruifeng
pushed a commit
that referenced
this pull request
Mar 4, 2023
… only matches a single column ### What changes were proposed in this pull request? When colregex returns a single column it should link the plans plan_id. For reference here is the non-connect Dataset code that does this: https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala#L1512 This also needs to be fixed for the Python client. ### Why are the changes needed? Let the `UnresolvedAttribute` link plan_id if it is exist. ### Does this PR introduce _any_ user-facing change? 'No'. New feature. ### How was this patch tested? New test cases. Closes #40265 from beliefer/SPARK-42556. Authored-by: Jiaan Geng <beliefer@163.com> Signed-off-by: Ruifeng Zheng <ruifengz@apache.org> (cherry picked from commit c99a632) Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
|
merged into master/branch-3.4 |
|
@hvanhovell @zhengruifeng Thank you! |
snmvaughan
pushed a commit
to snmvaughan/spark
that referenced
this pull request
Jun 20, 2023
… only matches a single column ### What changes were proposed in this pull request? When colregex returns a single column it should link the plans plan_id. For reference here is the non-connect Dataset code that does this: https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala#L1512 This also needs to be fixed for the Python client. ### Why are the changes needed? Let the `UnresolvedAttribute` link plan_id if it is exist. ### Does this PR introduce _any_ user-facing change? 'No'. New feature. ### How was this patch tested? New test cases. Closes apache#40265 from beliefer/SPARK-42556. Authored-by: Jiaan Geng <beliefer@163.com> Signed-off-by: Ruifeng Zheng <ruifengz@apache.org> (cherry picked from commit c99a632) Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
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?
When colregex returns a single column it should link the plans plan_id. For reference here is the non-connect Dataset code that does this:
https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala#L1512
This also needs to be fixed for the Python client.
Why are the changes needed?
Let the
UnresolvedAttributelink plan_id if it is exist.Does this PR introduce any user-facing change?
'No'.
New feature.
How was this patch tested?
New test cases.