Skip to content

[SPARK-37967][SQL] Literal.create support ObjectType #35255

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
AngersZhuuuu wants to merge 3 commits into from
Closed

[SPARK-37967][SQL] Literal.create support ObjectType #35255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1eee99
[SPARK-37967][SQL] Literal.create support ObjectType
AngersZhuuuu Jan 20, 2022
660d3bb
re-trigger
AngersZhuuuu Jan 20, 2022
11effce
Merge branch 'master' into SPARK-37967
AngersZhuuuu Jan 21, 2022
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
1 change: 1 addition & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ object Literal {
Literal(CatalystTypeConverters.createToCatalystConverter(dataType)(v), dataType)
case _: DayTimeIntervalType if v.isInstanceOf[Duration] =>
Literal(CatalystTypeConverters.createToCatalystConverter(dataType)(v), dataType)
case _: ObjectType => Literal(v, dataType)
Copy link
Contributor

@cloud-fan cloud-fan Jan 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we do some assertion here? e.g. v.getClass should be or a sub-class of ObjectType.cls

Copy link
Contributor Author

@AngersZhuuuu AngersZhuuuu Jan 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we do some assertion here? e.g. v.getClass should be or a sub-class of ObjectType.cls

Already have a check in Literal.validateLiteralValue(value, dataType) when constructing Literal

case _ => Literal(CatalystTypeConverters.convertToCatalyst(v), dataType)
}
}
Expand Down
8 changes: 7 additions & 1 deletion ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types._
import org.apache.spark.sql.types.DayTimeIntervalType._
import org.apache.spark.sql.types.YearMonthIntervalType._
import org.apache.spark.unsafe.types.CalendarInterval
import org.apache.spark.unsafe.types.{CalendarInterval, UTF8String}

class LiteralExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {

Expand Down Expand Up @@ -465,4 +465,10 @@ class LiteralExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
checkEvaluation(Literal.create(duration, dt), result)
}
}

test("SPARK-37967: Literal.create support ObjectType") {
checkEvaluation(
Literal.create(UTF8String.fromString("Spark SQL"), ObjectType(classOf[UTF8String])),
UTF8String.fromString("Spark SQL"))
}
}