Skip to content

[SPARK-37479][SQL] Migrate DROP NAMESPACE to use V2 command by default #35202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dchvn wants to merge 3 commits into from
Closed

[SPARK-37479][SQL] Migrate DROP NAMESPACE to use V2 command by default #35202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81ec750
initial commit
dchvn Jan 12, 2022
9394893
update after merge dropNamespace with cascade
dchvn Jan 21, 2022
c71685c
update hiveddlsuite
dchvn Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
Expand Down
7 changes: 5 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DropNamespaceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@cloud-fan cloud-fan Jan 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, do we have tests for DROP NAMESPACE ... CASCADE in the suite?

Copy link
Contributor Author

@dchvn dchvn Jan 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It uses DROP NAMESPACE ... CASCADE test included in DropNamespaceSuiteBase, which it extends with, right @cloud-fan ?

with command.TestsV1AndV2Commands {
override protected def builtinTopNamespaces: Seq[String] = Seq("default")

override protected def namespaceAlias(): String = "database"
Expand All @@ -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
}
1 change: 1 addition & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/command/DropNamespaceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}