Skip to content

ESQL: Convert TS server error to user error #139360

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
ivancea merged 1 commit into from
Dec 11, 2025
+12 −11
Merged

ESQL: Convert TS server error to user error #139360

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
18 changes: 10 additions & 8 deletions ...plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/TimeSeriesGroupByAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

package org.elasticsearch.xpack.esql.analysis;

import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
import org.elasticsearch.xpack.esql.core.expression.Alias;
import org.elasticsearch.xpack.esql.core.expression.Attribute;
import org.elasticsearch.xpack.esql.core.expression.Expression;
Expand Down Expand Up @@ -67,10 +66,13 @@ public LogicalPlan rule(TimeSeriesAggregate aggregate) {
}

if (lastNonTSAggFunction != null) {
throw new EsqlIllegalArgumentException(
"Cannot mix time-series aggregate [{}] and regular aggregate [{}] in the same TimeSeriesAggregate.",
lastTSAggFunction.sourceText(),
lastNonTSAggFunction.sourceText()
throw new IllegalArgumentException(
"Cannot mix time-series aggregate ["
+ lastTSAggFunction.sourceText()
+ "] and regular aggregate ["
+ lastNonTSAggFunction.sourceText()
+ "] in the same TimeSeriesAggregate."

);
}

Expand All @@ -86,9 +88,9 @@ public LogicalPlan rule(TimeSeriesAggregate aggregate) {

for (Expression grouping : aggregate.groupings()) {
if (Functions.isGrouping(Alias.unwrap(grouping)) == false) {
throw new EsqlIllegalArgumentException(
"Cannot mix time-series aggregate and grouping attributes. Found [{}].",
grouping.sourceText()
throw new IllegalArgumentException(
"Cannot mix time-series aggregate and grouping attributes. Found [" + grouping.sourceText() + "]."

);
}
groupings.add(grouping);
Expand Down
5 changes: 2 additions & 3 deletions ...org/elasticsearch/xpack/esql/optimizer/rules/logical/TimeSeriesBareAggregationsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import org.elasticsearch.TransportVersion;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
import org.elasticsearch.xpack.esql.EsqlTestUtils;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.elasticsearch.xpack.esql.analysis.Analyzer;
Expand Down Expand Up @@ -264,7 +263,7 @@ public void testCountOverTime() {
public void testMixedBareOverTimeAndRegularAggregates() {
assumeTrue("requires metrics command", EsqlCapabilities.Cap.METRICS_GROUP_BY_ALL.isEnabled());

var error = expectThrows(EsqlIllegalArgumentException.class, () -> { planK8s("""
var error = expectThrows(IllegalArgumentException.class, () -> { planK8s("""
TS k8s
| STATS avg_over_time(network.cost), sum(network.total_bytes_in)
"""); });
Expand All @@ -277,7 +276,7 @@ public void testMixedBareOverTimeAndRegularAggregates() {
public void testGroupingKeyInAggregatesListPreserved() {
assumeTrue("requires metrics command", EsqlCapabilities.Cap.METRICS_GROUP_BY_ALL.isEnabled());

var error = expectThrows(EsqlIllegalArgumentException.class, () -> { planK8s("""
var error = expectThrows(IllegalArgumentException.class, () -> { planK8s("""
TS k8s
| STATS rate(network.total_bytes_out) BY region, TBUCKET(1hour)
"""); });
Expand Down