cloud-fan commented on a change in pull request #23908: [SPARK-27001][SQL]
Refactor "serializerFor" method between ScalaReflection and JavaTypeInference
URL: https://github.com/apache/spark/pull/23908#discussion_r261499210
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/DeserializerBuildHelper.scala
##########
@@ -39,40 +39,30 @@ object DeserializerBuildHelper {
path: Expression,
ordinal: Int,
dataType: DataType,
- walkedTypePath: Seq[String]): Expression = {
+ walkedTypePath: WalkedTypePath): Expression = {
val newPath = GetStructField(path, ordinal)
upCastToExpectedType(newPath, dataType, walkedTypePath)
}
- def deserializerForWithNullSafety(
- expr: Expression,
- dataType: DataType,
- nullable: Boolean,
- walkedTypePath: Seq[String],
- funcForCreatingNewExpr: (Expression, Seq[String]) => Expression):
Expression = {
- val newExpr = funcForCreatingNewExpr(expr, walkedTypePath)
- expressionWithNullSafety(newExpr, nullable, walkedTypePath)
- }
-
def deserializerForWithNullSafetyAndUpcast(
expr: Expression,
dataType: DataType,
nullable: Boolean,
- walkedTypePath: Seq[String],
- funcForCreatingNewExpr: (Expression, Seq[String]) => Expression):
Expression = {
+ walkedTypePath: WalkedTypePath,
+ funcForCreatingDeserializer: (Expression, WalkedTypePath) =>
Expression): Expression = {
val casted = upCastToExpectedType(expr, dataType, walkedTypePath)
- deserializerForWithNullSafety(casted, dataType, nullable, walkedTypePath,
- funcForCreatingNewExpr)
+ expressionWithNullSafety(funcForCreatingDeserializer(casted,
walkedTypePath),
+ nullable, walkedTypePath)
}
- private def expressionWithNullSafety(
+ def expressionWithNullSafety(
expr: Expression,
nullable: Boolean,
- walkedTypePath: Seq[String]): Expression = {
+ walkedTypePath: WalkedTypePath): Expression = {
if (nullable) {
expr
} else {
- AssertNotNull(expr, walkedTypePath)
+ AssertNotNull(expr, walkedTypePath.copy())
Review comment:
We can let `AssertNotNull` take a `Seq[String]`, to force us to copy the
`WalkedTypePath` when creating `AssertNotNull`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
