Github user kiszk commented on a diff in the pull request:
https://github.com/apache/spark/pull/13909#discussion_r93814699
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
---
@@ -56,33 +58,81 @@ case class CreateArray(children: Seq[Expression])
extends Expression {
}
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
- val arrayClass = classOf[GenericArrayData].getName
- val values = ctx.freshName("values")
- ctx.addMutableState("Object[]", values, s"this.$values = null;")
-
- ev.copy(code = s"""
- this.$values = new Object[${children.size}];""" +
- ctx.splitExpressions(
- ctx.INPUT_ROW,
- children.zipWithIndex.map { case (e, i) =>
- val eval = e.genCode(ctx)
- eval.code + s"""
- if (${eval.isNull}) {
- $values[$i] = null;
- } else {
- $values[$i] = ${eval.value};
- }
- """
- }) +
- s"""
- final ArrayData ${ev.value} = new $arrayClass($values);
- this.$values = null;
- """, isNull = "false")
+ val array = ctx.freshName("array")
+
+ val et = dataType.elementType
+ val evals = children.map(e => e.genCode(ctx))
+ val isPrimitiveArray = ctx.isPrimitiveType(et)
+ val (preprocess, arrayData) =
+ GenArrayData.getCodeArrayData(ctx, et, children.size,
isPrimitiveArray, array)
+
+ val assigns = if (isPrimitiveArray) {
+ val primitiveTypeName = ctx.primitiveTypeName(et)
+ evals.zipWithIndex.map { case (eval, i) =>
+ eval.code + s"""
+ if (${eval.isNull}) {
+ $arrayData.setNullAt($i);
+ } else {
+ $arrayData.set$primitiveTypeName($i, ${eval.value});
+ }
+ """
+ }
+ } else {
+ evals.zipWithIndex.map { case (eval, i) =>
+ eval.code + s"""
+ if (${eval.isNull}) {
+ $array[$i] = null;
+ } else {
+ $array[$i] = ${eval.value};
+ }
+ """
+ }
+ }
+ ev.copy(code =
--- End diff --
For now, while I did not apply this change, I left a comment as ToDo.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
