davidm-db commented on code in PR #48022:
URL: https://github.com/apache/spark/pull/48022#discussion_r1749163479
##########
sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNode.scala:
##########
@@ -206,18 +213,36 @@ abstract class CompoundNestedStatementIteratorExec(
stopIteration = false
}
- /** Actions to do when LEAVE statement is encountered to stop the execution
of this compound. */
+ /** Actions to do when LEAVE statement is encountered, to stop the execution
of this compound. */
private def handleLeaveStatement(leaveStatement: LeaveStatementExec): Unit =
{
if (!leaveStatement.hasBeenMatched) {
// Stop the iteration.
stopIteration = true
// TODO: Variable cleanup (once we add SQL script execution logic).
+ // TODO: Add interpreter tests as well.
// Check if label has been matched.
leaveStatement.hasBeenMatched = label.isDefined &&
label.get.equals(leaveStatement.label)
}
}
+
+ /**
+ * Actions to do when ITERATE statement is encountered,
+ * to stop the execution of this compound.
Review Comment:
Done.
##########
sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreterSuite.scala:
##########
@@ -678,4 +678,38 @@ class SqlScriptingInterpreterSuite extends QueryTest with
SharedSparkSession {
)
verifySqlScriptResult(sqlScriptText, expected)
}
+
+ test("nested compounds in loop - leave in inner compound") {
+ val sqlScriptText =
+ """
+ |BEGIN
+ | DECLARE x INT;
+ | SET x = 0;
+ | lbl: WHILE x < 2 DO
+ | SET x = x + 1;
+ | BEGIN
+ | SELECT 1;
+ | lbl2: BEGIN
+ | SELECT 2;
+ | LEAVE lbl2;
+ | SELECT 3;
+ | END;
+ | END;
+ | END WHILE;
+ | SELECT x;
+ |END""".stripMargin
+ val expected = Seq(
+ Seq.empty[Row], // declare
+ Seq.empty[Row], // set x = 0
+ Seq.empty[Row], // set x = 1
+ Seq(Row(1)), // select 1
+ Seq(Row(2)), // select 1
+ Seq.empty[Row], // set x= 2
Review Comment:
Done.
##########
sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreterSuite.scala:
##########
@@ -678,4 +678,38 @@ class SqlScriptingInterpreterSuite extends QueryTest with
SharedSparkSession {
)
verifySqlScriptResult(sqlScriptText, expected)
}
+
+ test("nested compounds in loop - leave in inner compound") {
+ val sqlScriptText =
+ """
+ |BEGIN
+ | DECLARE x INT;
+ | SET x = 0;
+ | lbl: WHILE x < 2 DO
+ | SET x = x + 1;
+ | BEGIN
+ | SELECT 1;
+ | lbl2: BEGIN
+ | SELECT 2;
+ | LEAVE lbl2;
+ | SELECT 3;
+ | END;
+ | END;
+ | END WHILE;
+ | SELECT x;
+ |END""".stripMargin
+ val expected = Seq(
+ Seq.empty[Row], // declare
+ Seq.empty[Row], // set x = 0
+ Seq.empty[Row], // set x = 1
+ Seq(Row(1)), // select 1
+ Seq(Row(2)), // select 1
+ Seq.empty[Row], // set x= 2
+ Seq(Row(1)), // select 1
+ Seq(Row(2)), // select 1
Review Comment:
Done.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
