From 9a546259ddb63bf0bfe7d87e6bb9856e6968e749 Mon Sep 17 00:00:00 2001 From: Cheng Lian Date: Thu, 27 Nov 2014 14:56:40 +0800 Subject: [PATCH] Only shutdowns a single DB rather than the whole Derby driver --- .../test/java/org/apache/spark/JavaJdbcRDDSuite.java | 10 ++++++---- .../test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/src/test/java/org/apache/spark/JavaJdbcRDDSuite.java b/core/src/test/java/org/apache/spark/JavaJdbcRDDSuite.java index 08b6359df2f43..7fe452a48d89b 100644 --- a/core/src/test/java/org/apache/spark/JavaJdbcRDDSuite.java +++ b/core/src/test/java/org/apache/spark/JavaJdbcRDDSuite.java @@ -43,7 +43,7 @@ public void setUp() throws ClassNotFoundException, SQLException { Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); Connection connection = - DriverManager.getConnection("jdbc:derby:target/JdbcRDDSuiteDb;create=true"); + DriverManager.getConnection("jdbc:derby:target/JavaJdbcRDDSuiteDb;create=true"); try { Statement create = connection.createStatement(); @@ -72,9 +72,11 @@ public void setUp() throws ClassNotFoundException, SQLException { @After public void tearDown() throws SQLException { try { - DriverManager.getConnection("jdbc:derby:;shutdown=true"); + DriverManager.getConnection("jdbc:derby:target/JavaJdbcRDDSuiteDb;shutdown=true"); } catch(SQLException e) { - if (e.getSQLState().compareTo("XJ015") != 0) { + // Throw if not normal single database shutdown + // https://db.apache.org/derby/docs/10.2/ref/rrefexcept71493.html + if (e.getSQLState().compareTo("08006") != 0) { throw e; } } @@ -90,7 +92,7 @@ public void testJavaJdbcRDD() throws Exception { new JdbcRDD.ConnectionFactory() { @Override public Connection getConnection() throws SQLException { - return DriverManager.getConnection("jdbc:derby:target/JdbcRDDSuiteDb"); + return DriverManager.getConnection("jdbc:derby:target/JavaJdbcRDDSuiteDb"); } }, "SELECT DATA FROM FOO WHERE ? <= ID AND ID <= ?", diff --git a/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala b/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala index 76e317d754ba3..6138d0bbd57f6 100644 --- a/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala +++ b/core/src/test/scala/org/apache/spark/rdd/JdbcRDDSuite.scala @@ -65,10 +65,11 @@ class JdbcRDDSuite extends FunSuite with BeforeAndAfter with LocalSparkContext { after { try { - DriverManager.getConnection("jdbc:derby:;shutdown=true") + DriverManager.getConnection("jdbc:derby:target/JdbcRDDSuiteDb;shutdown=true") } catch { - case se: SQLException if se.getSQLState == "XJ015" => - // normal shutdown + case se: SQLException if se.getSQLState == "08006" => + // Normal single database shutdown + // https://db.apache.org/derby/docs/10.2/ref/rrefexcept71493.html } } }