Skip to content
Snippets Groups Projects
Commit 2a5b5fd4 authored by Joseph K. Bradley's avatar Joseph K. Bradley Committed by Michael Armbrust
Browse files

[SPARK-4791] [sql] Infer schema from case class with multiple constructors

Modified ScalaReflection.schemaFor to take primary constructor of Product when there are multiple constructors.  Added test to suite which failed before but works now.

Needed for [https://github.com/apache/spark/pull/3637]

CC: marmbrus

Author: Joseph K. Bradley <joseph@databricks.com>

Closes #3646 from jkbradley/sql-reflection and squashes the following commits:

796b2e4 [Joseph K. Bradley] Modified ScalaReflection.schemaFor to take primary constructor of Product when there are multiple constructors.  Added test to suite which failed before but works now.
parent 57d37f9c
No related branches found
No related tags found
No related merge requests found
...@@ -118,7 +118,19 @@ trait ScalaReflection { ...@@ -118,7 +118,19 @@ trait ScalaReflection {
case t if t <:< typeOf[Product] => case t if t <:< typeOf[Product] =>
val formalTypeArgs = t.typeSymbol.asClass.typeParams val formalTypeArgs = t.typeSymbol.asClass.typeParams
val TypeRef(_, _, actualTypeArgs) = t val TypeRef(_, _, actualTypeArgs) = t
val params = t.member(nme.CONSTRUCTOR).asMethod.paramss val constructorSymbol = t.member(nme.CONSTRUCTOR)
val params = if (constructorSymbol.isMethod) {
constructorSymbol.asMethod.paramss
} else {
// Find the primary constructor, and use its parameter ordering.
val primaryConstructorSymbol: Option[Symbol] = constructorSymbol.asTerm.alternatives.find(
s => s.isMethod && s.asMethod.isPrimaryConstructor)
if (primaryConstructorSymbol.isEmpty) {
sys.error("Internal SQL error: Product object did not have a primary constructor.")
} else {
primaryConstructorSymbol.get.asMethod.paramss
}
}
Schema(StructType( Schema(StructType(
params.head.map { p => params.head.map { p =>
val Schema(dataType, nullable) = val Schema(dataType, nullable) =
......
...@@ -68,6 +68,10 @@ case class ComplexData( ...@@ -68,6 +68,10 @@ case class ComplexData(
case class GenericData[A]( case class GenericData[A](
genericField: A) genericField: A)
case class MultipleConstructorsData(a: Int, b: String, c: Double) {
def this(b: String, a: Int) = this(a, b, c = 1.0)
}
class ScalaReflectionSuite extends FunSuite { class ScalaReflectionSuite extends FunSuite {
import ScalaReflection._ import ScalaReflection._
...@@ -253,4 +257,14 @@ class ScalaReflectionSuite extends FunSuite { ...@@ -253,4 +257,14 @@ class ScalaReflectionSuite extends FunSuite {
Row(1, 1, 1, 1, 1, 1, true)) Row(1, 1, 1, 1, 1, 1, true))
assert(convertToCatalyst(data, dataType) === convertedData) assert(convertToCatalyst(data, dataType) === convertedData)
} }
test("infer schema from case class with multiple constructors") {
val dataType = schemaFor[MultipleConstructorsData].dataType
dataType match {
case s: StructType =>
// Schema should have order: a: Int, b: String, c: Double
assert(s.fieldNames === Seq("a", "b", "c"))
assert(s.fields.map(_.dataType) === Seq(IntegerType, StringType, DoubleType))
}
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment