start of tests

Author: not-napoleon

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/IgnoreNullMetrics.java

@@ -78,15 +78,12 @@ private Set<Attribute> collectMetrics(LogicalPlan logicalPlan) {
      * Scans the given {@link LogicalPlan} to see if it is a "metrics mode" query
      */
     private static boolean isMetricsQuery(LogicalPlan logicalPlan) {
-        List<LogicalPlan> tsNodes = logicalPlan.collect(n -> {
-            if (n instanceof EsRelation r) {
-                return r.indexMode() == IndexMode.TIME_SERIES;
-            }
-            if (n instanceof UnresolvedRelation r) {
-                return r.indexMode() == IndexMode.TIME_SERIES;
-            }
-            return false;
-        });
-        return tsNodes.isEmpty() == false;
+        if (logicalPlan instanceof EsRelation r) {
+            return r.indexMode() == IndexMode.TIME_SERIES;
+        }
+        if (logicalPlan instanceof UnresolvedRelation r) {
+            return r.indexMode() == IndexMode.TIME_SERIES;
+        }
+        return false;
     }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/index/EsIndex.java

@@ -21,6 +21,7 @@
 
 public record EsIndex(
     String name,
+    /** Map of field names to {@link EsField} instances representing that field */
     Map<String, EsField> mapping,
     Map<String, IndexMode> indexNameWithModes,
     /** Fields mapped only in some (but *not* all) indices. Since this is only used by the analyzer, it is not serialized. */

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/IgnoreNullMetricsTests.java

@@ -7,8 +7,73 @@
 
 package org.elasticsearch.xpack.esql.analysis;
 
+import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.esql.EsqlTestUtils;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.core.type.EsField;
+import org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistry;
+import org.elasticsearch.xpack.esql.expression.predicate.nulls.IsNotNull;
+import org.elasticsearch.xpack.esql.index.EsIndex;
+import org.elasticsearch.xpack.esql.index.IndexResolution;
+import org.elasticsearch.xpack.esql.parser.EsqlParser;
+import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
+import org.elasticsearch.xpack.esql.plan.logical.Filter;
+import org.elasticsearch.xpack.esql.plan.logical.Limit;
+import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 
+import java.util.Map;
+
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_VERIFIER;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.as;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.emptyInferenceResolution;
+import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.defaultLookupResolution;
+
+/**
+ * Tests desi
+ */
 public class IgnoreNullMetricsTests extends ESTestCase {
 
+    private Analyzer analyzer;
+
+    private LogicalPlan analyze(String query) {
+        EsqlParser parser = new EsqlParser();
+        EnrichResolution enrichResolution = new EnrichResolution();
+        AnalyzerTestUtils.loadEnrichPolicyResolution(enrichResolution, "languages_idx", "id", "languages_idx", "mapping-languages.json");
+
+        Map<String, EsField> mapping = Map.of(
+            "dimension_1",
+            new EsField("dimension_1", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.DIMENSION),
+            "metric_1",
+            new EsField("metric_1", DataType.LONG, Map.of(), true, EsField.TimeSeriesFieldType.METRIC)
+        );
+        EsIndex test = new EsIndex("test", mapping, Map.of("test", IndexMode.TIME_SERIES));
+        IndexResolution getIndexResult = IndexResolution.valid(test);
+        analyzer = new Analyzer(
+            new AnalyzerContext(
+                EsqlTestUtils.TEST_CFG,
+                new EsqlFunctionRegistry(),
+                getIndexResult,
+                defaultLookupResolution(),
+                enrichResolution,
+                emptyInferenceResolution()
+            ),
+            TEST_VERIFIER
+        );
+
+        return analyzer.analyze(parser.createStatement(query, EsqlTestUtils.TEST_CFG));
+    }
+
+    public void testSimple() {
+        LogicalPlan actual = analyze("""
+            TS test
+            | STATS max(max_over_time(metric_1))
+            """);
+        Limit limit = as(actual, Limit.class);
+        Aggregate agg = as(limit.child(), Aggregate.class);
+        Filter filter = as(agg.child(), Filter.class);
+        IsNotNull condition = as(filter.condition(), IsNotNull.class);
+
+    }
 }