RingBuffer to respect setMaxRows on statement

aws · Apr 13, 2023 · 96bed2e · 96bed2e
1 parent 037beb4
commit 96bed2e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/amazon/redshift/jdbc/RedshiftStatementImpl.java b/src/main/java/com/amazon/redshift/jdbc/RedshiftStatementImpl.java
@@ -729,10 +729,13 @@ public ResultSet getResultSet() throws SQLException {
    * {@inheritDoc}
    */
   public final void close() throws SQLException {
-    if(connection.getQueryExecutor().isRingBufferThreadRunning())
+    if(connection.getQueryExecutor().isRingBufferThreadRunning() &&
+            (!connection.getAutoCommit() || getMaxRows() == 0))
     {
       // Wait for current ring buffer thread to finish, if any.
       // Shouldn't call from synchronized method, which can cause dead-lock.
+      // We don't want to wait for ring buffer to fetch all rows if setMaxRows() is set,
+      // or if autoCommit is set to true
       connection.getQueryExecutor().waitForRingBufferThreadToFinish(false, false, true, null, null);
     }