Github user mgaido91 commented on a diff in the pull request:
https://github.com/apache/spark/pull/19827#discussion_r153253542
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
---
@@ -351,24 +351,26 @@ case class CreateNamedStruct(children:
Seq[Expression]) extends CreateNamedStruc
val rowClass = classOf[GenericInternalRow].getName
val values = ctx.freshName("values")
ctx.addMutableState("Object[]", values, s"$values = null;")
-
- ev.copy(code = s"""
- $values = new Object[${valExprs.size}];""" +
- ctx.splitExpressions(
- ctx.INPUT_ROW,
- valExprs.zipWithIndex.map { case (e, i) =>
- val eval = e.genCode(ctx)
- eval.code + s"""
+ val valuesCode = ctx.splitExpressions(
+ valExprs.zipWithIndex.map { case (e, i) =>
+ val eval = e.genCode(ctx)
+ s"""
+ ${eval.code}
if (${eval.isNull}) {
$values[$i] = null;
} else {
$values[$i] = ${eval.value};
}"""
- }) +
+ })
+ val code =
s"""
- final InternalRow ${ev.value} = new $rowClass($values);
- $values = null;
- """, isNull = "false")
+ |$values = new Object[${valExprs.size}];
+ |$valuesCode
+ |final InternalRow ${ev.value} = new $rowClass($values);
+ |$values = null;
+ """.stripMargin
+
+ ev.copy(code = code, isNull = "false")
--- End diff --
very appreciated. It is much better now. What do you think about:
```
ev.copy(code = s"""
...
""", ...)
```
instead of declaring a `code` val? This looks to me as the most widely
adopted pattern.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
