momcilomrk-db commented on code in PR #47404:
URL: https://github.com/apache/spark/pull/47404#discussion_r1688310986
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -133,12 +133,48 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
private def visitCompoundBodyImpl(
ctx: CompoundBodyContext,
- label: Option[String]): CompoundBody = {
+ label: Option[String],
+ allowVarDeclare: Boolean): CompoundBody = {
val buff = ListBuffer[CompoundPlanStatement]()
ctx.compoundStatements.forEach(compoundStatement => {
buff += visit(compoundStatement).asInstanceOf[CompoundPlanStatement]
})
+ val compoundStatements = buff.toList
+
+ if (allowVarDeclare) {
+ val declareVarStatement = compoundStatements
+ .dropWhile(statement => statement.isInstanceOf[SingleStatement] &&
+
statement.asInstanceOf[SingleStatement].parsedPlan.isInstanceOf[CreateVariable])
+ .filter(_.isInstanceOf[SingleStatement])
+
.find(_.asInstanceOf[SingleStatement].parsedPlan.isInstanceOf[CreateVariable])
Review Comment:
Done
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -133,12 +133,48 @@ class AstBuilder extends DataTypeAstBuilder with
SQLConfHelper with Logging {
private def visitCompoundBodyImpl(
ctx: CompoundBodyContext,
- label: Option[String]): CompoundBody = {
+ label: Option[String],
+ allowVarDeclare: Boolean): CompoundBody = {
val buff = ListBuffer[CompoundPlanStatement]()
ctx.compoundStatements.forEach(compoundStatement => {
buff += visit(compoundStatement).asInstanceOf[CompoundPlanStatement]
})
+ val compoundStatements = buff.toList
+
+ if (allowVarDeclare) {
+ val declareVarStatement = compoundStatements
+ .dropWhile(statement => statement.isInstanceOf[SingleStatement] &&
+
statement.asInstanceOf[SingleStatement].parsedPlan.isInstanceOf[CreateVariable])
+ .filter(_.isInstanceOf[SingleStatement])
+
.find(_.asInstanceOf[SingleStatement].parsedPlan.isInstanceOf[CreateVariable])
+
+ declareVarStatement match {
+ case Some(SingleStatement(parsedPlan)) =>
+ throw SqlScriptingErrors.variableDeclarationOnlyAtBeginning(
+ parsedPlan.asInstanceOf[CreateVariable]
+ .name.asInstanceOf[UnresolvedIdentifier]
+ .nameParts.last,
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: 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
