Skip to content

Finish query when client has consumed results #14122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2022
Merged

Finish query when client has consumed results #14122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@ public ExecutingStatementResource(
catch (Throwable e) {
log.warn(e, "Error removing old queries");
}

try {
for (Query query : queries.values()) {
query.markResultsConsumedIfReady();
}
}
catch (Throwable e) {
log.warn(e, "Error marking results consumed");
}
},
200,
200,
Expand Down
9 changes: 8 additions & 1 deletion core/trino-main/src/main/java/io/trino/server/protocol/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,13 @@ public synchronized ListenableFuture<QueryResults> waitForResults(long token, Ur
return Futures.transform(futureStateChange, ignored -> getNextResult(token, uriInfo, targetResultSize), resultsProcessorExecutor);
}

public synchronized void markResultsConsumedIfReady()
{
if (!resultsConsumed && exchangeDataSource.isFinished()) {
queryManager.resultsConsumed(queryId);
}
}

private synchronized ListenableFuture<Void> getFutureStateChange()
{
// if the exchange client is open, wait for data
Expand Down Expand Up @@ -424,7 +431,7 @@ private synchronized QueryResults getNextResult(long token, UriInfo uriInfo, Dat
updateCount = updatedRowsCount.orElse(null);
}

if (queryInfo.getOutputStage().isEmpty() || (exchangeDataSource.isFinished() && resultRows.isEmpty())) {
if (queryInfo.getOutputStage().isEmpty() || exchangeDataSource.isFinished()) {
queryManager.resultsConsumed(queryId);
resultsConsumed = true;
// update query since the query might have been transitioned to the FINISHED state
Expand Down