davidm-db commented on code in PR #47609:
URL: https://github.com/apache/spark/pull/47609#discussion_r1704235261
##########
sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreter.scala:
##########
@@ -82,20 +89,36 @@ case class SqlScriptingInterpreter() {
.map(new SingleStatementExec(_, Origin(), isInternal = true))
.reverse
new CompoundBodyExec(
- body.collection.map(st => transformTreeIntoExecutable(st, session))
++ dropVariables)
+ body.collection.map(st => transformTreeIntoExecutable(st)) ++
dropVariables,
+ session)
case IfElseStatement(conditions, conditionalBodies, elseBody) =>
val conditionsExec = conditions.map(condition =>
- new SingleStatementExec(condition.parsedPlan, condition.origin,
isInternal = false))
+ new SingleStatementExec(condition.parsedPlan, condition.origin))
val conditionalBodiesExec = conditionalBodies.map(body =>
- transformTreeIntoExecutable(body,
session).asInstanceOf[CompoundBodyExec])
+ transformTreeIntoExecutable(body).asInstanceOf[CompoundBodyExec])
val unconditionalBodiesExec = elseBody.map(body =>
- transformTreeIntoExecutable(body,
session).asInstanceOf[CompoundBodyExec])
+ transformTreeIntoExecutable(body).asInstanceOf[CompoundBodyExec])
new IfElseStatementExec(
conditionsExec, conditionalBodiesExec, unconditionalBodiesExec,
session)
case sparkStatement: SingleStatement =>
new SingleStatementExec(
sparkStatement.parsedPlan,
sparkStatement.origin,
- isInternal = false)
+ shouldCollectResult = true)
}
+
+ /**
+ * Execute the provided CompoundBody and return all results.
+ *
+ * @param compoundBody
+ * CompoundBody to execute.
+ * @return Results from all leaf statements.
+ */
+ private[scripting] def executeInternal(compoundBody: CompoundBody):
Iterator[Array[Row]] = {
Review Comment:
My reason was not to change what `collect()` does, i.e. returning `Array`.
But good point, let's see what others have to say.
--
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.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
