[CONJ-1208] ensure not using pipelining prepare + execute for mysql s…

…erver
mariadb-corporation · Nov 4, 2024 · ce9b23c · ce9b23c
1 parent 4738d1d
commit ce9b23c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 33 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/ClientPreparedStatement.java b/src/main/java/org/mariadb/jdbc/ClientPreparedStatement.java
@@ -121,6 +121,11 @@ protected boolean executeInternalPreparedBatch() throws SQLException {
     parseCommandIfNeeded(sql);
     Configuration conf = con.getContext().getConf();
 
+    if (!con.getContext().hasServerCapability(STMT_BULK_OPERATIONS)) {
+      executeBatchStd();
+      return false;
+    }
+
     boolean possibleLoadLocal = con.getContext().hasClientCapability(LOCAL_FILES);
     if (possibleLoadLocal) {
       String sqlUpper = sql.toUpperCase(Locale.ROOT);
@@ -136,14 +141,13 @@ protected boolean executeInternalPreparedBatch() throws SQLException {
       // * if RETURN_GENERATED_KEYS is expressly set, can only be use if server permit returning
       // individual result
       boolean canUseBulk =
-          con.getContext().hasServerCapability(STMT_BULK_OPERATIONS)
-              && (((clientParser.isInsert()
-                          && ((conf.useBulkStmts() || conf.useBulkStmtsForInserts())
-                              && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
-                                  || !clientParser.isInsertDuplicate())))
-                      || (!clientParser.isInsert() && conf.useBulkStmts()))
-                  && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
-                      || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS));
+          ((clientParser.isInsert()
+                      && ((conf.useBulkStmts() || conf.useBulkStmtsForInserts())
+                          && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
+                              || !clientParser.isInsertDuplicate())))
+                  || (!clientParser.isInsert() && conf.useBulkStmts()))
+              && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
+                  || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS);
       if (canUseBulk && batchParameters.size() > 1 && !clientParser.isMultiQuery()) {
         executeBatchBulk(escapeTimeout(sql));
         return true;

diff --git a/src/main/java/org/mariadb/jdbc/ServerPreparedStatement.java b/src/main/java/org/mariadb/jdbc/ServerPreparedStatement.java
@@ -163,6 +163,10 @@ protected boolean executeInternalPreparedBatch() throws SQLException {
     checkNotClosed();
     String cmd = escapeTimeout(sql);
 
+    if (!con.getContext().hasServerCapability(STMT_BULK_OPERATIONS)) {
+      executeBatchStandard(cmd);
+      return false;
+    }
     // ensure pipelining is possible (no LOAD DATA/XML INFILE commands)
     boolean possibleLoadLocal = con.getContext().hasClientCapability(LOCAL_FILES);
     if (possibleLoadLocal) {
@@ -173,33 +177,32 @@ protected boolean executeInternalPreparedBatch() throws SQLException {
 
     if (possibleLoadLocal) {
       executeBatchStandard(cmd);
-    } else {
-      Configuration conf = con.getContext().getConf();
-      parseCommandIfNeeded(sql);
-
-      // a bit complex:
-      // * bulk on INSERT ON DUPLICATE KEY UPDATE can only be use if server permit returning
-      // individual result, since affected rows cannot be guessed
-      // * if RETURN_GENERATED_KEYS is expressly set, can only be use if server permit returning
-      // individual result
-      boolean canUseBulk =
-          con.getContext().hasServerCapability(STMT_BULK_OPERATIONS)
-              && (((clientParser.isInsert()
-                          && ((conf.useBulkStmts() || conf.useBulkStmtsForInserts())
-                              && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
-                                  || !clientParser.isInsertDuplicate())))
-                      || (!clientParser.isInsert() && conf.useBulkStmts()))
-                  && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
-                      || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS));
-      if (canUseBulk && batchParameters.size() > 1) {
-        executeBatchBulk(cmd);
-        return true;
-      } else {
-        executeBatchPipeline(cmd);
-      }
+      return false;
     }
 
-    return false;
+    Configuration conf = con.getContext().getConf();
+    parseCommandIfNeeded(sql);
+
+    // a bit complex:
+    // * bulk on INSERT ON DUPLICATE KEY UPDATE can only be use if server permit returning
+    // individual result, since affected rows cannot be guessed
+    // * if RETURN_GENERATED_KEYS is expressly set, can only be use if server permit returning
+    // individual result
+    boolean canUseBulk =
+        ((clientParser.isInsert()
+                    && ((conf.useBulkStmts() || conf.useBulkStmtsForInserts())
+                        && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
+                            || !clientParser.isInsertDuplicate())))
+                || (!clientParser.isInsert() && conf.useBulkStmts()))
+            && (con.getContext().hasClientCapability(BULK_UNIT_RESULTS)
+                || autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS);
+    if (canUseBulk && batchParameters.size() > 1) {
+      executeBatchBulk(cmd);
+      return true;
+    } else {
+      executeBatchPipeline(cmd);
+      return false;
+    }
   }
 
   /**