Repository: spark Updated Branches: refs/heads/master 20c0bcd97 -> 8989d3a39
[SPARK-14161][SQL] Native Parsing for DDL Command Drop Database ### What changes were proposed in this pull request? Based on the Hive DDL document https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DDL The syntax of DDL command for Drop Database is ```SQL DROP (DATABASE|SCHEMA) [IF EXISTS] database_name [RESTRICT|CASCADE]; ``` - If `IF EXISTS` is not specified, the default behavior is to issue a warning message if `database_name` does't exist - `RESTRICT` is the default behavior. This PR is to provide a native parsing support for `DROP DATABASE`. #### How was this patch tested? Added a test case `DDLCommandSuite` Author: gatorsmile <[email protected]> Closes #11962 from gatorsmile/parseDropDatabase. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8989d3a3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8989d3a3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8989d3a3 Branch: refs/heads/master Commit: 8989d3a39657e817918fb4e5fdab172b68b85df6 Parents: 20c0bcd Author: gatorsmile <[email protected]> Authored: Sat Mar 26 14:11:13 2016 -0700 Committer: Yin Huai <[email protected]> Committed: Sat Mar 26 14:11:13 2016 -0700 ---------------------------------------------------------------------- .../apache/spark/sql/execution/SparkQl.scala | 14 +++++ .../spark/sql/execution/command/ddl.scala | 18 +++++++ .../sql/execution/command/DDLCommandSuite.scala | 57 ++++++++++++++++++++ .../org/apache/spark/sql/hive/HiveQl.scala | 1 - 4 files changed, 89 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8989d3a3/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala index ef30ba0..b9542c7 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala @@ -128,6 +128,20 @@ private[sql] class SparkQl(conf: ParserConf = SimpleParserConf()) extends Cataly }.toMap CreateDatabase(databaseName, ifNotExists.isDefined, location, comment, props)(node.source) + // DROP DATABASE [IF EXISTS] database_name [RESTRICT|CASCADE]; + case Token("TOK_DROPDATABASE", Token(dbName, Nil) :: otherArgs) => + // Example format: + // + // TOK_DROPDATABASE + // :- database_name + // :- TOK_IFEXISTS + // +- TOK_RESTRICT/TOK_CASCADE + val databaseName = unquoteString(dbName) + // The default is RESTRICT + val Seq(ifExists, _, cascade) = getClauses(Seq( + "TOK_IFEXISTS", "TOK_RESTRICT", "TOK_CASCADE"), otherArgs) + DropDatabase(databaseName, ifExists.isDefined, restrict = cascade.isEmpty)(node.source) + // CREATE [TEMPORARY] FUNCTION [db_name.]function_name AS class_name // [USING JAR|FILE|ARCHIVE 'file_uri' [, JAR|FILE|ARCHIVE 'file_uri'] ]; case Token("TOK_CREATEFUNCTION", args) => http://git-wip-us.apache.org/repos/asf/spark/blob/8989d3a3/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala index 07c89af..373b557 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala @@ -52,6 +52,24 @@ case class CreateDatabase( props: Map[String, String])(sql: String) extends NativeDDLCommand(sql) with Logging +/** + * Drop Database: Removes a database from the system. + * + * 'ifExists': + * - true, if database_name does't exist, no action + * - false (default), if database_name does't exist, a warning message will be issued + * 'restric': + * - true (default), the database cannot be dropped if it is not empty. The inclusive + * tables must be dropped at first. + * - false, it is in the Cascade mode. The dependent objects are automatically dropped + * before dropping database. + */ +case class DropDatabase( + databaseName: String, + ifExists: Boolean, + restrict: Boolean)(sql: String) + extends NativeDDLCommand(sql) with Logging + case class CreateFunction( functionName: String, alias: String, http://git-wip-us.apache.org/repos/asf/spark/blob/8989d3a3/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala index 6f1eea2..a33175a 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala @@ -44,6 +44,63 @@ class DDLCommandSuite extends PlanTest { comparePlans(parsed, expected) } + test("drop database") { + val sql1 = "DROP DATABASE IF EXISTS database_name RESTRICT" + val sql2 = "DROP DATABASE IF EXISTS database_name CASCADE" + val sql3 = "DROP SCHEMA IF EXISTS database_name RESTRICT" + val sql4 = "DROP SCHEMA IF EXISTS database_name CASCADE" + // The default is restrict=true + val sql5 = "DROP DATABASE IF EXISTS database_name" + // The default is ifExists=false + val sql6 = "DROP DATABASE database_name" + val sql7 = "DROP DATABASE database_name CASCADE" + + val parsed1 = parser.parsePlan(sql1) + val parsed2 = parser.parsePlan(sql2) + val parsed3 = parser.parsePlan(sql3) + val parsed4 = parser.parsePlan(sql4) + val parsed5 = parser.parsePlan(sql5) + val parsed6 = parser.parsePlan(sql6) + val parsed7 = parser.parsePlan(sql7) + + val expected1 = DropDatabase( + "database_name", + ifExists = true, + restrict = true)(sql1) + val expected2 = DropDatabase( + "database_name", + ifExists = true, + restrict = false)(sql2) + val expected3 = DropDatabase( + "database_name", + ifExists = true, + restrict = true)(sql3) + val expected4 = DropDatabase( + "database_name", + ifExists = true, + restrict = false)(sql4) + val expected5 = DropDatabase( + "database_name", + ifExists = true, + restrict = true)(sql5) + val expected6 = DropDatabase( + "database_name", + ifExists = false, + restrict = true)(sql6) + val expected7 = DropDatabase( + "database_name", + ifExists = false, + restrict = false)(sql7) + + comparePlans(parsed1, expected1) + comparePlans(parsed2, expected2) + comparePlans(parsed3, expected3) + comparePlans(parsed4, expected4) + comparePlans(parsed5, expected5) + comparePlans(parsed6, expected6) + comparePlans(parsed7, expected7) + } + test("create function") { val sql1 = """ http://git-wip-us.apache.org/repos/asf/spark/blob/8989d3a3/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala index e802d3d..6586b90 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala @@ -102,7 +102,6 @@ private[hive] class HiveQl(conf: ParserConf) extends SparkQl(conf) with Logging "TOK_DESCDATABASE", - "TOK_DROPDATABASE", "TOK_DROPFUNCTION", "TOK_DROPINDEX", "TOK_DROPMACRO", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
