davidm-db commented on code in PR #46665:
URL: https://github.com/apache/spark/pull/46665#discussion_r1636366669
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -117,6 +118,57 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
}
}
+ override def visitCompoundOrSingleStatement(
+ ctx: CompoundOrSingleStatementContext): CompoundBody = {
+ Option(ctx.singleCompoundStatement()).map { s =>
+ visit(s).asInstanceOf[CompoundBody]
+ }.getOrElse {
+ val logicalPlan = visitSingleStatement(ctx.singleStatement())
+ CompoundBody(Seq(SingleStatement(
+ parsedPlan = logicalPlan,
+ sourceStart = ctx.start.getStartIndex,
+ sourceEnd = ctx.stop.getStopIndex + 1)))
+ }
+ }
+
+ override def visitSingleCompoundStatement(ctx:
SingleCompoundStatementContext): CompoundBody = {
+ visit(ctx.beginEndCompoundBlock()).asInstanceOf[CompoundBody]
+ }
+
+ private def visitCompoundBodyImpl(ctx: CompoundBodyContext): CompoundBody = {
+ val buff = ListBuffer[CompoundPlanStatement]()
+ for (i <- 0 until ctx.getChildCount) {
+ val child = ctx.getChild(i)
+ val visitedChild = visit(ctx.getChild(i))
+ visitedChild match {
+ case statement: CompoundPlanStatement => buff += statement
+ case null if child.isInstanceOf[TerminalNodeImpl] =>
+ }
+ }
+
+ CompoundBody(buff.toSeq)
+ }
+
+ override def visitBeginEndCompoundBlock(ctx: BeginEndCompoundBlockContext):
CompoundBody = {
+ visitCompoundBodyImpl(ctx.compoundBody())
+ }
+
+ override def visitCompoundBody(ctx: CompoundBodyContext): CompoundBody = {
+ visitCompoundBodyImpl(ctx)
+ }
+
+ override def visitCompoundStatement(ctx: CompoundStatementContext):
CompoundPlanStatement = {
+ val child = visit(ctx.getChild(0))
Review Comment:
Done.
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -42,6 +42,28 @@ options { tokenVocab = SqlBaseLexer; }
public boolean double_quoted_identifiers = false;
}
+compoundOrSingleStatement
+ : singleStatement
+ | singleCompoundStatement
+ ;
+
+singleCompoundStatement
+ : beginEndCompoundBlock SEMICOLON? EOF
+ ;
+
+beginEndCompoundBlock
+ : BEGIN compoundBody END
+ ;
+
+compoundBody
+ : (compoundStatement SEMICOLON)*
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]
