dtenedor commented on code in PR #46665:
URL: https://github.com/apache/spark/pull/46665#discussion_r1624946733
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -116,6 +116,57 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
}
}
+ override def visitCompoundOrSingleStatement(
+ ctx: CompoundOrSingleStatementContext): CompoundBody = {
+ if (ctx.singleCompound() != null) {
+ visit(ctx.singleCompound()).asInstanceOf[CompoundBody]
+ } else {
+ val logicalPlan = visitSingleStatement(ctx.singleStatement())
+ CompoundBody(List(SparkStatementWithPlan(
+ parsedPlan = logicalPlan,
+ sourceStart = ctx.start.getStartIndex,
+ sourceEnd = ctx.stop.getStopIndex + 1)))
+ }
+ }
+
+ override def visitSingleCompound(ctx: SingleCompoundContext): 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] =>
Review Comment:
why would the child not be an instance of `TerminalNodeImpl`? If this is
enforced by the parser, then you can just remove the check
##########
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
+ | singleCompound
+ ;
+
+singleCompound
Review Comment:
can you rename this to `singleCompoundStatement`
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -116,6 +116,57 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
}
}
+ override def visitCompoundOrSingleStatement(
+ ctx: CompoundOrSingleStatementContext): CompoundBody = {
+ if (ctx.singleCompound() != null) {
Review Comment:
you can do
```
Option(ctx.singleCompound()).map { s =>
visit(s).asInstanceOf[CompoundBody]
}.getOrElse {
val logicalPlan = visitSingleStatement(ctx.singleStatement())
CompoundBody(List(SparkStatementWithPlan(
parsedPlan = logicalPlan,
sourceStart = ctx.start.getStartIndex,
sourceEnd = ctx.stop.getStopIndex + 1)))
}
```
--
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]
