You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2021/04/25 15:09:36 UTC
[GitHub] [spark] Kimahriman opened a new pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Kimahriman opened a new pull request #32338:
URL: https://github.com/apache/spark/pull/32338
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error message, please read the guideline first:
https://spark.apache.org/error-message-guidelines.html
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Modifies the UpdateFields optimizer to fix correctness issues with certain nested and chained withField operations. Examples for recreating the issue are in the new unit tests as well as the JIRA issue.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Certain withField patterns can cause Exceptions or even incorrect results. It appears to be a result of the additional UpdateFields optimization added in https://github.com/apache/spark/pull/29812. It traverses fieldOps in reverse order to take the last one per field, but this can cause nested structs to change order which leads to mismatches between the schema and the actual data. This updates the optimization to maintain the initial ordering of nested structs to match the generated schema.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
It fixes exceptions and incorrect results for valid uses in the latest Spark release.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
Added new unit tests for these edge cases.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826449974
**[Test build #137926 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/137926/testReport)** for PR 32338 at commit [`23ee428`](https://github.com/apache/spark/commit/23ee4282a5ace4b9adf16aaa060e9a7709b4bf71).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619877869
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
Review comment:
done
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826350011
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826369555
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/42444/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826341901
Can one of the admins verify this patch?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359021
ok to test
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619831036
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -99,7 +99,7 @@ class OptimizeWithFieldsSuite extends PlanTest {
val correctAnswer = testRelation
.select(
Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out1")(),
- Alias(UpdateFields('a, WithField("B1", Literal(5)) :: Nil), "out2")())
+ Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out2")())
Review comment:
One result is that for case-insensitive cases, the first casing seen for a field is maintained, rather than the last one. If this isn't what we want, I can update it to keep the last casing seen
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619880481
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
##########
@@ -1686,6 +1686,61 @@ class ColumnExpressionSuite extends QueryTest with SharedSparkSession {
StructType(Seq(StructField("a", IntegerType, nullable = true))))
}
+ test("SPARK-35213: chained withField operations should have correct schema for new columns") {
+ val df = spark.createDataFrame(
+ sparkContext.parallelize(Row(null) :: Nil),
+ StructType(Seq(StructField("data", NullType))))
+
+ checkAnswer(
+ df.withColumn("data", struct()
+ .withField("a", struct())
+ .withField("b", struct())
+ .withField("a.aa", lit("aa1"))
+ .withField("b.ba", lit("ba1"))
+ .withField("a.ab", lit("ab1"))),
+ Row(Row(Row("aa1", "ab1"), Row("ba1"))) :: Nil,
+ StructType(Seq(
+ StructField("data", StructType(Seq(
+ StructField("a", StructType(Seq(
+ StructField("aa", StringType, nullable = false),
+ StructField("ab", StringType, nullable = false)
+ )), nullable = false),
+ StructField("b", StructType(Seq(
+ StructField("ba", StringType, nullable = false)
+ )), nullable = false)
+ )), nullable = false)
Review comment:
nit: Using ddl might be more readable?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359310
**[Test build #137924 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/137924/testReport)** for PR 32338 at commit [`1af0dae`](https://github.com/apache/spark/commit/1af0daef906b41f5edbb8d1eafbf2e358513d934).
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619865944
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -99,7 +99,7 @@ class OptimizeWithFieldsSuite extends PlanTest {
val correctAnswer = testRelation
.select(
Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out1")(),
- Alias(UpdateFields('a, WithField("B1", Literal(5)) :: Nil), "out2")())
+ Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out2")())
Review comment:
As this is for case-insensitive, seems no big deal. Although for the semantics, the "B1" is specified later, so I guess it is more reasonable to keep later one.
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
+ val originalQuery = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(3)) ::
+ WithField("b1", Literal(4)) ::
+ WithField("a1", Literal(5)) ::
+ Nil), "out")())
+
+ val optimized = Optimize.execute(originalQuery.analyze)
+ val correctAnswer = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(5)) ::
+ WithField("b1", Literal(4)) ::
+ Nil), "out")())
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
Review comment:
If you check the output data type, you can see the struct type is not different:
```
optimized: ArrayBuffer(StructType(StructField(a1,IntegerType,false), StructField(b1,IntegerType,false)))
correctAnswer: ArrayBuffer(StructType(StructField(a1,IntegerType,false), StructField(b1,IntegerType,false)))
```
By design, `UpdateFields` will keep the order of fields in struct expression.
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
+ val originalQuery = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(3)) ::
+ WithField("b1", Literal(4)) ::
+ WithField("a1", Literal(5)) ::
+ Nil), "out")())
+
+ val optimized = Optimize.execute(originalQuery.analyze)
+ val correctAnswer = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(5)) ::
+ WithField("b1", Literal(4)) ::
+ Nil), "out")())
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
Review comment:
But yea, it looks better to keep original `WithField` order.
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
Review comment:
struct ordering -> withfield ordering
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
##########
@@ -1686,6 +1686,61 @@ class ColumnExpressionSuite extends QueryTest with SharedSparkSession {
StructType(Seq(StructField("a", IntegerType, nullable = true))))
}
+ test("SPARK-35213: chained withField operations should have correct schema for new columns") {
+ val df = spark.createDataFrame(
+ sparkContext.parallelize(Row(null) :: Nil),
+ StructType(Seq(StructField("data", NullType))))
+
+ checkAnswer(
+ df.withColumn("data", struct()
+ .withField("a", struct())
+ .withField("b", struct())
+ .withField("a.aa", lit("aa1"))
+ .withField("b.ba", lit("ba1"))
+ .withField("a.ab", lit("ab1"))),
+ Row(Row(Row("aa1", "ab1"), Row("ba1"))) :: Nil,
+ StructType(Seq(
+ StructField("data", StructType(Seq(
+ StructField("a", StructType(Seq(
+ StructField("aa", StringType, nullable = false),
+ StructField("ab", StringType, nullable = false)
+ )), nullable = false),
+ StructField("b", StructType(Seq(
+ StructField("ba", StringType, nullable = false)
+ )), nullable = false)
+ )), nullable = false)
Review comment:
nit: Using ddl might be more readable?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826392239
**[Test build #137926 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/137926/testReport)** for PR 32338 at commit [`23ee428`](https://github.com/apache/spark/commit/23ee4282a5ace4b9adf16aaa060e9a7709b4bf71).
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619870257
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
+ val originalQuery = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(3)) ::
+ WithField("b1", Literal(4)) ::
+ WithField("a1", Literal(5)) ::
+ Nil), "out")())
+
+ val optimized = Optimize.execute(originalQuery.analyze)
+ val correctAnswer = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(5)) ::
+ WithField("b1", Literal(4)) ::
+ Nil), "out")())
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
Review comment:
But yea, it looks better to keep original `WithField` order.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826399862
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/137924/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826392239
**[Test build #137926 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/137926/testReport)** for PR 32338 at commit [`23ee428`](https://github.com/apache/spark/commit/23ee4282a5ace4b9adf16aaa060e9a7709b4bf71).
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359310
**[Test build #137924 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/137924/testReport)** for PR 32338 at commit [`1af0dae`](https://github.com/apache/spark/commit/1af0daef906b41f5edbb8d1eafbf2e358513d934).
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826457664
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/137926/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826447988
@Kimahriman can you retrigger https://github.com/Kimahriman/spark/actions/runs/783536510 please? The PR in Apache Spark repo runs the build in your forked repository.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826341901
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359310
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359310
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826341901
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619877952
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -99,7 +99,7 @@ class OptimizeWithFieldsSuite extends PlanTest {
val correctAnswer = testRelation
.select(
Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out1")(),
- Alias(UpdateFields('a, WithField("B1", Literal(5)) :: Nil), "out2")())
+ Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out2")())
Review comment:
Changed it to keep the last casing instead
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359172
Huh, let's see if Jenkins works. Otherwise, you may need to submit another PR using different branch name.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619867408
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
+ val originalQuery = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(3)) ::
+ WithField("b1", Literal(4)) ::
+ WithField("a1", Literal(5)) ::
+ Nil), "out")())
+
+ val optimized = Optimize.execute(originalQuery.analyze)
+ val correctAnswer = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(5)) ::
+ WithField("b1", Literal(4)) ::
+ Nil), "out")())
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
Review comment:
If you check the output data type, you can see the struct type is not different:
```
optimized: ArrayBuffer(StructType(StructField(a1,IntegerType,false), StructField(b1,IntegerType,false)))
correctAnswer: ArrayBuffer(StructType(StructField(a1,IntegerType,false), StructField(b1,IntegerType,false)))
```
By design, `UpdateFields` will keep the order of fields in struct expression.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826474985
Jenkins already passed, so I think it should be fine.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826364418
Seems okay, Jenkins tests are running.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya edited a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya edited a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826474985
Jenkins tests already passed, so I think it should be fine.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826457664
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/137926/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826369555
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/42444/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826399862
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/137924/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826350011
Tests seem to fail if there's a slash in the source branch name. Not sure if there's anything I can do other than recreate the PR with a different branch name
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826368676
Also pushed a new branch in my fork: https://github.com/Kimahriman/spark/runs/2432306637
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826447988
@Kimahriman can you retrigger https://github.com/Kimahriman/spark/actions/runs/783536510 please? The PR in Apache Spark repo runs the build in your forked repository.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619874297
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
+ val originalQuery = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(3)) ::
+ WithField("b1", Literal(4)) ::
+ WithField("a1", Literal(5)) ::
+ Nil), "out")())
+
+ val optimized = Optimize.execute(originalQuery.analyze)
+ val correctAnswer = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(5)) ::
+ WithField("b1", Literal(4)) ::
+ Nil), "out")())
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
Review comment:
This was just to sanity check the WithField order does actually stay the same, the tests on the Column Suite show how it can actually give you an incorrect schema. I don't fully know how a schema is determined (what part of the planning phase)
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826399281
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/42446/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619865944
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -99,7 +99,7 @@ class OptimizeWithFieldsSuite extends PlanTest {
val correctAnswer = testRelation
.select(
Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out1")(),
- Alias(UpdateFields('a, WithField("B1", Literal(5)) :: Nil), "out2")())
+ Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out2")())
Review comment:
As this is for case-insensitive, seems no big deal. Although for the semantics, the "B1" is specified later, so I guess it is more reasonable to keep later one.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826451431
> @Kimahriman can you retrigger https://github.com/Kimahriman/spark/actions/runs/783536510 please? The PR in Apache Spark repo runs the build in your forked repository.
It will fail because of the slash in the branch name. It tries to just checkout the part after the slash and fails. I forgot about this when I made the PR though. I pushed to a separate branch and you can see the action here: https://github.com/Kimahriman/spark/actions/runs/783542775. it's the same commit, but the only way I can get the action to pass on this PR is to close it and open a new one on the other named branch
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619881917
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
##########
@@ -1686,6 +1686,61 @@ class ColumnExpressionSuite extends QueryTest with SharedSparkSession {
StructType(Seq(StructField("a", IntegerType, nullable = true))))
}
+ test("SPARK-35213: chained withField operations should have correct schema for new columns") {
+ val df = spark.createDataFrame(
+ sparkContext.parallelize(Row(null) :: Nil),
+ StructType(Seq(StructField("data", NullType))))
+
+ checkAnswer(
+ df.withColumn("data", struct()
+ .withField("a", struct())
+ .withField("b", struct())
+ .withField("a.aa", lit("aa1"))
+ .withField("b.ba", lit("ba1"))
+ .withField("a.ab", lit("ab1"))),
+ Row(Row(Row("aa1", "ab1"), Row("ba1"))) :: Nil,
+ StructType(Seq(
+ StructField("data", StructType(Seq(
+ StructField("a", StructType(Seq(
+ StructField("aa", StringType, nullable = false),
+ StructField("ab", StringType, nullable = false)
+ )), nullable = false),
+ StructField("b", StructType(Seq(
+ StructField("ba", StringType, nullable = false)
+ )), nullable = false)
+ )), nullable = false)
Review comment:
Yeah it's kinda verbose, but I feel like for complicated things the objects are easier to understand than the DDL strings, especially with structs. Wasn't sure if there was an easier way to not have to explicitly mark everything as not nullable at least
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826399661
**[Test build #137924 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/137924/testReport)** for PR 32338 at commit [`1af0dae`](https://github.com/apache/spark/commit/1af0daef906b41f5edbb8d1eafbf2e358513d934).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya edited a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya edited a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826474985
Jenkins tests already passed, so I think it should be fine.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619831036
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -99,7 +99,7 @@ class OptimizeWithFieldsSuite extends PlanTest {
val correctAnswer = testRelation
.select(
Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out1")(),
- Alias(UpdateFields('a, WithField("B1", Literal(5)) :: Nil), "out2")())
+ Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out2")())
Review comment:
One result is that for case-insensitive cases, the first casing seen for a field is maintained, rather than the last one. If this isn't what we want, I can update it to keep the last casing seen
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
##########
@@ -1686,6 +1686,61 @@ class ColumnExpressionSuite extends QueryTest with SharedSparkSession {
StructType(Seq(StructField("a", IntegerType, nullable = true))))
}
+ test("SPARK-35213: chained withField operations should have correct schema for new columns") {
+ val df = spark.createDataFrame(
+ sparkContext.parallelize(Row(null) :: Nil),
+ StructType(Seq(StructField("data", NullType))))
Review comment:
Is it possible to just create an empty dataframe with no columns in Scala? I mostly operate and python and can just do `spark.createDataFrame([[]])`
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
+ val originalQuery = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(3)) ::
+ WithField("b1", Literal(4)) ::
+ WithField("a1", Literal(5)) ::
+ Nil), "out")())
+
+ val optimized = Optimize.execute(originalQuery.analyze)
+ val correctAnswer = testRelation
+ .select(
+ Alias(UpdateFields('a,
+ WithField("a1", Literal(5)) ::
+ WithField("b1", Literal(4)) ::
+ Nil), "out")())
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
Review comment:
This was just to sanity check the WithField order does actually stay the same, the tests on the Column Suite show how it can actually give you an incorrect schema. I don't fully know how a schema is determined (what part of the planning phase)
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
Review comment:
done
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -99,7 +99,7 @@ class OptimizeWithFieldsSuite extends PlanTest {
val correctAnswer = testRelation
.select(
Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out1")(),
- Alias(UpdateFields('a, WithField("B1", Literal(5)) :: Nil), "out2")())
+ Alias(UpdateFields('a, WithField("b1", Literal(5)) :: Nil), "out2")())
Review comment:
Changed it to keep the last casing instead
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
##########
@@ -1686,6 +1686,61 @@ class ColumnExpressionSuite extends QueryTest with SharedSparkSession {
StructType(Seq(StructField("a", IntegerType, nullable = true))))
}
+ test("SPARK-35213: chained withField operations should have correct schema for new columns") {
+ val df = spark.createDataFrame(
+ sparkContext.parallelize(Row(null) :: Nil),
+ StructType(Seq(StructField("data", NullType))))
+
+ checkAnswer(
+ df.withColumn("data", struct()
+ .withField("a", struct())
+ .withField("b", struct())
+ .withField("a.aa", lit("aa1"))
+ .withField("b.ba", lit("ba1"))
+ .withField("a.ab", lit("ab1"))),
+ Row(Row(Row("aa1", "ab1"), Row("ba1"))) :: Nil,
+ StructType(Seq(
+ StructField("data", StructType(Seq(
+ StructField("a", StructType(Seq(
+ StructField("aa", StringType, nullable = false),
+ StructField("ab", StringType, nullable = false)
+ )), nullable = false),
+ StructField("b", StructType(Seq(
+ StructField("ba", StringType, nullable = false)
+ )), nullable = false)
+ )), nullable = false)
Review comment:
Yeah it's kinda verbose, but I feel like for complicated things the objects are easier to understand than the DDL strings, especially with structs. Wasn't sure if there was an easier way to not have to explicitly mark everything as not nullable at least
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826341901
Can one of the admins verify this patch?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826366725
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826359021
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] SparkQA commented on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826397369
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619870298
##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeWithFieldsSuite.scala
##########
@@ -126,4 +126,25 @@ class OptimizeWithFieldsSuite extends PlanTest {
comparePlans(optimized, correctAnswer)
}
}
+
+ test("SPARK-35213: ensure optimize WithFields maintains correct struct ordering") {
Review comment:
struct ordering -> withfield ordering
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins removed a comment on pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #32338:
URL: https://github.com/apache/spark/pull/32338#issuecomment-826399281
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder-K8s/42446/
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] Kimahriman commented on a change in pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
Kimahriman commented on a change in pull request #32338:
URL: https://github.com/apache/spark/pull/32338#discussion_r619831270
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
##########
@@ -1686,6 +1686,61 @@ class ColumnExpressionSuite extends QueryTest with SharedSparkSession {
StructType(Seq(StructField("a", IntegerType, nullable = true))))
}
+ test("SPARK-35213: chained withField operations should have correct schema for new columns") {
+ val df = spark.createDataFrame(
+ sparkContext.parallelize(Row(null) :: Nil),
+ StructType(Seq(StructField("data", NullType))))
Review comment:
Is it possible to just create an empty dataframe with no columns in Scala? I mostly operate and python and can just do `spark.createDataFrame([[]])`
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya closed pull request #32338: [SPARK-35213][SQL] Keep the correct ordering of nested structs in chained withField operations
Posted by GitBox <gi...@apache.org>.
viirya closed pull request #32338:
URL: https://github.com/apache/spark/pull/32338
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org