Pick up latest changes in main

Author: costin

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/promql/TranslatePromqlToTimeSeriesAggregate.java

@@ -95,8 +95,8 @@ private LogicalPlan translate(LogicalPlan promqlPlan) {
     private record MapResult(LogicalPlan plan, Map<String, Expression> extras) {}
 
     // Will pattern match on PromQL plan types:
-    // - WithinSeriesAggregate -> TimeSeriesAggregate
     // - AcrossSeriesAggregate -> Aggregate over TimeSeriesAggregate
+    // - WithinSeriesAggregate -> TimeSeriesAggregate
     // - Selector -> EsRelation + Filter
     private static MapResult map(LogicalPlan p) {
         if (p instanceof Selector selector) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java

@@ -1205,7 +1205,9 @@ public PlanFactory visitPromqlCommand(EsqlBaseParser.PromqlCommandContext ctx) {
         }
 
         int promqlStartLine = source.source().getLineNumber();
-        int promqlStartColumn = terminalNode != null ? terminalNode.getSymbol().getCharPositionInLine() : source.source().getColumnNumber();
+        int promqlStartColumn = queryCtx != null && !queryCtx.isEmpty()
+            ? queryCtx.get(0).start.getCharPositionInLine()
+            : source.source().getColumnNumber();
 
         PromqlParser promqlParser = new PromqlParser();
         LogicalPlan promqlPlan;

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/promql/PromqlLogicalPlanOptimizerTests.java

@@ -7,22 +7,26 @@
 
 package org.elasticsearch.xpack.esql.optimizer.promql;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.index.IndexMode;
+import org.elasticsearch.transport.Transport;
 import org.elasticsearch.xpack.esql.EsqlTestUtils;
 import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
 import org.elasticsearch.xpack.esql.analysis.Analyzer;
 import org.elasticsearch.xpack.esql.analysis.AnalyzerContext;
+import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistry;
 import org.elasticsearch.xpack.esql.index.EsIndex;
 import org.elasticsearch.xpack.esql.index.IndexResolution;
 import org.elasticsearch.xpack.esql.optimizer.AbstractLogicalPlanOptimizerTests;
-import org.elasticsearch.xpack.esql.parser.QueryParams;
+import org.elasticsearch.xpack.esql.plan.IndexPattern;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 
+import java.util.Collections;
 import java.util.Map;
 
+import static java.util.Collections.emptyMap;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_VERIFIER;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.emptyInferenceResolution;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.loadMapping;
@@ -45,9 +49,11 @@ public static void initTest() {
             new AnalyzerContext(
                 EsqlTestUtils.TEST_CFG,
                 new EsqlFunctionRegistry(),
-                timeSeriesIndex,
+                Map.of(new IndexPattern(Source.EMPTY, "k8s"), timeSeriesIndex),
+                emptyMap(),
                 enrichResolution,
-                emptyInferenceResolution()
+                emptyInferenceResolution(),
+                TransportVersion.current()
             ),
             TEST_VERIFIER
         );