Skip to content

ESQL: Add fields to detailed query fetch api #127161

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
Apr 23, 2025
Merged

ESQL: Add fields to detailed query fetch api #127161

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
2 changes: 2 additions & 0 deletions ...internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlListQueriesActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public void testRunningQueries() throws Exception {
jsonEntityToMap(getQueryResponse.getEntity()),
basicMatcher.entry("coordinating_node", isA(String.class))
.entry("data_nodes", allOf(isA(List.class), everyItem(isA(String.class))))
.entry("documents_found", IntOrLongMatcher.isIntOrLong())
.entry("values_loaded", IntOrLongMatcher.isIntOrLong())
);
} finally {
if (id != null) {
Expand Down
4 changes: 4 additions & 0 deletions ...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlGetQueryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public record DetailedQuery(
TaskId id,
long startTimeMillis,
long runningTimeNanos,
long documentsFound,
long valuesLoaded,
String query,
String coordinatingNode,
List<String> dataNodes
Expand All @@ -33,6 +35,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.field("node", id.getNodeId());
builder.field("start_time_millis", startTimeMillis);
builder.field("running_time_nanos", runningTimeNanos);
builder.field("documents_found", documentsFound);
builder.field("values_loaded", valuesLoaded);
builder.field("query", query);
builder.field("coordinating_node", coordinatingNode);
builder.field("data_nodes", dataNodes);
Expand Down
34 changes: 27 additions & 7 deletions ...n/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlGetQueryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.elasticsearch.action.support.HandledTransportAction;
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.compute.operator.DriverStatus;
import org.elasticsearch.compute.operator.DriverTaskRunner;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.tasks.Task;
Expand All @@ -28,6 +29,9 @@
import org.elasticsearch.xpack.esql.action.EsqlGetQueryRequest;
import org.elasticsearch.xpack.esql.action.EsqlQueryAction;

import java.util.Set;
import java.util.TreeSet;

import static org.elasticsearch.xpack.core.ClientHelper.ESQL_ORIGIN;

public class TransportEsqlGetQueryAction extends HandledTransportAction<EsqlGetQueryRequest, EsqlGetQueryResponse> {
Expand Down Expand Up @@ -85,14 +89,30 @@ public void onFailure(Exception e) {
);
}

private static EsqlGetQueryResponse.DetailedQuery toDetailedQuery(TaskInfo task, ListTasksResponse response) {
private static EsqlGetQueryResponse.DetailedQuery toDetailedQuery(TaskInfo main, ListTasksResponse sub) {
String query = main.description();
String coordinatingNode = main.node();

// TODO include completed drivers in documentsFound and valuesLoaded
long documentsFound = 0;
long valuesLoaded = 0;
Set<String> dataNodes = new TreeSet<>();
for (TaskInfo info : sub.getTasks()) {
DriverStatus status = (DriverStatus) info.status();
documentsFound += status.documentsFound();
valuesLoaded += status.valuesLoaded();
dataNodes.add(info.node());
}

return new EsqlGetQueryResponse.DetailedQuery(
task.taskId(),
task.startTime(),
task.runningTimeNanos(),
task.description(), // Query
task.node(), // Coordinating node
response.getTasks().stream().map(TaskInfo::node).distinct().toList() // Data nodes
main.taskId(),
main.startTime(),
main.runningTimeNanos(),
documentsFound,
valuesLoaded,
query,
coordinatingNode,
sub.getTasks().stream().map(TaskInfo::node).distinct().toList() // Data nodes
);
}
}