beliefer commented on code in PR #44358:
URL: https://github.com/apache/spark/pull/44358#discussion_r1427861122
##########
sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala:
##########
@@ -225,40 +225,42 @@ private object PostgresDialect extends JdbcDialect with
SQLConfHelper {
s"DROP INDEX ${quoteIdentifier(indexName)}"
}
- override def classifyException(message: String, e: Throwable):
AnalysisException = {
+ // Message pattern defined by postgres specification
+ private final val pgAlreadyExistsRegex = """(?:.*)relation "(.*)" already
exists""".r
+
+ override def classifyException(
+ e: Throwable,
+ errorClass: String,
+ messageParameters: Map[String, String]): AnalysisException = {
e match {
case sqlException: SQLException =>
sqlException.getSQLState match {
// https://www.postgresql.org/docs/14/errcodes-appendix.html
- case "42P07" =>
- // Message patterns defined at caller sides of spark
- val indexRegex = "(?s)Failed to create index (.*) in (.*)".r
- val renameRegex = "(?s)Failed table renaming from (.*) to (.*)".r
- // Message pattern defined by postgres specification
- val pgRegex = """(?:.*)relation "(.*)" already exists""".r
-
- message match {
- case indexRegex(index, table) =>
- throw new IndexAlreadyExistsException(
- indexName = index, tableName = table, cause = Some(e))
- case renameRegex(_, newTable) =>
- throw QueryCompilationErrors.tableAlreadyExistsError(newTable)
- case _ if
pgRegex.findFirstMatchIn(sqlException.getMessage).nonEmpty =>
- val tableName =
pgRegex.findFirstMatchIn(sqlException.getMessage).get.group(1)
- throw QueryCompilationErrors.tableAlreadyExistsError(tableName)
- case _ => super.classifyException(message, e)
- }
- case "42704" =>
- // The message is: Failed to drop index indexName in tableName
- val regex = "(?s)Failed to drop index (.*) in (.*)".r
- val indexName = regex.findFirstMatchIn(message).get.group(1)
- val tableName = regex.findFirstMatchIn(message).get.group(2)
+ case "42P07" if errorClass == "FAILED_JDBC.CREATE_INDEX" =>
+ throw new IndexAlreadyExistsException(
+ indexName = messageParameters("indexName"),
+ tableName = messageParameters("tableName"),
+ cause = Some(e))
+ case "42P07" if errorClass == "FAILED_JDBC.RENAME_TABLE" =>
+ val newTable = messageParameters("newName")
+ throw QueryCompilationErrors.tableAlreadyExistsError(newTable)
+ case "42P07" if
pgAlreadyExistsRegex.findFirstMatchIn(sqlException.getMessage).nonEmpty =>
+ val tableName =
pgAlreadyExistsRegex.findFirstMatchIn(sqlException.getMessage)
Review Comment:
Please make `pgAlreadyExistsRegex.findFirstMatchIn(sqlException.getMessage)`
execute only once
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
