Skip to content

Commit cceb650

Browse files
committed
Python test fixes, and removal of WrapDynamic.
1 parent 0334a52 commit cceb650

File tree

4 files changed

+3
-81
lines changed

4 files changed

+3
-81
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,6 @@ package object dsl {
272272
def sfilter[T1](arg1: Symbol)(udf: (T1) => Boolean) =
273273
Filter(ScalaUdf(udf, BooleanType, Seq(UnresolvedAttribute(arg1.name))), logicalPlan)
274274

275-
def sfilter(dynamicUdf: (DynamicRow) => Boolean) =
276-
Filter(ScalaUdf(dynamicUdf, BooleanType, Seq(WrapDynamic(logicalPlan.output))), logicalPlan)
277-
278275
def sample(
279276
fraction: Double,
280277
withReplacement: Boolean = true,

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/WrapDynamic.scala

Lines changed: 0 additions & 65 deletions
This file was deleted.

sql/core/src/main/scala/org/apache/spark/sql/execution/pythonUdfs.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ object EvaluatePython {
116116
def toJava(obj: Any, dataType: DataType): Any = (obj, dataType) match {
117117
case (null, _) => null
118118

119-
case (row: Seq[Any], struct: StructType) =>
119+
case (row: Row, struct: StructType) =>
120120
val fields = struct.fields.map(field => field.dataType)
121-
row.zip(fields).map {
121+
row.toSeq.zip(fields).map {
122122
case (obj, dataType) => toJava(obj, dataType)
123123
}.toArray
124124

sql/core/src/main/scala/org/apache/spark/sql/json/JsonRDD.scala

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -458,21 +458,11 @@ private[sql] object JsonRDD extends Logging {
458458
gen.writeEndArray()
459459

460460
case (MapType(kv,vv, _), v: Map[_,_]) =>
461-
gen.writeStartObject
461+
gen.writeStartObject()
462462
v.foreach { p =>
463463
gen.writeFieldName(p._1.toString)
464464
valWriter(vv,p._2)
465465
}
466-
gen.writeEndObject
467-
468-
case (StructType(ty), v: Seq[_]) =>
469-
gen.writeStartObject()
470-
ty.zip(v).foreach {
471-
case (_, null) =>
472-
case (field, v) =>
473-
gen.writeFieldName(field.name)
474-
valWriter(field.dataType, v)
475-
}
476466
gen.writeEndObject()
477467

478468
case (StructType(ty), v: Row) =>

0 commit comments

Comments
 (0)