Skip to content

[SPARK-46393][SQL] Classify exceptions in the JDBC table catalog #44335

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
MaxGekk wants to merge 2 commits into from
Closed

[SPARK-46393][SQL] Classify exceptions in the JDBC table catalog #44335

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f179fc6
Classify exceptions in JDBCTableCatalog
MaxGekk Dec 13, 2023
309c4fd
Trigger build
MaxGekk Dec 13, 2023
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
14 changes: 10 additions & 4 deletions .../src/main/scala/org/apache/spark/sql/execution/datasources/v2/jdbc/JDBCTableCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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)
}
}
}

Expand Down