Skip to content

[SPARK-23586][SQL] Add interpreted execution to WrapOption #20741

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
mgaido91 wants to merge 2 commits into from
Closed

[SPARK-23586][SQL] Add interpreted execution to WrapOption #20741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a67db05
[SPARK-23586][SQL] Add interpreted execution to WrapOption
mgaido91 Mar 5, 2018
28e349e
fix typo
mgaido91 Mar 5, 2018
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
3 changes: 1 addition & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,7 @@ case class WrapOption(child: Expression, optType: DataType)

override def inputTypes: Seq[AbstractDataType] = optType :: Nil

override def eval(input: InternalRow): Any =
throw new UnsupportedOperationException("Only code-generated evaluation is supported")
override def eval(input: InternalRow): Any = Option(child.eval(input))

override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
val inputObject = child.genCode(ctx)
Expand Down
11 changes: 10 additions & 1 deletion ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ObjectExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package org.apache.spark.sql.catalyst.expressions
import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
import org.apache.spark.sql.catalyst.expressions.objects.{Invoke, UnwrapOption}
import org.apache.spark.sql.catalyst.expressions.objects._
import org.apache.spark.sql.catalyst.util.{ArrayBasedMapData, GenericArrayData}
import org.apache.spark.sql.types.{IntegerType, ObjectType}

Expand Down Expand Up @@ -75,4 +75,13 @@ class ObjectExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
checkEvaluation(unwrapObject, expected, InternalRow.fromSeq(Seq(input)))
}
}

test("SPARK-23586: WrapOption should support interpreted execution") {
val cls = ObjectType(classOf[java.lang.Integer])
val inputObject = BoundReference(0, cls, nullable = true)
val wrapObject = WrapOption(inputObject, cls)
Seq((1, Some(1)), (null, None)).foreach { case (input, expected) =>
checkEvaluation(wrapObject, expected, InternalRow.fromSeq(Seq(input)))
}
}
}