allisonwang-db commented on code in PR #47609: URL: https://github.com/apache/spark/pull/47609#discussion_r1720085931
########## sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingE2eSuite.scala: ########## @@ -0,0 +1,109 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.scripting + +import org.apache.spark.sql.{QueryTest, Row} +import org.apache.spark.sql.catalyst.plans.logical.CompoundBody +import org.apache.spark.sql.exceptions.SqlScriptingException +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.scripting.SparkSqlParser.parsePlan +import org.apache.spark.sql.test.SharedSparkSession + +/** + * End-to-end tests for SQL Scripting. + * This suite is not intended to heavily test the SQL scripting (parser & interpreter) logic. + * It is rather focused on testing the sql() API - whether it can handle SQL scripts correctly, + * results are returned in expected manner, config flags are applied properly, etc. + * For full functionality tests, see SqlScriptingParserSuite and SqlScriptingInterpreterSuite. + */ +class SqlScriptingE2eSuite extends QueryTest with SharedSparkSession { + // Helpers + private def verifySqlScriptResult(sqlText: String, expected: Seq[Row]): Unit = { + val df = spark.sql(sqlText) + checkAnswer(df, expected) + } + + // Tests setup + protected override def beforeAll(): Unit = { + super.beforeAll() + spark.conf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "true") + } + + protected override def afterAll(): Unit = { + spark.conf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "false") + super.afterAll() + } + + // Tests + test("SQL Scripting not enabled") { + withSQLConf(SQLConf.SQL_SCRIPTING_ENABLED.key -> "false") { + val sqlScriptText = + """ + |BEGIN + | SELECT 1; + |END""".stripMargin + checkError( + exception = intercept[SqlScriptingException] { + parsePlan(sqlScriptText).asInstanceOf[CompoundBody] Review Comment: why not use `spark.sql(sqlScriptText)` here? ########## sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingE2eSuite.scala: ########## @@ -0,0 +1,109 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.scripting + +import org.apache.spark.sql.{QueryTest, Row} +import org.apache.spark.sql.catalyst.plans.logical.CompoundBody +import org.apache.spark.sql.exceptions.SqlScriptingException +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.scripting.SparkSqlParser.parsePlan +import org.apache.spark.sql.test.SharedSparkSession + +/** + * End-to-end tests for SQL Scripting. + * This suite is not intended to heavily test the SQL scripting (parser & interpreter) logic. + * It is rather focused on testing the sql() API - whether it can handle SQL scripts correctly, + * results are returned in expected manner, config flags are applied properly, etc. + * For full functionality tests, see SqlScriptingParserSuite and SqlScriptingInterpreterSuite. + */ +class SqlScriptingE2eSuite extends QueryTest with SharedSparkSession { + // Helpers + private def verifySqlScriptResult(sqlText: String, expected: Seq[Row]): Unit = { + val df = spark.sql(sqlText) + checkAnswer(df, expected) + } + + // Tests setup + protected override def beforeAll(): Unit = { + super.beforeAll() + spark.conf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "true") + } + + protected override def afterAll(): Unit = { + spark.conf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "false") Review Comment: Instead of setting it to "false", we should get the default value of `SQLConf.SQL_SCRIPTING_ENABLED.key` and set it back to the default value ########## sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreterSuite.scala: ########## @@ -29,32 +30,48 @@ import org.apache.spark.sql.test.SharedSparkSession * Output from the interpreter (iterator over executable statements) is then checked - statements * are executed and output DataFrames are compared with expected outputs. */ -class SqlScriptingInterpreterSuite extends QueryTest with SharedSparkSession { +class SqlScriptingInterpreterSuite extends SparkFunSuite with SharedSparkSession { // Helpers - private def runSqlScript(sqlText: String): Array[DataFrame] = { - val interpreter = SqlScriptingInterpreter() - val compoundBody = spark.sessionState.sqlParser.parseScript(sqlText) - val executionPlan = interpreter.buildExecutionPlan(compoundBody, spark) - executionPlan.flatMap { - case statement: SingleStatementExec => - if (statement.isExecuted) { - None - } else { - Some(Dataset.ofRows(spark, statement.parsedPlan, new QueryPlanningTracker)) - } - case _ => None - }.toArray + private def runSqlScript(sqlText: String): Seq[Array[Row]] = { + val interpreter = SqlScriptingInterpreter(spark) + val compoundBody = spark.sessionState.sqlParser.parsePlan(sqlText).asInstanceOf[CompoundBody] + interpreter.executeInternal(compoundBody).toSeq } - private def verifySqlScriptResult(sqlText: String, expected: Seq[Seq[Row]]): Unit = { + private def verifySqlScriptResult(sqlText: String, expected: Seq[Array[Row]]): Unit = { val result = runSqlScript(sqlText) assert(result.length == expected.length) - result.zip(expected).foreach { case (df, expectedAnswer) => checkAnswer(df, expectedAnswer) } + result.zip(expected).foreach { + case (actualAnswer, expectedAnswer) => + assert(actualAnswer.sameElements(expectedAnswer)) + } + } + + // Tests setup + protected override def beforeAll(): Unit = { + super.beforeAll() + spark.conf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "true") + } + + protected override def afterAll(): Unit = { + spark.conf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "false") Review Comment: ditto ########## sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala: ########## @@ -2581,7 +2583,7 @@ class SparkConnectPlanner( val result = SqlCommandResult.newBuilder() // Only filled when isCommand val metrics = ExecutePlanResponse.Metrics.newBuilder() - if (isCommand) { + if (isCommand || isSqlScript) { Review Comment: Do we have a test for SQL script execution using Spark Connect? -- 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]
