Merge pull request alibaba#742 from wenshao/master

improved mysql exception sorter
zgpxiong · Dec 7, 2014 · 09f1c1b · 09f1c1b
2 parents 67c4044 + e0e851a
commit 09f1c1b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
@@ -24,12 +24,13 @@ public class MySqlExceptionSorter implements ExceptionSorter {
 
     @Override
     public boolean isExceptionFatal(SQLException e) {
-        String sqlState = e.getSQLState();
+        final String sqlState = e.getSQLState();
         final int errorCode = e.getErrorCode();
 
         if (sqlState != null && sqlState.startsWith("08")) {
             return true;
         }
+
         switch (errorCode) {
         // Communications Errors
             case 1040: // ER_CON_COUNT_ERROR
@@ -55,9 +56,15 @@ public boolean isExceptionFatal(SQLException e) {
                 break;
         }
 
+        // for oceanbase
         if (errorCode >= -10000 && errorCode <= -9000) {
             return true;
         }
+
+        String className = e.getClass().getName();
+        if ("com.mysql.jdbc.CommunicationsException".equals(className)) {
+            return true;
+        }
 
         String message = e.getMessage();
         if (message != null && message.length() > 0) {

diff --git a/src/test/java/com/alibaba/druid/TestOracle.java b/src/test/java/com/alibaba/druid/TestOracle.java
@@ -38,9 +38,9 @@ protected void setUp() throws Exception {
         // password = "ccbuauto";
         // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?";
 
-        jdbcUrl = "jdbc:oracle:thin:@10.20.149.81:1521:ointest3";
-        user = "alibaba";
-        password = "deYcR7facWSJtCuDpm2r";
+        jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:xx";
+        user = "a";
+        password = "b";
         SQL = "SELECT * FROM AV_INFO WHERE ID = ?";
 
         driverClass = "oracle.jdbc.driver.OracleDriver";

diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java
@@ -39,4 +39,9 @@ public void test_false_1() throws Exception {
         MySqlExceptionSorter sorter = new MySqlExceptionSorter();
         Assert.assertFalse(sorter.isExceptionFatal(new SQLException("", "", -8000)));
     }
+
+    public void test_true_3() throws Exception {
+        MySqlExceptionSorter sorter = new MySqlExceptionSorter();
+        Assert.assertTrue(sorter.isExceptionFatal(new com.mysql.jdbc.CommunicationsException(null, 0, 0, null)));
+    }
 }