Skip to content

[SPARK-39547][SQL] V2SessionCatalog should not throw NoSuchDatabaseException in loadNamspaceMetadata #36948

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
singhpk234 wants to merge 3 commits into from
Closed

[SPARK-39547][SQL] V2SessionCatalog should not throw NoSuchDatabaseException in loadNamspaceMetadata #36948

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
fb95f9c
V2SessionCatalog should not throw NoSuchDatabaseException in loadName…
Jun 21, 2022
c779f3f
fix test failures
Jun 22, 2022
3c7e3fa
address review feedback
Jun 22, 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
9 changes: 7 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import scala.collection.JavaConverters._
import scala.collection.mutable

import org.apache.spark.sql.catalyst.{FunctionIdentifier, SQLConfHelper, TableIdentifier}
import org.apache.spark.sql.catalyst.analysis.{NoSuchTableException, TableAlreadyExistsException}
import org.apache.spark.sql.catalyst.analysis.{NoSuchDatabaseException, NoSuchTableException, TableAlreadyExistsException}
import org.apache.spark.sql.catalyst.catalog.{CatalogDatabase, CatalogTable, CatalogTableType, CatalogUtils, SessionCatalog}
import org.apache.spark.sql.connector.catalog.{CatalogManager, CatalogV2Util, FunctionCatalog, Identifier, NamespaceChange, SupportsNamespaces, Table, TableCatalog, TableChange, V1Table}
import org.apache.spark.sql.connector.catalog.NamespaceChange.RemoveProperty
Expand Down Expand Up @@ -245,7 +245,12 @@ class V2SessionCatalog(catalog: SessionCatalog)
override def loadNamespaceMetadata(namespace: Array[String]): util.Map[String, String] = {
namespace match {
case Array(db) =>
catalog.getDatabaseMetadata(db).toMetadata
try {
catalog.getDatabaseMetadata(db).toMetadata
} catch {
case _: NoSuchDatabaseException =>
throw QueryCompilationErrors.noSuchNamespaceError(namespace)
}

case _ =>
throw QueryCompilationErrors.noSuchNamespaceError(namespace)
Expand Down
1 change: 1 addition & 0 deletions ...ore/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeNamespaceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@ trait DescribeNamespaceSuiteBase extends command.DescribeNamespaceSuiteBase
* table catalog.
*/
class DescribeNamespaceSuite extends DescribeNamespaceSuiteBase with CommandSuiteBase {
override def notFoundMsgPrefix: String = if (conf.useV1Command) "Database" else "Namespace"
override def commandVersion: String = super[DescribeNamespaceSuiteBase].commandVersion
}
2 changes: 1 addition & 1 deletion .../src/test/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalogSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ class V2SessionCatalogNamespaceSuite extends V2SessionCatalogBaseSuite {
test("loadNamespaceMetadata: fail missing namespace") {
val catalog = newCatalog()

val exc = intercept[NoSuchDatabaseException] {
val exc = intercept[NoSuchNamespaceException] {
catalog.loadNamespaceMetadata(testNs)
}

Expand Down
1 change: 1 addition & 0 deletions ...e/src/test/scala/org/apache/spark/sql/hive/execution/command/DescribeNamespaceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ import org.apache.spark.sql.execution.command.v1
* table catalog.
*/
class DescribeNamespaceSuite extends v1.DescribeNamespaceSuiteBase with CommandSuiteBase {
override def notFoundMsgPrefix: String = if (conf.useV1Command) "Database" else "Namespace"
override def commandVersion: String = super[DescribeNamespaceSuiteBase].commandVersion
}