Skip to content

[SPARK-23593][SQL] Add interpreted execution for InitializeJavaBean expression #20756

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
viirya wants to merge 14 commits into from
Closed

[SPARK-23593][SQL] Add interpreted execution for InitializeJavaBean expression #20756

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
978080b
Add interpreted execution for InitializeJavaBean expression.
viirya Mar 7, 2018
0c48a9b
Merge remote-tracking branch 'upstream/master' into SPARK-23593
viirya Mar 7, 2018
b8f171e
Test error message of interpreted execution.
viirya Mar 7, 2018
b51303a
Resolving setters outside eval.
viirya Mar 7, 2018
6372f04
Merge remote-tracking branch 'upstream/master' into SPARK-23593
viirya Mar 8, 2018
970ed6c
Simplifying it.
viirya Mar 8, 2018
e20c207
Address comment.
viirya Mar 8, 2018
f3fdf57
Change error message a bit.
viirya Mar 8, 2018
1a78334
Use AnyRef.
viirya Mar 9, 2018
e7640e1
Add a test.
viirya Mar 27, 2018
0d6b3d3
Prevent null input to setters.
viirya Apr 5, 2018
2954e8d
Merge remote-tracking branch 'upstream/master' into SPARK-23593
viirya Apr 5, 2018
96a8fe6
Prevent null input to setters.
viirya Apr 5, 2018
573db59
Fix out-of-date comment.
viirya Apr 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
Prev Previous commit
Next Next commit
Prevent null input to setters.
  • Loading branch information
@viirya
viirya committed Apr 5, 2018
commit 96a8fe6102d8d175003392a14d67cd74c0b86319
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 @@ -1418,8 +1418,7 @@ case class InitializeJavaBean(beanInstance: Expression, setters: Map[String, Exp
case (name, expr) =>
// Looking for known type mapping first, then using Class attached in `ObjectType`.
// Finally also looking for general `Object`-type parameter for generic methods.
val paramTypes = CallMethodViaReflection.typeMapping.getOrElse(expr.dataType,
Seq(expr.dataType.asInstanceOf[ObjectType].cls)) ++ Seq(classOf[Object])
val paramTypes = ScalaReflection.expressionJavaClasses(Seq(expr)) ++ Seq(classOf[Object])
val methods = paramTypes.flatMap { fieldClass =>
try {
Some(beanClass.getDeclaredMethod(name, fieldClass))
Expand Down
13 changes: 12 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 @@ -158,7 +158,18 @@ class ObjectExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
val initializeBean = InitializeJavaBean(
Literal.fromObject(new TestBean),
Map("setNonPrimitive" -> Literal(null)))
evaluateWithoutCodegen(initializeBean, InternalRow.fromSeq(Seq()))
intercept[NullPointerException] {
evaluateWithoutCodegen(initializeBean, InternalRow.fromSeq(Seq()))
}.getMessage.contains("The parameter value for setters in `InitializeJavaBean` can not be null")
intercept[NullPointerException] {
evaluateWithGeneratedMutableProjection(initializeBean, InternalRow.fromSeq(Seq()))
}.getMessage.contains("The parameter value for setters in `InitializeJavaBean` can not be null")

val initializeBean2 = InitializeJavaBean(
Literal.fromObject(new TestBean),
Map("setNonPrimitive" -> Literal("string")))
evaluateWithoutCodegen(initializeBean2, InternalRow.fromSeq(Seq()))
evaluateWithGeneratedMutableProjection(initializeBean2, InternalRow.fromSeq(Seq()))
}

test("SPARK-23585: UnwrapOption should support interpreted execution") {
Expand Down