cloud-fan commented on a change in pull request #25903: [SPARK-29215][SQL]
current namespace should be tracked in SessionCatalog if the current catalog is
session catalog
URL: https://github.com/apache/spark/pull/25903#discussion_r327901107
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogManager.scala
##########
@@ -85,33 +98,47 @@ class CatalogManager(conf: SQLConf, defaultSessionCatalog:
TableCatalog) extends
def currentNamespace: Array[String] = synchronized {
_currentNamespace.getOrElse {
- currentCatalog.map { catalogName =>
- getDefaultNamespace(catalog(catalogName))
- }.getOrElse(Array("default")) // The builtin catalog use "default" as
the default database.
+ if (currentCatalog.name() == SESSION_CATALOG_NAME) {
+ Array(v1SessionCatalog.getCurrentDatabase)
+ } else {
+ getDefaultNamespace(currentCatalog)
+ }
}
}
def setCurrentNamespace(namespace: Array[String]): Unit = synchronized {
- _currentNamespace = Some(namespace)
+ if (currentCatalog.name() == SESSION_CATALOG_NAME) {
+ if (namespace.length != 1) {
+ throw new NoSuchNamespaceException(namespace)
+ }
+ v1SessionCatalog.setCurrentDatabase(namespace.head)
+ } else {
+ _currentNamespace = Some(namespace)
+ }
}
- private var _currentCatalog: Option[String] = None
+ private var _currentCatalogName: Option[String] = None
- // Returns the name of current catalog. None means the current catalog is
the builtin catalog.
- def currentCatalog: Option[String] = synchronized {
- _currentCatalog.orElse(conf.defaultV2Catalog)
+ def currentCatalog: CatalogPlugin = synchronized {
+ _currentCatalogName.map(catalogName => catalog(catalogName))
+ .orElse(defaultCatalog)
+ .getOrElse(v2SessionCatalog)
}
def setCurrentCatalog(catalogName: String): Unit = synchronized {
- _currentCatalog = Some(catalogName)
+ _currentCatalogName = Some(catalogName)
Review comment:
good point! This is an issue for all catalogs, instead of just session
catalog. `setCurrentCatalog` should be noop if it doesn't switch catalog. I'll
fix it in this PR since it's simple.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
