You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by li...@apache.org on 2016/11/03 07:18:12 UTC
spark git commit: [SPARK-17122][SQL] support drop current database
Repository: spark
Updated Branches:
refs/heads/master d24e73647 -> 96cc1b567
[SPARK-17122][SQL] support drop current database
## What changes were proposed in this pull request?
In Spark 1.6 and earlier, we can drop the database we are using. In Spark 2.0, native implementation prevent us from dropping current database, which may break some old queries. This PR would re-enable the feature.
## How was this patch tested?
one new unit test in `SessionCatalogSuite`.
Author: Daoyuan Wang <da...@intel.com>
Closes #15011 from adrian-wang/dropcurrent.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/96cc1b56
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/96cc1b56
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/96cc1b56
Branch: refs/heads/master
Commit: 96cc1b5675273c276e04c4dc19ef9033a314292d
Parents: d24e736
Author: Daoyuan Wang <da...@intel.com>
Authored: Thu Nov 3 00:18:03 2016 -0700
Committer: gatorsmile <ga...@gmail.com>
Committed: Thu Nov 3 00:18:03 2016 -0700
----------------------------------------------------------------------
.../spark/sql/catalyst/catalog/SessionCatalog.scala | 2 --
.../sql/catalyst/catalog/SessionCatalogSuite.scala | 15 +++++++++++++++
.../spark/sql/execution/command/DDLSuite.scala | 9 +++++----
3 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/96cc1b56/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
index 714ef82..2d2120d 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
@@ -160,8 +160,6 @@ class SessionCatalog(
val dbName = formatDatabaseName(db)
if (dbName == DEFAULT_DATABASE) {
throw new AnalysisException(s"Can not drop default database")
- } else if (dbName == getCurrentDatabase) {
- throw new AnalysisException(s"Can not drop current database `$dbName`")
}
externalCatalog.dropDatabase(dbName, ignoreIfNotExists, cascade)
}
http://git-wip-us.apache.org/repos/asf/spark/blob/96cc1b56/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala
index 187611b..b77fef2 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala
@@ -127,6 +127,21 @@ class SessionCatalogSuite extends SparkFunSuite {
catalog.dropDatabase("db_that_does_not_exist", ignoreIfNotExists = true, cascade = false)
}
+ test("drop current database and drop default database") {
+ val catalog = new SessionCatalog(newBasicCatalog())
+ catalog.setCurrentDatabase("db1")
+ assert(catalog.getCurrentDatabase == "db1")
+ catalog.dropDatabase("db1", ignoreIfNotExists = false, cascade = true)
+ intercept[NoSuchDatabaseException] {
+ catalog.createTable(newTable("tbl1", "db1"), ignoreIfExists = false)
+ }
+ catalog.setCurrentDatabase("default")
+ assert(catalog.getCurrentDatabase == "default")
+ intercept[AnalysisException] {
+ catalog.dropDatabase("default", ignoreIfNotExists = false, cascade = true)
+ }
+ }
+
test("alter database") {
val catalog = new SessionCatalog(newBasicCatalog())
val db1 = catalog.getDatabaseMetadata("db1")
http://git-wip-us.apache.org/repos/asf/spark/blob/96cc1b56/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
index 22d4c92..d4d0014 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
@@ -1599,10 +1599,11 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
test("drop current database") {
sql("CREATE DATABASE temp")
sql("USE temp")
- val m = intercept[AnalysisException] {
- sql("DROP DATABASE temp")
- }.getMessage
- assert(m.contains("Can not drop current database `temp`"))
+ sql("DROP DATABASE temp")
+ val e = intercept[AnalysisException] {
+ sql("CREATE TABLE t (a INT, b INT)")
+ }.getMessage
+ assert(e.contains("Database 'temp' not found"))
}
test("drop default database") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org