rdblue commented on a change in pull request #25363: [SPARK-28628][SQL]
Implement SupportsNamespaces in V2SessionCatalog
URL: https://github.com/apache/spark/pull/25363#discussion_r320048370
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala
##########
@@ -177,10 +184,97 @@ class V2SessionCatalog(sessionState: SessionState)
extends TableCatalog {
}
}
+ override def namespaceExists(namespace: Array[String]): Boolean = namespace
match {
+ case Array(db) =>
+ catalog.databaseExists(db)
+ case _ =>
+ false
+ }
+
+ override def listNamespaces(): Array[Array[String]] = {
+ catalog.listDatabases().map(Array(_)).toArray
+ }
+
+ override def listNamespaces(namespace: Array[String]): Array[Array[String]]
= {
+ namespace match {
+ case Array() =>
+ listNamespaces()
+ case Array(db) if catalog.databaseExists(db) =>
+ Array()
+ case _ =>
+ throw new NoSuchNamespaceException(namespace)
+ }
+ }
+
+ override def loadNamespaceMetadata(namespace: Array[String]):
util.Map[String, String] = {
+ namespace match {
+ case Array(db) =>
+ catalog.getDatabaseMetadata(db).toMetadata
+
+ case _ =>
+ throw new NoSuchNamespaceException(namespace)
+ }
+ }
+
+ override def createNamespace(
+ namespace: Array[String],
+ metadata: util.Map[String, String]): Unit = namespace match {
+ case Array(db) if !catalog.databaseExists(db) =>
+ catalog.createDatabase(
+ toCatalogDatabase(db, metadata, defaultLocation =
Some(catalog.getDefaultDBPath(db))),
+ ignoreIfExists = false)
+
+ case Array(_) =>
+ throw new NamespaceAlreadyExistsException(namespace)
+
+ case _ =>
+ throw new IllegalArgumentException(s"Invalid namespace name:
${namespace.quoted}")
+ }
+
+ override def alterNamespace(namespace: Array[String], changes:
NamespaceChange*): Unit = {
+ namespace match {
+ case Array(db) =>
+ // validate that this catalog's reserved properties are not removed
+ changes.foreach {
+ case remove: RemoveProperty if
RESERVED_PROPERTIES.contains(remove.property) =>
+ throw new UnsupportedOperationException(
+ s"Cannot remove reserved property: ${remove.property}")
+ case _ =>
+ }
+
+ val metadata = catalog.getDatabaseMetadata(db).toMetadata
+ catalog.alterDatabase(
+ toCatalogDatabase(db, CatalogV2Util.applyNamespaceChanges(metadata,
changes)))
+
+ case _ =>
+ throw new NoSuchNamespaceException(namespace)
+ }
+ }
+
+ override def dropNamespace(namespace: Array[String]): Boolean = namespace
match {
+ case Array(db) if catalog.databaseExists(db) =>
+ if (catalog.listTables(db).nonEmpty) {
+ throw new IllegalStateException(s"Namespace ${namespace.quoted} is not
empty")
+ }
+ catalog.dropDatabase(db, ignoreIfNotExists = false, cascade = false)
+ true
+
+ case Array(_) =>
+ // exists returned false
Review comment:
Correct. This is the case where the database does not exist. We know that
because the above existence check returned false. This comment clarifies the
Array case because it appears that an Array of one item always matches. So we
need to note the context from the previous case.
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
