Skip to content

Add ToDouble conversion and projection for AcrossSeriesAggregate output #138655

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 7 commits into from
Nov 27, 2025
Merged

Add ToDouble conversion and projection for AcrossSeriesAggregate output #138655

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e46bb36
Add ToDouble conversion and projection for AcrossSeriesAggregate output
felixbarny Nov 26, 2025
8676ac6
Merge remote-tracking branch 'origin/main' into promql-eval-todouble
felixbarny Nov 26, 2025
65d5afb
Add comment for return type
felixbarny Nov 26, 2025
e56d62a
Avoid duplicate name ids
felixbarny Nov 26, 2025
300b7e0
Merge remote-tracking branch 'origin/main' into promql-eval-todouble
felixbarny Nov 26, 2025
47a8c8b
Eval and project using TimeSeriesAggregate#output
felixbarny Nov 27, 2025
22ab8b4
Merge remote-tracking branch 'origin/main' into promql-eval-todouble
felixbarny Nov 27, 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
30 changes: 24 additions & 6 deletions ...earch/xpack/esql/optimizer/rules/logical/promql/TranslatePromqlToTimeSeriesAggregate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.elasticsearch.xpack.esql.plan.logical.Eval;
import org.elasticsearch.xpack.esql.plan.logical.Filter;
import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
import org.elasticsearch.xpack.esql.plan.logical.Project;
import org.elasticsearch.xpack.esql.plan.logical.TimeSeriesAggregate;
import org.elasticsearch.xpack.esql.plan.logical.promql.AcrossSeriesAggregate;
import org.elasticsearch.xpack.esql.plan.logical.promql.PlaceholderRelation;
Expand Down Expand Up @@ -185,7 +186,26 @@ private static MapResult mapFunction(PromqlCommand promqlCommand, PromqlFunction

LogicalPlan p = childResult.plan;
p = new Eval(stepBucket.source(), p, List.of(stepBucket));
p = new TimeSeriesAggregate(acrossAggregate.source(), p, groupings, aggs, null);
TimeSeriesAggregate tsAggregate = new TimeSeriesAggregate(acrossAggregate.source(), p, groupings, aggs, null);
p = tsAggregate;
// ToDouble conversion of the metric using an eval to ensure a consistent output type
Alias convertedValue = new Alias(
acrossAggregate.source(),
acrossAggregate.sourceText(),
new ToDouble(acrossAggregate.source(), p.output().getFirst().toAttribute()),
acrossAggregate.valueId()
);
p = new Eval(acrossAggregate.source(), p, List.of(convertedValue));
// Project to maintain the correct output order, as declared in AcrossSeriesAggregate#output:
// [value, step, ...groupings]
List<NamedExpression> projections = new ArrayList<>();
projections.add(convertedValue.toAttribute());
List<Attribute> output = tsAggregate.output();
for (int i = 1; i < output.size(); i++) {
projections.add(output.get(i));
}
p = new Project(acrossAggregate.source(), p, projections);

result = new MapResult(p, extras);
} else {
throw new QlIllegalArgumentException("Unsupported PromQL function call: {}", functionCall);
Expand All @@ -205,13 +225,11 @@ private static void initAggregatesAndGroupings(
Function esqlFunction = PromqlFunctionRegistry.INSTANCE.buildEsqlFunction(
acrossAggregate.functionName(),
acrossAggregate.source(),
// to double conversion of the metric to ensure a consistent output type
// TODO it's probably more efficient to wrap the function in the ToDouble
// but for some reason this doesn't work if you have an inner and outer aggregation
List.of(new ToDouble(target.source(), target))
List.of(target)
);

aggs.add(new Alias(acrossAggregate.source(), acrossAggregate.sourceText(), esqlFunction, acrossAggregate.valueId()));
Alias value = new Alias(acrossAggregate.source(), acrossAggregate.sourceText(), esqlFunction);
aggs.add(value);

// timestamp/step
aggs.add(stepBucket);
Expand Down