Skip to content

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
@nik9000
nik9000 committed Jul 10, 2024
1 parent fcd0c1e commit faa9f3b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 42 deletions.
4 changes: 3 additions & 1 deletion ...generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 31 additions & 41 deletions ...k/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,18 @@
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.xpack.esql.core.capabilities.UnresolvedException;
import org.elasticsearch.xpack.esql.core.expression.Alias;
import org.elasticsearch.xpack.esql.core.expression.Attribute;
import org.elasticsearch.xpack.esql.core.expression.EmptyAttribute;
import org.elasticsearch.xpack.esql.core.expression.Expressions;
import org.elasticsearch.xpack.esql.core.expression.Literal;
import org.elasticsearch.xpack.esql.core.expression.MetadataAttribute;
import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
import org.elasticsearch.xpack.esql.core.expression.Order;
import org.elasticsearch.xpack.esql.core.expression.UnresolvedAttribute;
import org.elasticsearch.xpack.esql.core.expression.predicate.logical.Not;
import org.elasticsearch.xpack.esql.core.expression.predicate.operator.comparison.BinaryComparison;
import org.elasticsearch.xpack.esql.core.plan.TableIdentifier;
import org.elasticsearch.xpack.esql.core.type.DataType;
import org.elasticsearch.xpack.esql.expression.function.UnresolvedFunction;
import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
Expand Down Expand Up @@ -1380,45 +1383,23 @@ public void testInlineConvertUnsupportedType() {
public void testMetricsWithoutStats() {
assumeTrue("requires snapshot build", Build.current().isSnapshot());

assertStatement(
"METRICS foo",
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo"), false, List.of(), IndexMode.TIME_SERIES, null)
);
assertStatement(
"METRICS foo,bar",
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo,bar"), false, List.of(), IndexMode.TIME_SERIES, null)
);
assertStatement(
"METRICS foo*,bar",
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo*,bar"), false, List.of(), IndexMode.TIME_SERIES, null)
);
assertStatement(
"METRICS foo-*,bar",
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo-*,bar"), false, List.of(), IndexMode.TIME_SERIES, null)
);
assertStatement(
"METRICS foo-*,bar+*",
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo-*,bar+*"), false, List.of(), IndexMode.TIME_SERIES, null)
);
assertStatement("METRICS foo", unresolvedRelation("foo"));
assertStatement("METRICS foo,bar", unresolvedRelation("foo,bar"));
assertStatement("METRICS foo*,bar", unresolvedRelation("foo*,bar"));
assertStatement("METRICS foo-*,bar", unresolvedRelation("foo-*,bar"));
assertStatement("METRICS foo-*,bar+*", unresolvedRelation("foo-*,bar+*"));
}

public void testMetricsIdentifiers() {
assumeTrue("requires snapshot build", Build.current().isSnapshot());
Map<String, String> patterns = Map.of(
"metrics foo,test-*",
"foo,test-*",
"metrics 123-test@foo_bar+baz1",
"123-test@foo_bar+baz1",
"metrics foo, test,xyz",
"foo,test,xyz",
"metrics <logstash-{now/M{yyyy.MM}}>>",
"<logstash-{now/M{yyyy.MM}}>>"
Map<String, String> patterns = Map.ofEntries(
Map.entry("metrics foo,test-*", "foo,test-*"),
Map.entry("metrics 123-test@foo_bar+baz1", "123-test@foo_bar+baz1"),
Map.entry("metrics foo, test,xyz", "foo,test,xyz"),
Map.entry("metrics <logstash-{now/M{yyyy.MM}}>>", "<logstash-{now/M{yyyy.MM}}>>")
);
for (Map.Entry<String, String> e : patterns.entrySet()) {
assertStatement(
e.getKey(),
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, e.getValue()), false, List.of(), IndexMode.TIME_SERIES, null)
);
assertStatement(e.getKey(), unresolvedRelation(e.getValue()));
}
}

Expand All @@ -1428,7 +1409,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo load=avg(cpu) BY ts",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo"),
Aggregate.AggregateType.METRICS,
List.of(attribute("ts")),
List.of(new Alias(EMPTY, "load", new UnresolvedFunction(EMPTY, "avg", DEFAULT, List.of(attribute("cpu")))), attribute("ts"))
Expand All @@ -1438,7 +1419,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo,bar load=avg(cpu) BY ts",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo,bar"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo,bar"),
Aggregate.AggregateType.METRICS,
List.of(attribute("ts")),
List.of(new Alias(EMPTY, "load", new UnresolvedFunction(EMPTY, "avg", DEFAULT, List.of(attribute("cpu")))), attribute("ts"))
Expand All @@ -1448,7 +1429,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo,bar load=avg(cpu),max(rate(requests)) BY ts",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo,bar"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo,bar"),
Aggregate.AggregateType.METRICS,
List.of(attribute("ts")),
List.of(
Expand All @@ -1471,7 +1452,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo* count(errors)",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo*"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo*"),
Aggregate.AggregateType.METRICS,
List.of(),
List.of(new Alias(EMPTY, "count(errors)", new UnresolvedFunction(EMPTY, "count", DEFAULT, List.of(attribute("errors")))))
Expand All @@ -1481,7 +1462,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo* a(b)",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo*"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo*"),
Aggregate.AggregateType.METRICS,
List.of(),
List.of(new Alias(EMPTY, "a(b)", new UnresolvedFunction(EMPTY, "a", DEFAULT, List.of(attribute("b")))))
Expand All @@ -1491,7 +1472,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo* a(b)",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo*"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo*"),
Aggregate.AggregateType.METRICS,
List.of(),
List.of(new Alias(EMPTY, "a(b)", new UnresolvedFunction(EMPTY, "a", DEFAULT, List.of(attribute("b")))))
Expand All @@ -1501,7 +1482,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo* a1(b2)",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo*"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo*"),
Aggregate.AggregateType.METRICS,
List.of(),
List.of(new Alias(EMPTY, "a1(b2)", new UnresolvedFunction(EMPTY, "a1", DEFAULT, List.of(attribute("b2")))))
Expand All @@ -1511,7 +1492,7 @@ public void testSimpleMetricsWithStats() {
"METRICS foo*,bar* b = min(a) by c, d.e",
new Aggregate(
EMPTY,
new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "foo*,bar*"), false, List.of(), IndexMode.TIME_SERIES, null),
unresolvedTSRelation("foo*,bar*"),
Aggregate.AggregateType.METRICS,
List.of(attribute("c"), attribute("d.e")),
List.of(
Expand All @@ -1523,6 +1504,15 @@ public void testSimpleMetricsWithStats() {
);
}

private LogicalPlan unresolvedRelation(String index) {
return new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, index), false, List.of(), IndexMode.STANDARD, null);
}

private LogicalPlan unresolvedTSRelation(String index) {
List<Attribute> metadata = List.of(new MetadataAttribute(EMPTY, MetadataAttribute.TSID_FIELD, DataType.KEYWORD, false));
return new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, index), false, metadata, IndexMode.TIME_SERIES, null);
}

public void testMetricWithGroupKeyAsAgg() {
assumeTrue("requires snapshot build", Build.current().isSnapshot());
var queries = List.of("METRICS foo a BY a");
Expand Down

0 comments on commit faa9f3b

Please sign in to comment.