Fix for Bug#112884 (Bug#36043166), Setting a large timeout leads to e…

…rrors when executing SQL. Change-Id: I6d0be9e57582c4d66d319445db1776950155e9cd
mysql · Dec 4, 2023 · 2685f05 · 2685f05
1 parent 61422b9
commit 2685f05
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 18 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 8.3.0
 
+  - Fix for Bug#112884 (Bug#36043166), Setting a large timeout leads to errors when executing SQL.
+
   - WL#16077, Upgrade 3rd party libraries and tools.
 
   - WL#16074, Upgrade Protocol Buffers dependency to protobuf-java-3.25.1.

diff --git a/src/main/core-api/java/com/mysql/cj/Query.java b/src/main/core-api/java/com/mysql/cj/Query.java
@@ -87,9 +87,9 @@ public enum CancelStatus {
 
     void setResultType(Resultset.Type resultSetType);
 
-    int getTimeoutInMillis();
+    long getTimeoutInMillis();
 
-    void setTimeoutInMillis(int timeoutInMillis);
+    void setTimeoutInMillis(long timeoutInMillis);
 
     void setExecuteTime(long executeTime);
 
@@ -100,7 +100,7 @@ public enum CancelStatus {
      */
     long getExecuteTime();
 
-    CancelQueryTask startQueryTimer(Query stmtToCancel, int timeout);
+    CancelQueryTask startQueryTimer(Query stmtToCancel, long timeout);
 
     AtomicBoolean getStatementExecuting();
 

diff --git a/src/main/core-impl/java/com/mysql/cj/AbstractQuery.java b/src/main/core-impl/java/com/mysql/cj/AbstractQuery.java
@@ -66,7 +66,7 @@ public abstract class AbstractQuery implements Query {
     private CancelStatus cancelStatus = CancelStatus.NOT_CANCELED;
 
     /** The timeout for a query */
-    protected int timeoutInMillis = 0;
+    protected long timeoutInMillis = 0L;
 
     /** Holds batched commands */
     protected List<Object> batchedArgs;
@@ -206,17 +206,17 @@ public void setResultType(Resultset.Type resultSetType) {
     }
 
     @Override
-    public int getTimeoutInMillis() {
+    public long getTimeoutInMillis() {
         return this.timeoutInMillis;
     }
 
     @Override
-    public void setTimeoutInMillis(int timeoutInMillis) {
+    public void setTimeoutInMillis(long timeoutInMillis) {
         this.timeoutInMillis = timeoutInMillis;
     }
 
     @Override
-    public CancelQueryTask startQueryTimer(Query stmtToCancel, int timeout) {
+    public CancelQueryTask startQueryTimer(Query stmtToCancel, long timeout) {
         if (this.session.getPropertySet().getBooleanProperty(PropertyKey.enableQueryTimeouts).getValue() && timeout != 0) {
             CancelQueryTaskImpl timeoutTask = new CancelQueryTaskImpl(stmtToCancel);
             this.session.getCancelTimer().schedule(timeoutTask, timeout);

diff --git a/src/main/user-impl/java/com/mysql/cj/jdbc/ClientPreparedStatement.java b/src/main/user-impl/java/com/mysql/cj/jdbc/ClientPreparedStatement.java
@@ -391,7 +391,7 @@ protected long[] executeBatchInternal() throws SQLException {
             }
 
             // we timeout the entire batch, not individual statements
-            int batchTimeout = getTimeoutInMillis();
+            long batchTimeout = getTimeoutInMillis();
             setTimeoutInMillis(0);
 
             resetCancelledState();
@@ -432,7 +432,7 @@ protected long[] executeBatchInternal() throws SQLException {
      * @throws SQLException
      *             if a database access error occurs or this method is called on a closed PreparedStatement
      */
-    protected long[] executePreparedBatchAsMultiStatement(int batchTimeout) throws SQLException {
+    protected long[] executePreparedBatchAsMultiStatement(long batchTimeout) throws SQLException {
         synchronized (checkClosed().getConnectionMutex()) {
             // This is kind of an abuse, but it gets the job done
             if (this.batchedValuesClause == null) {
@@ -618,7 +618,7 @@ private String generateMultiStatementForBatch(int numBatches) throws SQLExceptio
      * @throws SQLException
      *             if a database access error occurs or this method is called on a closed PreparedStatement
      */
-    protected long[] executeBatchWithMultiValuesClause(int batchTimeout) throws SQLException {
+    protected long[] executeBatchWithMultiValuesClause(long batchTimeout) throws SQLException {
         synchronized (checkClosed().getConnectionMutex()) {
             JdbcConnection locallyScopedConn = this.connection;
 
@@ -746,7 +746,7 @@ protected long[] executeBatchWithMultiValuesClause(int batchTimeout) throws SQLE
      * @throws SQLException
      *             if an error occurs
      */
-    protected long[] executeBatchSerially(int batchTimeout) throws SQLException {
+    protected long[] executeBatchSerially(long batchTimeout) throws SQLException {
         synchronized (checkClosed().getConnectionMutex()) {
             if (this.connection == null) {
                 checkClosed();

diff --git a/src/main/user-impl/java/com/mysql/cj/jdbc/ServerPreparedStatement.java b/src/main/user-impl/java/com/mysql/cj/jdbc/ServerPreparedStatement.java
@@ -210,7 +210,7 @@ public void close() throws SQLException {
     }
 
     @Override
-    protected long[] executeBatchSerially(int batchTimeout) throws SQLException {
+    protected long[] executeBatchSerially(long batchTimeout) throws SQLException {
         synchronized (checkClosed().getConnectionMutex()) {
             JdbcConnection locallyScopedConn = this.connection;
 

diff --git a/src/main/user-impl/java/com/mysql/cj/jdbc/StatementImpl.java b/src/main/user-impl/java/com/mysql/cj/jdbc/StatementImpl.java
@@ -639,7 +639,7 @@ protected void setupStreamingTimeout(JdbcConnection con) throws SQLException {
     }
 
     @Override
-    public CancelQueryTask startQueryTimer(Query stmtToCancel, int timeout) {
+    public CancelQueryTask startQueryTimer(Query stmtToCancel, long timeout) {
         return this.query.startQueryTimer(stmtToCancel, timeout);
     }
 
@@ -820,7 +820,7 @@ protected long[] executeBatchInternal() throws SQLException {
             }
 
             // we timeout the entire batch, not individual statements
-            int individualStatementTimeout = getTimeoutInMillis();
+            long individualStatementTimeout = getTimeoutInMillis();
             setTimeoutInMillis(0);
 
             CancelQueryTask timeoutTask = null;
@@ -952,7 +952,7 @@ protected final boolean hasDeadlockOrTimeoutRolledBackTx(SQLException ex) {
      * @throws SQLException
      *             if a database access error occurs or this method is called on a closed PreparedStatement
      */
-    private long[] executeBatchUsingMultiQueries(boolean multiQueriesEnabled, int nbrCommands, int individualStatementTimeout) throws SQLException {
+    private long[] executeBatchUsingMultiQueries(boolean multiQueriesEnabled, int nbrCommands, long individualStatementTimeout) throws SQLException {
         JdbcConnection locallyScopedConn = checkClosed();
 
         synchronized (locallyScopedConn.getConnectionMutex()) {
@@ -1614,7 +1614,7 @@ public boolean getMoreResults(int current) throws SQLException {
     @Override
     public int getQueryTimeout() throws SQLException {
         synchronized (checkClosed().getConnectionMutex()) {
-            return getTimeoutInMillis() / 1000;
+            return Math.toIntExact(getTimeoutInMillis() / 1000);
         }
     }
 
@@ -2206,12 +2206,12 @@ public void setResultType(Resultset.Type resultSetType) {
     }
 
     @Override
-    public int getTimeoutInMillis() {
+    public long getTimeoutInMillis() {
         return this.query.getTimeoutInMillis();
     }
 
     @Override
-    public void setTimeoutInMillis(int timeoutInMillis) {
+    public void setTimeoutInMillis(long timeoutInMillis) {
         this.query.setTimeoutInMillis(timeoutInMillis);
     }
 

diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java
@@ -13543,4 +13543,16 @@ void testBug109546() throws Exception {
         });
     }
 
+    /**
+     * Tests fix for Bug#112884 (Bug#36043166), Setting a large timeout leads to errors when executing SQL.
+     *
+     * @throws Exception
+     */
+    @Test
+    void testBug112884() throws Exception {
+        assertDoesNotThrow(() -> {
+            this.stmt.setQueryTimeout(Integer.MAX_VALUE / 1000 + 1);
+        });
+    }
+
 }