huaxingao commented on a change in pull request #30473:
URL: https://github.com/apache/spark/pull/30473#discussion_r534522656
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalog.scala
##########
@@ -171,6 +175,130 @@ class JDBCTableCatalog extends TableCatalog with Logging {
}
}
+ override def namespaceExists(namespace: Array[String]): Boolean = namespace
match {
+ case Array(db) =>
+ withConnection { conn =>
+ val rs = conn.getMetaData.getSchemas(null, db)
+ while (rs.next()) {
+ if (rs.getString(1) == db) return true;
+ }
+ false
+ }
+ case _ => false
+ }
+
+ override def listNamespaces(): Array[Array[String]] = {
+ withConnection { conn =>
+ val schemaBuilder = ArrayBuilder.make[Array[String]]
+ val rs = conn.getMetaData.getSchemas()
+ while (rs.next()) {
+ schemaBuilder += Array(rs.getString(1))
+ }
+ schemaBuilder.result
+ }
+ }
+
+ override def listNamespaces(namespace: Array[String]): Array[Array[String]]
= {
+ namespace match {
+ case Array() =>
+ listNamespaces()
+ case Array(db) if namespaceExists(namespace) =>
+ Array()
+ case _ =>
+ throw new NoSuchNamespaceException(namespace)
+ }
+ }
+
+ override def loadNamespaceMetadata(namespace: Array[String]):
util.Map[String, String] = {
+ namespace match {
+ case Array(db) =>
+ if (!namespaceExists(namespace)) throw new NoSuchNamespaceException(db)
+ mutable.HashMap[String, String]().asJava
+
+ case _ =>
+ throw new NoSuchNamespaceException(namespace)
+ }
+ }
+
+ override def createNamespace(
+ namespace: Array[String],
+ metadata: util.Map[String, String]): Unit = namespace match {
+ case Array(db) if !namespaceExists(namespace) =>
+ var comment = ""
+ if (!metadata.isEmpty) {
+ metadata.asScala.map {
+ case (k, v) => k match {
+ case SupportsNamespaces.PROP_COMMENT => comment = v
+ case SupportsNamespaces.PROP_OWNER => // ignore
+ case SupportsNamespaces.PROP_LOCATION =>
+ throw new AnalysisException("CREATE NAMESPACE ... LOCATION ...
is not supported in" +
+ " JDBC catalog.")
+ case _ => // ignore all the other properties for now
+ }
+ }
+ }
+ withConnection { conn =>
+ classifyException(s"Failed create name space: $db") {
+ JdbcUtils.createNamespace(conn, options, db, comment)
+ }
+ }
+
+ 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) =>
+ changes.foreach {
+ case set: NamespaceChange.SetProperty =>
+ // ignore changes other than comments
+ if (set.property() == SupportsNamespaces.PROP_COMMENT) {
+ withConnection { conn =>
+ JdbcUtils.createNamespaceComment(conn, options, db, set.value)
+ }
+ }
+
+ case unset: NamespaceChange.RemoveProperty =>
+ // ignore changes other than comments
+ if (unset.property() == SupportsNamespaces.PROP_COMMENT) {
+ withConnection { conn =>
+ JdbcUtils.removeNamespaceComment(conn, options, db)
+ }
+ }
+
+ case _ =>
+ throw new SQLFeatureNotSupportedException(s"Unsupported
NamespaceChange $changes")
+ }
+
+ case _ =>
+ throw new NoSuchNamespaceException(namespace)
+ }
+ }
+
+ override def dropNamespace(namespace: Array[String]): Boolean = namespace
match {
+ case Array(db) if namespaceExists(namespace) =>
+ if (listTables(Array(db)).nonEmpty) {
+ throw new IllegalStateException(s"Namespace ${namespace.quoted} is not
empty")
+ }
+ withConnection { conn =>
+ classifyException(s"Failed drop name space: $db") {
+ JdbcUtils.dropNamespace(conn, options, db)
+ true
+ }
+ }
+
+ case Array(_) =>
+ // exists returned false
Review comment:
I think we should fail. Fixed.
I was following the implementation in `V2SessionCatalog`
(https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala#L273).
Do I need to change this too?
##########
File path:
external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/V2JDBCNamespaceTest.scala
##########
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.jdbc.v2
+
+import scala.collection.JavaConverters._
+
+import org.apache.log4j.Level
+
+import org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.connector.catalog.NamespaceChange
+import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
+import org.apache.spark.sql.test.SharedSparkSession
+import org.apache.spark.tags.DockerTest
+
+@DockerTest
+private[v2] trait V2JDBCNamespaceTest extends SharedSparkSession {
+ val catalog = new JDBCTableCatalog()
+
+ test("listNamespaces: basic behavior") {
+ catalog.createNamespace(Array("foo"), Map("comment" -> "test
comment").asJava)
+ assert(catalog.listNamespaces() ===
+ Array(Array("foo"), Array("information_schema"), Array("pg_catalog"),
Array("public")))
Review comment:
Fixed.
----------------------------------------------------------------
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
