From f179fc60e3048d4d6f333f917971b14dd19f1852 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Wed, 13 Dec 2023 19:24:51 +0300 Subject: [PATCH 1/2] Classify exceptions in JDBCTableCatalog --- .../datasources/v2/jdbc/JDBCTableCatalog.scala | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalog.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalog.scala index 0084abb392ef9..6c773d4fb1b00 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalog.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalog.scala @@ -65,8 +65,10 @@ class JDBCTableCatalog extends TableCatalog checkNamespace(namespace) JdbcUtils.withConnection(options) { conn => val schemaPattern = if (namespace.length == 1) namespace.head else null - val rs = conn.getMetaData - .getTables(null, schemaPattern, "%", Array("TABLE")) + val rs = JdbcUtils.classifyException( + s"Failed get tables from: ${namespace.mkString(".")}", dialect) { + conn.getMetaData.getTables(null, schemaPattern, "%", Array("TABLE")) + } new Iterator[Identifier] { def hasNext = rs.next() def next() = Identifier.of(namespace, rs.getString("TABLE_NAME")) @@ -179,14 +181,18 @@ class JDBCTableCatalog extends TableCatalog override def namespaceExists(namespace: Array[String]): Boolean = namespace match { case Array(db) => JdbcUtils.withConnection(options) { conn => - JdbcUtils.schemaExists(conn, options, db) + JdbcUtils.classifyException(s"Failed namespace exists: ${namespace.mkString}", dialect) { + JdbcUtils.schemaExists(conn, options, db) + } } case _ => false } override def listNamespaces(): Array[Array[String]] = { JdbcUtils.withConnection(options) { conn => - JdbcUtils.listSchemas(conn, options) + JdbcUtils.classifyException(s"Failed list namespaces", dialect) { + JdbcUtils.listSchemas(conn, options) + } } } From 309c4fd065fa8822a5ff47da3608f8123533de42 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Wed, 13 Dec 2023 19:34:07 +0300 Subject: [PATCH 2/2] Trigger build