Merge remote-tracking branch 'origin/pr/112' into develop

mariadb-corporation · Sep 20, 2017 · 90da571 · 90da571
2 parents a0e487c + 755d162
commit 90da571
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 1 deletion.
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformation.java b/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformation.java
@@ -71,6 +71,8 @@ public interface CmdInformation {
 
     void addErrorStat();
 
+    void clearErrorStat();
+
     void addResultSetStat();
 
     ResultSet getGeneratedKeys(Protocol protocol);

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationBatch.java b/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationBatch.java
@@ -95,6 +95,16 @@ public void addErrorStat() {
         this.updateCounts.add((long) Statement.EXECUTE_FAILED);
     }
 
+    /**
+     * Clear error state, used for clear exception after first batch query, when fall back to per-query execution.
+     *
+     */
+    @Override
+    public void clearErrorStat() {
+        hasException = false;
+        this.updateCounts.remove((long) Statement.EXECUTE_FAILED);
+    }
+
     public void addResultSetStat() {
         this.updateCounts.add((long) RESULT_SET_VALUE);
     }

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationMultiple.java b/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationMultiple.java
@@ -92,6 +92,17 @@ public void addErrorStat() {
         this.updateCounts.add((long) Statement.EXECUTE_FAILED);
     }
 
+    /**
+     * Clear error state, used for clear exception after first batch query, when fall back to per-query execution.
+     *
+     */
+    @Override
+    public void clearErrorStat() {
+        hasException = false;
+        this.updateCounts.remove((long) Statement.EXECUTE_FAILED);
+    }
+
+
     public void addResultSetStat() {
         this.updateCounts.add((long) RESULT_SET_VALUE);
     }

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationSingle.java b/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationSingle.java
@@ -102,6 +102,11 @@ public void addErrorStat() {
         //not expected
     }
 
+    @Override
+    public void clearErrorStat() {
+        //not expected
+    }
+
     @Override
     public void addResultSetStat() {
         //not expected

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -430,7 +430,10 @@ private boolean executeBulkBatch(Results results, String sql, ServerPrepareResul
                     getResult(results);
                 } catch (SQLException sqle) {
                     if ("HY000".equals(sqle.getSQLState()) && sqle.getErrorCode() == 1295) {
-                        //query contain SELECT. cannot be handle by BULK protocol
+                        //query contain SELECT or DELETE. cannot be handle by BULK protocol
+                        // clear error and special error code, so it won't leak anywhere
+                        // and wouldn't be misinterpreted as an additional update count
+                        results.getCmdInformation().clearErrorStat();
                         return false;
                     }
                     if (exception == null) {

diff --git a/src/test/java/org/mariadb/jdbc/StatementTest.java b/src/test/java/org/mariadb/jdbc/StatementTest.java
@@ -361,4 +361,41 @@ public void testFractionalTimeBatch() throws SQLException {
             }
         }
     }
+
+    @Test
+    public void testFallbackBatchUpdate() throws SQLException {
+        Assume.assumeTrue(doPrecisionTest);
+
+        createTable("testFallbackBatchUpdate", "col int");
+        int[] results;
+        int queriesInBatch = 2;
+        try (PreparedStatement preparedStatement = sharedConnection.prepareStatement(
+                "DELETE FROM testFallbackBatchUpdate WHERE col = ? ")) {
+            for (int i = 0; i < queriesInBatch; i++) {
+                preparedStatement.setInt(1, 0);
+                preparedStatement.addBatch();
+            }
+            results = preparedStatement.executeBatch();
+        }
+        assertEquals(results.length, queriesInBatch);
+    }
+
+    @Test
+    public void testProperBatchUpdate() throws SQLException {
+        Assume.assumeTrue(doPrecisionTest);
+
+        createTable("testProperBatchUpdate", "col int, col2 int");
+        int[] results;
+        int queriesInBatch = 3;
+        try (PreparedStatement preparedStatement = sharedConnection.prepareStatement(
+                "UPDATE testProperBatchUpdate set col2 = ? WHERE col = ? ")) {
+            for (int i = 0; i < queriesInBatch; i++) {
+                preparedStatement.setInt(1, i);
+                preparedStatement.setInt(2, i);
+                preparedStatement.addBatch();
+            }
+            results = preparedStatement.executeBatch();
+        }
+        assertEquals(results.length, queriesInBatch);
+    }
 }