-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Add max_over_time aggregation for TSDB #126498
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.
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
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
94eb026
Add max_over_time aggregation for tsdb
dnhatn ee4b00c
fix rest tests
dnhatn 4695dd7
comment
dnhatn 5e6ebfa
undo
dnhatn 6706b4a
fix capacities
dnhatn 2e0ee80
Merge remote-tracking branch 'elastic/main' into max_over_time
dnhatn 3188c7d
doc
dnhatn 4a7119c
Merge remote-tracking branch 'elastic/main' into max_over_time
dnhatn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
...src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MaxOverTime.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.esql.expression.function.aggregate; | ||
|
|
||
| import org.elasticsearch.common.io.stream.NamedWriteableRegistry; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.xpack.esql.core.expression.Expression; | ||
| import org.elasticsearch.xpack.esql.core.expression.Literal; | ||
| import org.elasticsearch.xpack.esql.core.tree.NodeInfo; | ||
| import org.elasticsearch.xpack.esql.core.tree.Source; | ||
| import org.elasticsearch.xpack.esql.core.type.DataType; | ||
| import org.elasticsearch.xpack.esql.expression.function.FunctionInfo; | ||
| import org.elasticsearch.xpack.esql.expression.function.FunctionType; | ||
| import org.elasticsearch.xpack.esql.expression.function.Param; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| import static java.util.Collections.emptyList; | ||
|
|
||
| /** | ||
| * Similar to {@link Max}, but it is used to calculate the maximum value over a time series of values from the given field. | ||
| */ | ||
| public class MaxOverTime extends TimeSeriesAggregateFunction { | ||
| public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry( | ||
| Expression.class, | ||
| "MaxOverTime", | ||
| MaxOverTime::new | ||
| ); | ||
|
|
||
| @FunctionInfo( | ||
| returnType = { "boolean", "double", "integer", "long", "date", "date_nanos", "ip", "keyword", "long", "version" }, | ||
| description = "The maximum over time value of a field.", | ||
| type = FunctionType.AGGREGATE | ||
| ) | ||
| public MaxOverTime( | ||
| Source source, | ||
| @Param( | ||
| name = "field", | ||
| type = { | ||
| "aggregate_metric_double", | ||
| "boolean", | ||
| "double", | ||
| "integer", | ||
| "long", | ||
| "date", | ||
| "date_nanos", | ||
| "ip", | ||
| "keyword", | ||
| "text", | ||
| "long", | ||
| "version" } | ||
| ) Expression field | ||
| ) { | ||
| this(source, field, Literal.TRUE); | ||
| } | ||
|
|
||
| public MaxOverTime(Source source, Expression field, Expression filter) { | ||
| super(source, field, filter, emptyList()); | ||
| } | ||
|
|
||
| private MaxOverTime(StreamInput in) throws IOException { | ||
| super(in); | ||
| } | ||
|
|
||
| @Override | ||
| public String getWriteableName() { | ||
| return ENTRY.name; | ||
| } | ||
|
|
||
| @Override | ||
| public MaxOverTime withFilter(Expression filter) { | ||
| return new MaxOverTime(source(), field(), filter); | ||
| } | ||
|
|
||
| @Override | ||
| protected NodeInfo<MaxOverTime> info() { | ||
| return NodeInfo.create(this, MaxOverTime::new, field(), filter()); | ||
| } | ||
|
|
||
| @Override | ||
| public MaxOverTime replaceChildren(List<Expression> newChildren) { | ||
| return new MaxOverTime(source(), newChildren.get(0), newChildren.get(1)); | ||
| } | ||
|
|
||
| @Override | ||
| protected TypeResolution resolveType() { | ||
| return perTimeSeriesAggregation().resolveType(); | ||
| } | ||
|
|
||
| @Override | ||
| public DataType dataType() { | ||
| return perTimeSeriesAggregation().dataType(); | ||
| } | ||
|
|
||
| @Override | ||
| public Max perTimeSeriesAggregation() { | ||
| return new Max(source(), field(), filter()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...g/elasticsearch/xpack/esql/expression/function/aggregate/TimeSeriesAggregateFunction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
| package org.elasticsearch.xpack.esql.expression.function.aggregate; | ||
|
|
||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.xpack.esql.core.expression.Expression; | ||
| import org.elasticsearch.xpack.esql.core.tree.Source; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Extends {@link AggregateFunction} to support aggregation per time_series, | ||
| * such as {@link Rate} or {@link MaxOverTime}. | ||
| */ | ||
| public abstract class TimeSeriesAggregateFunction extends AggregateFunction { | ||
|
|
||
| protected TimeSeriesAggregateFunction(Source source, Expression field, Expression filter, List<? extends Expression> parameters) { | ||
| super(source, field, filter, parameters); | ||
| } | ||
|
|
||
| protected TimeSeriesAggregateFunction(StreamInput in) throws IOException { | ||
| super(in); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the aggregation function to be used in the first aggregation stage, | ||
| * which is grouped by `_tsid` (and `time_bucket`). | ||
| * | ||
| * @see org.elasticsearch.xpack.esql.optimizer.rules.logical.TranslateTimeSeriesAggregate | ||
| */ | ||
| public abstract AggregateFunction perTimeSeriesAggregation(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
...lugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/ToTimeSeriesAggregator.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: add explanatory comment as the rest of the entries.