This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new a13f79a [SPARK-37479][SQL] Migrate DROP NAMESPACE to use V2 command
by default
a13f79a is described below
commit a13f79a49fb77dc3c876f551c2c712f2fc69675c
Author: dch nguyen <[email protected]>
AuthorDate: Tue Jan 25 22:13:52 2022 +0800
[SPARK-37479][SQL] Migrate DROP NAMESPACE to use V2 command by default
### What changes were proposed in this pull request?
This PR migrates `DROP NAMESPACE` to use V2 command by default.
### Why are the changes needed?
It's been a while since we introduced the v2 commands, and it seems
reasonable to use v2 commands by default even for the session catalog, with a
legacy config to fall back to the v1 commands.
### Does this PR introduce _any_ user-facing change?
The error message will be different if drop database containing tables with
RESTRICT mode when v2 command is run against v1 catalog and Hive Catalog:
Before: `Cannot drop a non-empty database`
vs.
After: `Cannot drop a non-empty namespace`
### How was this patch tested?
Existing *DropNamespaceSuite tests
Closes #35202 from dchvn/migrate_dropnamespace_v2_command_default.
Authored-by: dch nguyen <[email protected]>
Signed-off-by: Wenchen Fan <[email protected]>
---
.../apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala | 2 +-
.../apache/spark/sql/execution/command/v1/DropNamespaceSuite.scala | 7 +++++--
.../spark/sql/hive/execution/command/DropNamespaceSuite.scala | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
b/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
index 3dde998..6df94f3 100644
---
a/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
+++
b/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
@@ -221,7 +221,7 @@ class ResolveSessionCatalog(val catalogManager:
CatalogManager)
val newProperties = c.properties --
CatalogV2Util.NAMESPACE_RESERVED_PROPERTIES
CreateDatabaseCommand(name, c.ifNotExists, location, comment,
newProperties)
- case d @ DropNamespace(DatabaseInSessionCatalog(db), _, _) =>
+ case d @ DropNamespace(DatabaseInSessionCatalog(db), _, _) if
conf.useV1Command =>
DropDatabaseCommand(db, d.ifExists, d.cascade)
case ShowTables(DatabaseInSessionCatalog(db), pattern, output) if
conf.useV1Command =>
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DropNamespaceSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DropNamespaceSuite.scala
index 24e5131..174ac97 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DropNamespaceSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DropNamespaceSuite.scala
@@ -28,7 +28,8 @@ import org.apache.spark.sql.execution.command
* - V1 In-Memory catalog:
`org.apache.spark.sql.execution.command.v1.DropNamespaceSuite`
* - V1 Hive External catalog:
`org.apache.spark.sql.hive.execution.command.DropNamespaceSuite`
*/
-trait DropNamespaceSuiteBase extends command.DropNamespaceSuiteBase {
+trait DropNamespaceSuiteBase extends command.DropNamespaceSuiteBase
+ with command.TestsV1AndV2Commands {
override protected def builtinTopNamespaces: Seq[String] = Seq("default")
override protected def namespaceAlias(): String = "database"
@@ -41,4 +42,6 @@ trait DropNamespaceSuiteBase extends
command.DropNamespaceSuiteBase {
}
}
-class DropNamespaceSuite extends DropNamespaceSuiteBase with CommandSuiteBase
+class DropNamespaceSuite extends DropNamespaceSuiteBase with CommandSuiteBase {
+ override def commandVersion: String =
super[DropNamespaceSuiteBase].commandVersion
+}
diff --git
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/command/DropNamespaceSuite.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/command/DropNamespaceSuite.scala
index cabebb9..955fe33 100644
---
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/command/DropNamespaceSuite.scala
+++
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/command/DropNamespaceSuite.scala
@@ -25,4 +25,5 @@ import org.apache.spark.sql.execution.command.v1
*/
class DropNamespaceSuite extends v1.DropNamespaceSuiteBase with
CommandSuiteBase {
override def isCasePreserving: Boolean = false
+ override def commandVersion: String =
super[DropNamespaceSuiteBase].commandVersion
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
