Skip to content

Random cleanups in DirectTrinoClient #26414

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 2 commits into from
Aug 15, 2025
Merged

Random cleanups in DirectTrinoClient #26414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f4b48
Remove redundant requireNonNull
hashhar Aug 14, 2025
7f9138f
Extract heartbeat handling into a separate method for clarity
hashhar Aug 14, 2025
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
41 changes: 23 additions & 18 deletions core/trino-main/src/main/java/io/trino/client/direct/DirectTrinoClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public DirectTrinoClient(
this.queryManager = requireNonNull(queryManager, "queryManager is null");
this.directExchangeClientSupplier = requireNonNull(directExchangeClientSupplier, "directExchangeClientSupplier is null");
this.blockEncodingSerde = requireNonNull(blockEncodingSerde, "blockEncodingSerde is null");
this.heartBeatIntervalMillis = requireNonNull(queryManagerConfig, "queryManagerConfig is null").getClientTimeout().toMillis() / 2;
this.heartBeatIntervalMillis = queryManagerConfig.getClientTimeout().toMillis() / 2;
}

public DispatchQuery execute(SessionContext sessionContext, @Language("SQL") String sql, QueryResultsListener queryResultsListener)
Expand Down Expand Up @@ -117,23 +117,7 @@ public DispatchQuery execute(SessionContext sessionContext, @Language("SQL") Str
ListenableFuture<Object> anyCompleteFuture = whenAnyComplete(ImmutableList.of(
queryManager.getStateChange(queryId, state),
exchangeClient.isBlocked()));
while (!anyCompleteFuture.isDone()) {
try {
anyCompleteFuture.get(heartBeatIntervalMillis, TimeUnit.MILLISECONDS);
}
catch (TimeoutException e) {
// continue waiting until the query state changes or the exchange client is blocked.
// we need to periodically record the heartbeat to prevent the query from being canceled
dispatchQuery.recordHeartbeat();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new TrinoException(GENERIC_INTERNAL_ERROR, "Thread interrupted", e);
}
catch (ExecutionException e) {
throw new TrinoException(GENERIC_INTERNAL_ERROR, "Error processing query", e.getCause());
}
}
getQueryFutureWithHeartbeats(anyCompleteFuture, dispatchQuery);
}
}

Expand All @@ -157,6 +141,27 @@ private DirectExchangeClient createExchangeClient(DispatchQuery dispatchQuery)
getRetryPolicy(dispatchQuery.getSession()));
}

private void getQueryFutureWithHeartbeats(ListenableFuture<Object> anyCompleteFuture, DispatchQuery dispatchQuery)
{
while (!anyCompleteFuture.isDone()) {
try {
anyCompleteFuture.get(heartBeatIntervalMillis, TimeUnit.MILLISECONDS);
}
catch (TimeoutException e) {
// continue waiting until the query state changes or the exchange client is blocked.
// we need to periodically record the heartbeat to prevent the query from being canceled
dispatchQuery.recordHeartbeat();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new TrinoException(GENERIC_INTERNAL_ERROR, "Thread interrupted", e);
}
catch (ExecutionException e) {
throw new TrinoException(GENERIC_INTERNAL_ERROR, "Error processing query", e.getCause());
}
}
}

private static <T> void getQueryFuture(ListenableFuture<T> future)
{
try {
Expand Down