Github user ueshin commented on a diff in the pull request:
https://github.com/apache/spark/pull/13909#discussion_r93814866
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
---
@@ -58,77 +58,126 @@ case class CreateArray(children: Seq[Expression])
extends Expression {
}
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
- 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 =
- preprocess +
- ctx.splitExpressions(ctx.INPUT_ROW, assigns) +
- s"\nfinal ArrayData ${ev.value} = $arrayData;\n",
+ val (preprocess, postprocess, arrayData, array) =
+ GenArrayData.genCodeToCreateArrayData(ctx, et, children.size,
isPrimitiveArray)
+ val assigns = GenArrayData.genCodeToAssignArrayElements(
+ ctx, evals, et, isPrimitiveArray, arrayData, array, true)
+ /*
+ TODO: When we generate simpler code, we have to solve the following
exception
+ https://github.com/apache/spark/pull/13909/files#r93813725
+ ev.copy(
+ code = preprocess + ctx.splitExpressions(ctx.INPUT_ROW, assigns) +
postprocess
+ value = arrayData,
--- End diff --
How about defining the type of `arrayData` as `ArrayData`?
---
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
