Ensure cached query results are discarded

trinodb · Mar 15, 2022 · d2c7f63 · d2c7f63
1 parent 48e0bfa
commit d2c7f63
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/Query.java b/core/trino-main/src/main/java/io/trino/server/protocol/Query.java
@@ -444,8 +444,10 @@ private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, Dat
         // only return a next if
         // (1) the query is not done AND the query state is not FAILED
         //   OR
-        // (2)there is more data to send (due to buffering)
-        if (queryInfo.getState() != FAILED && (!queryInfo.isFinalQueryInfo() || !exchangeClient.isFinished() || (lastResult != null && lastResult.getData() != null))) {
+        // (2) there is more data to send (due to buffering)
+        //   OR
+        // (3) cached query result needs client acknowledgement to discard
+        if (queryInfo.getState() != FAILED && (!queryInfo.isFinalQueryInfo() || !exchangeClient.isFinished() || (queryInfo.getOutputStage().isPresent() && !resultRows.isEmpty()))) {
             nextToken = OptionalLong.of(token + 1);
         }
         else {