From 5349851f368a1b5dab8a99c0d51c9638ce7aec56 Mon Sep 17 00:00:00 2001
From: Huaxin Gao <huaxing@oc0558782468.ibm.com>
Date: Thu, 3 Dec 2015 08:42:21 +0000
Subject: [PATCH] =?UTF-8?q?[SPARK-12088][SQL]=20check=20connection.isClose?=
=?UTF-8?q?d=20before=20calling=20connection=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In Java Spec java.sql.Connection, it has
boolean getAutoCommit() throws SQLException
Throws:
SQLException - if a database access error occurs or this method is called on a closed connection
So if conn.getAutoCommit is called on a closed connection, a SQLException will be thrown. Even though the code catch the SQLException and program can continue, I think we should check conn.isClosed before calling conn.getAutoCommit to avoid the unnecessary SQLException.
Author: Huaxin Gao <huaxing@oc0558782468.ibm.com>
Closes #10095 from huaxingao/spark-12088.
---
.../apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala
index 392d3ed58e..b9dd7f6b40 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala
@@ -498,7 +498,7 @@ private[sql] class JDBCRDD(
}
try {
if (null != conn) {
- if (!conn.getAutoCommit && !conn.isClosed) {
+ if (!conn.isClosed && !conn.getAutoCommit) {
try {
conn.commit()
} catch {
--
GitLab