Skip to content

[SPARK-15062] [SQL] fix list type infer serializer issue #12849

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

Closed
wants to merge 2 commits into from
Closed

[SPARK-15062] [SQL] fix list type infer serializer issue #12849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5869b95
fix list type infer serializer issue
May 2, 2016
70a1bc1
revise codes based on comments
May 2, 2016
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
8 changes: 4 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,10 @@ object ScalaReflection extends ScalaReflection {
serializerFor(unwrapped, optType, newPath))
}

case t if t <:< localTypeOf[Seq[_]] =>
Copy link
Contributor

@rxin rxin May 2, 2016

Choose a reason for hiding this comment

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

add some comment to the definedByConstructorParams case to explain it is sensitive to ordering, and why?

val TypeRef(_, _, Seq(elementType)) = t
toCatalystArray(inputObject, elementType)

case t if definedByConstructorParams(t) =>
val params = getConstructorParameters(t)
val nonNullOutput = CreateNamedStruct(params.flatMap { case (fieldName, fieldType) =>
Expand All @@ -524,10 +528,6 @@ object ScalaReflection extends ScalaReflection {
val TypeRef(_, _, Seq(elementType)) = t
toCatalystArray(inputObject, elementType)

case t if t <:< localTypeOf[Seq[_]] =>
val TypeRef(_, _, Seq(elementType)) = t
toCatalystArray(inputObject, elementType)

case t if t <:< localTypeOf[Map[_, _]] =>
val TypeRef(_, _, Seq(keyType, valueType)) = t

Expand Down
7 changes: 7 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2473,4 +2473,11 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
Row("r3c1x", "r3c2", "t1r3c3", "r3c2", "t1r3c3") :: Nil)
}
}

test("SPARK-15062") {
Copy link
Contributor

@rxin rxin May 2, 2016

Choose a reason for hiding this comment

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

should document the test case more than just the issue number

Copy link
Contributor

@rxin rxin May 2, 2016

Choose a reason for hiding this comment

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

is it possible to turn this into a unit test on scalareflection rather than an end-to-end test?

val dfComplicated = sparkContext.parallelize(
List((Map("1" -> "a"), List("b", "c")), (Map("2" -> "b"), List("d", "e")))).toDF
checkAnswer(dfComplicated, Row(Map("1" -> "a"), List("b", "c")) ::
Row(Map("2" -> "b"), List("d", "e")) :: Nil)
}
}