Github user marmbrus commented on a diff in the pull request:
https://github.com/apache/spark/pull/5279#discussion_r27836865
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
---
@@ -94,11 +178,95 @@ trait ScalaReflection {
case (other, _) => other
}
+ /**
+ * Creates a converter function that will convert Catalyst types to
Scala type.
+ */
+ private[sql] def createScalaConverter(dataType: DataType): Any => Any =
dataType match {
+ // Check UDT first since UDTs can override other types
+ case udt: UserDefinedType[_] =>
+ (item: Any) => udt.deserialize(item)
+
+ case arrayType: ArrayType =>
+ val elementConverter = createScalaConverter(arrayType.elementType)
+ (item: Any) => item match {
+ case s: Seq[_] => s.map(elementConverter)
+ case other => other
+ }
+
+ case mapType: MapType =>
+ val keyConverter = createScalaConverter(mapType.keyType)
+ val valueConverter = createScalaConverter(mapType.valueType)
+ (item: Any) =>
+ item match {
+ case m: Map[_, _] => m.map { case (k, v) =>
+ keyConverter(k) -> valueConverter(v)
+ }
+ case other => other
+ }
+
+ case s: StructType =>
+ val converters = createConvertersForStruct(s)
+ (item: Any) =>
+ item match {
+ case r: Row => convertRowToScalaWithConverters(r, s, converters)
+ case other => other
+ }
+
+ case _: DecimalType =>
+ (item: Any) => item match {
+ case d: Decimal => d.toJavaBigDecimal
+ case other => other
+ }
+
+ case DateType =>
+ (item: Any) => item match {
+ case i: Int => DateUtils.toJavaDate(i)
+ case other => other
+ }
+
+ case other =>
+ (item: Any) => item
+ }
+
def convertRowToScala(r: Row, schema: StructType): Row = {
- // TODO: This is very slow!!!
- new GenericRowWithSchema(
- r.toSeq.zip(schema.fields.map(_.dataType))
- .map(r_dt => convertToScala(r_dt._1, r_dt._2)).toArray, schema)
+ val ar = new Array[Any](r.size)
+ var idx = 0
+ while (idx < r.size) {
+ ar(idx) = convertToScala(r(idx), schema.fields(idx).dataType)
+ idx += 1
+ }
+ new GenericRowWithSchema(ar, schema)
+ }
+
+ /**
+ * Creates Catalyst->Scala converter functions for each field of the
given StructType.
+ */
+ private[sql] def createConvertersForStruct(s: StructType): Array[Any =>
Any] = {
+ val converters = new Array[Any => Any](s.length)
+ val iter = s.fields.iterator
+ var idx = 0
+ while (iter.hasNext) {
--- End diff --
probably reasonable since this is not per-tuple
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
