viirya commented on a change in pull request #32980:
URL: https://github.com/apache/spark/pull/32980#discussion_r655575853
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
##########
@@ -1111,24 +1144,33 @@ class CodegenContext extends Logging {
|}
""".stripMargin
- val state = SubExprEliminationState(isNull, JavaCode.global(value,
expr.dataType))
- exprs.foreach(localSubExprEliminationExprs.put(_, state))
+ // Collects other subexpressions from the children.
+ val childrenSubExprs =
mutable.ArrayBuffer.empty[SubExprEliminationState]
+ exprs.head.foreach {
+ case e if subExprEliminationExprs.contains(e) =>
+ childrenSubExprs += subExprEliminationExprs(e)
+ case _ =>
+ }
+
val inputVariables = inputVars.map(_.variableName).mkString(", ")
- s"${addNewFunction(fnName, fn)}($inputVariables);"
+ val code = code"${addNewFunction(fnName, fn)}($inputVariables);"
+ val state = SubExprEliminationState(code, isNull,
JavaCode.global(value, expr.dataType),
+ childrenSubExprs.toSeq.reverse)
+ exprs.foreach(localSubExprEliminationExprs.put(_, state))
}
- (splitCodes, localSubExprEliminationExprs, exprCodesNeedEvaluate)
+ (localSubExprEliminationExprs, exprCodesNeedEvaluate)
} else {
if (Utils.isTesting) {
throw
QueryExecutionErrors.failedSplitSubExpressionError(MAX_JVM_METHOD_PARAMS_LENGTH)
} else {
logInfo(QueryExecutionErrors.failedSplitSubExpressionMsg(MAX_JVM_METHOD_PARAMS_LENGTH))
- (nonSplitExprCode, localSubExprEliminationExprsForNonSplit,
Seq.empty)
+ (localSubExprEliminationExprsForNonSplit, Seq.empty)
}
}
} else {
- (nonSplitExprCode, localSubExprEliminationExprsForNonSplit, Seq.empty)
+ (localSubExprEliminationExprsForNonSplit, Seq.empty)
}
- SubExprCodes(codes, subExprsMap.toMap, exprCodes.flatten)
+ SubExprCodes(subExprsMap.toMap, exprCodes.flatten)
}
Review comment:
Okay, I noticed it grows a bit longer. Let me add more comments.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
