spark git commit: SPARK-5239 [CORE] JdbcRDD throws "java.lang.AbstractMethodError: oracle.jdbc.driver.xxxxxx.isClosed()Z"
Repository: spark Updated Branches: refs/heads/master c15134632 -> 2d1e91673 SPARK-5239 [CORE] JdbcRDD throws "java.lang.AbstractMethodError: oracle.jdbc.driver.xx.isClosed()Z" This is a completion of https://github.com/apache/spark/pull/4033 which was withdrawn for some reason. Author: Sean Owen Closes #4470 from srowen/SPARK-5239.2 and squashes the following commits: 2398bde [Sean Owen] Avoid use of JDBC4-only isClosed() Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2d1e9167 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2d1e9167 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2d1e9167 Branch: refs/heads/master Commit: 2d1e916730492f5d61b97da6c483d3223ca44315 Parents: c151346 Author: Sean Owen Authored: Tue Feb 10 09:19:01 2015 + Committer: Sean Owen Committed: Tue Feb 10 09:19:01 2015 + -- core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala | 6 +++--- .../src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/2d1e9167/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala -- diff --git a/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala b/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala index 642a12c..4fe7622 100644 --- a/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala @@ -99,21 +99,21 @@ class JdbcRDD[T: ClassTag]( override def close() { try { -if (null != rs && ! rs.isClosed()) { +if (null != rs) { rs.close() } } catch { case e: Exception => logWarning("Exception closing resultset", e) } try { -if (null != stmt && ! stmt.isClosed()) { +if (null != stmt) { stmt.close() } } catch { case e: Exception => logWarning("Exception closing statement", e) } try { -if (null != conn && ! conn.isClosed()) { +if (null != conn) { conn.close() } logInfo("closed connection") http://git-wip-us.apache.org/repos/asf/spark/blob/2d1e9167/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala -- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala index 0bec32c..87304ce 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala @@ -370,21 +370,21 @@ private[sql] class JDBCRDD( def close() { if (closed) return try { -if (null != rs && ! rs.isClosed()) { +if (null != rs) { rs.close() } } catch { case e: Exception => logWarning("Exception closing resultset", e) } try { -if (null != stmt && ! stmt.isClosed()) { +if (null != stmt) { stmt.close() } } catch { case e: Exception => logWarning("Exception closing statement", e) } try { -if (null != conn && ! conn.isClosed()) { +if (null != conn) { conn.close() } logInfo("closed connection") - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: SPARK-5239 [CORE] JdbcRDD throws "java.lang.AbstractMethodError: oracle.jdbc.driver.xxxxxx.isClosed()Z"
Repository: spark Updated Branches: refs/heads/branch-1.3 281614d7c -> 4cfc02531 SPARK-5239 [CORE] JdbcRDD throws "java.lang.AbstractMethodError: oracle.jdbc.driver.xx.isClosed()Z" This is a completion of https://github.com/apache/spark/pull/4033 which was withdrawn for some reason. Author: Sean Owen Closes #4470 from srowen/SPARK-5239.2 and squashes the following commits: 2398bde [Sean Owen] Avoid use of JDBC4-only isClosed() (cherry picked from commit 2d1e916730492f5d61b97da6c483d3223ca44315) Signed-off-by: Sean Owen Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4cfc0253 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4cfc0253 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4cfc0253 Branch: refs/heads/branch-1.3 Commit: 4cfc02531a08c833a44043b183d36cd14d2c7611 Parents: 281614d Author: Sean Owen Authored: Tue Feb 10 09:19:01 2015 + Committer: Sean Owen Committed: Tue Feb 10 09:19:15 2015 + -- core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala | 6 +++--- .../src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/4cfc0253/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala -- diff --git a/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala b/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala index 642a12c..4fe7622 100644 --- a/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala @@ -99,21 +99,21 @@ class JdbcRDD[T: ClassTag]( override def close() { try { -if (null != rs && ! rs.isClosed()) { +if (null != rs) { rs.close() } } catch { case e: Exception => logWarning("Exception closing resultset", e) } try { -if (null != stmt && ! stmt.isClosed()) { +if (null != stmt) { stmt.close() } } catch { case e: Exception => logWarning("Exception closing statement", e) } try { -if (null != conn && ! conn.isClosed()) { +if (null != conn) { conn.close() } logInfo("closed connection") http://git-wip-us.apache.org/repos/asf/spark/blob/4cfc0253/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala -- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala index 0bec32c..87304ce 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala @@ -370,21 +370,21 @@ private[sql] class JDBCRDD( def close() { if (closed) return try { -if (null != rs && ! rs.isClosed()) { +if (null != rs) { rs.close() } } catch { case e: Exception => logWarning("Exception closing resultset", e) } try { -if (null != stmt && ! stmt.isClosed()) { +if (null != stmt) { stmt.close() } } catch { case e: Exception => logWarning("Exception closing statement", e) } try { -if (null != conn && ! conn.isClosed()) { +if (null != conn) { conn.close() } logInfo("closed connection") - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org