Merge branch 'esql/promql' into promql-fix-instant-queries

Author: felixbarny

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

@@ -1146,8 +1146,8 @@ public PlanFactory visitSampleCommand(EsqlBaseParser.SampleCommandContext ctx) {
     public PlanFactory visitPromqlCommand(EsqlBaseParser.PromqlCommandContext ctx) {
         Source source = source(ctx);
         Map<String, Expression> params = new HashMap<>();
-        String TIME = "time", START = "start", STOP = "stop", STEP = "step";
-        Set<String> allowed = Set.of(TIME, START, STOP, STEP);
+        String TIME = "time", START = "start", END = "end", STEP = "step";
+        Set<String> allowed = Set.of(TIME, START, END, STEP);
 
         if (ctx.promqlParam().isEmpty()) {
             throw new ParsingException(source(ctx), "Parameter [{}] or [{}] is required", STEP, TIME);
@@ -1175,21 +1175,21 @@ public PlanFactory visitPromqlCommand(EsqlBaseParser.PromqlCommandContext ctx) {
         // Validation logic for time parameters
         Expression time = params.get(TIME);
         Expression start = params.get(START);
-        Expression stop = params.get(STOP);
+        Expression end = params.get(END);
         Expression step = params.get(STEP);
 
-        if (time != null && (start != null || stop != null || step != null)) {
+        if (time != null && (start != null || end != null || step != null)) {
             throw new ParsingException(
                 source,
                 "Specify either [{}] for instant query or [{}}], [{}] or [{}}] for a range query",
                 TIME,
                 STEP,
                 START,
-                STOP
+                END
             );
         }
-        if ((start != null || stop != null) && step == null) {
-            throw new ParsingException(source, "[{}}] is required alongside [{}}] or [{}}]", STEP, START, STOP);
+        if ((start != null || end != null) && step == null) {
+            throw new ParsingException(source, "[{}}] is required alongside [{}}] or [{}}]", STEP, START, END);
         }
 
         // TODO: Perform type and value validation
@@ -1220,7 +1220,7 @@ public PlanFactory visitPromqlCommand(EsqlBaseParser.PromqlCommandContext ctx) {
 
         return plan -> time != null
             ? new PromqlCommand(source, plan, promqlPlan, time)
-            : new PromqlCommand(source, plan, promqlPlan, start, stop, step);
+            : new PromqlCommand(source, plan, promqlPlan, start, end, step);
     }
 
     private static ParsingException getParsingException(ParsingException pe, int promqlStartLine, int promqlStartColumn) {

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

@@ -49,21 +49,21 @@ public LogicalPlan createStatement(String query) {
         return createStatement(query, null, null);
     }
 
-    public LogicalPlan createStatement(String query, Instant start, Instant stop) {
+    public LogicalPlan createStatement(String query, Instant start, Instant end) {
         if (log.isDebugEnabled()) {
             log.debug("Parsing as expression: {}", query);
         }
 
         if (start == null) {
             start = Instant.now(UTC);
         }
-        return invokeParser(query, start, stop, PromqlBaseParser::singleStatement, PromqlAstBuilder::plan);
+        return invokeParser(query, start, end, PromqlBaseParser::singleStatement, PromqlAstBuilder::plan);
     }
 
     private <T> T invokeParser(
         String query,
         Instant start,
-        Instant stop,
+        Instant end,
         Function<PromqlBaseParser, ParserRuleContext> parseFunction,
         BiFunction<PromqlAstBuilder, ParserRuleContext, T> visitor
     ) {
@@ -97,7 +97,7 @@ private <T> T invokeParser(
             if (log.isTraceEnabled()) {
                 log.trace("Parse tree: {}", tree.toStringTree());
             }
-            return visitor.apply(new PromqlAstBuilder(start, stop), tree);
+            return visitor.apply(new PromqlAstBuilder(start, end), tree);
         } catch (StackOverflowError e) {
             throw new ParsingException(
                 "PromQL statement is too large, causing stack overflow when generating the parsing tree: [{}]",

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

@@ -74,20 +74,20 @@
 
 class ExpressionBuilder extends IdentifierBuilder {
 
-    protected final Instant start, stop;
+    protected final Instant start, end;
 
     ExpressionBuilder() {
         this(null, null);
     }
 
-    ExpressionBuilder(Instant start, Instant stop) {
+    ExpressionBuilder(Instant start, Instant end) {
         Instant now = null;
-        if (start == null || stop == null) {
+        if (start == null || end == null) {
             now = DateUtils.nowWithMillisResolution().toInstant();
         }
 
         this.start = start != null ? start : now;
-        this.stop = stop != null ? stop : now;
+        this.end = end != null ? end : now;
     }
 
     protected Expression expression(ParseTree ctx) {
@@ -282,7 +282,7 @@ public Evaluation visitEvaluation(EvaluationContext ctx) {
             if (atCtx.AT_START() != null) {
                 at = start;
             } else if (atCtx.AT_END() != null) {
-                at = stop;
+                at = end;
             } else {
                 TimeValue timeValue = visitTimeValue(atCtx.timeValue());
                 // the value can have a floating point

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

@@ -13,7 +13,7 @@
 
 import java.time.Instant;
 
-public class PromqlAstBuilder extends LogicalPlanBuilder {
+public class PromqlAstBuilder extends PromqlLogicalPlanBuilder {
 
     public static final int MAX_EXPRESSION_DEPTH = 200;
 
@@ -23,8 +23,8 @@ public PromqlAstBuilder() {
         this(null, null);
     }
 
-    public PromqlAstBuilder(Instant start, Instant stop) {
-        super(start, stop);
+    public PromqlAstBuilder(Instant start, Instant end) {
+        super(start, end);
     }
 
     public LogicalPlan plan(ParseTree ctx) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/promql/LogicalPlanBuilder.java renamed to x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/promql/PromqlLogicalPlanBuilder.java

@@ -44,14 +44,14 @@
 import static org.elasticsearch.xpack.esql.parser.ParserUtils.visitList;
 import static org.elasticsearch.xpack.esql.plan.logical.promql.selector.LabelMatcher.NAME;
 
-public class LogicalPlanBuilder extends ExpressionBuilder {
+public class PromqlLogicalPlanBuilder extends ExpressionBuilder {
 
-    LogicalPlanBuilder() {
+    PromqlLogicalPlanBuilder() {
         this(null, null);
     }
 
-    LogicalPlanBuilder(Instant start, Instant stop) {
-        super(start, stop);
+    PromqlLogicalPlanBuilder(Instant start, Instant end) {
+        super(start, end);
     }
 
     protected LogicalPlan plan(ParseTree ctx) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/promql/PromqlCommand.java

@@ -27,34 +27,34 @@
 public class PromqlCommand extends UnaryPlan implements TelemetryAware {
 
     private final LogicalPlan promqlPlan;
-    private final Expression start, stop, step;
+    private final Expression start, end, step;
 
     // Instant query constructor - shortcut for a range constructor
     public PromqlCommand(Source source, LogicalPlan child, LogicalPlan promqlPlan, Expression time) {
         this(source, child, promqlPlan, time, time, Literal.timeDuration(source, Duration.ZERO));
     }
 
     // Range query constructor
-    public PromqlCommand(Source source, LogicalPlan child, LogicalPlan promqlPlan, Expression start, Expression stop, Expression step) {
+    public PromqlCommand(Source source, LogicalPlan child, LogicalPlan promqlPlan, Expression start, Expression end, Expression step) {
         super(source, child);
         this.promqlPlan = promqlPlan;
         this.start = start;
-        this.stop = stop;
+        this.end = end;
         this.step = step;
     }
 
     @Override
     protected NodeInfo<PromqlCommand> info() {
-        return NodeInfo.create(this, PromqlCommand::new, child(), promqlPlan(), start(), stop(), step());
+        return NodeInfo.create(this, PromqlCommand::new, child(), promqlPlan(), start(), end(), step());
     }
 
     @Override
     public PromqlCommand replaceChild(LogicalPlan newChild) {
-        return new PromqlCommand(source(), newChild, promqlPlan(), start(), stop(), step());
+        return new PromqlCommand(source(), newChild, promqlPlan(), start(), end(), step());
     }
 
     public PromqlCommand withPromqlPlan(LogicalPlan newPromqlPlan) {
-        return new PromqlCommand(source(), child(), newPromqlPlan, start(), stop(), step());
+        return new PromqlCommand(source(), child(), newPromqlPlan, start(), end(), step());
     }
 
     @Override
@@ -85,8 +85,8 @@ public Expression start() {
         return start;
     }
 
-    public Expression stop() {
-        return stop;
+    public Expression end() {
+        return end;
     }
 
     public Expression step() {
@@ -95,7 +95,7 @@ public Expression step() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(child(), start, stop, step, promqlPlan);
+        return Objects.hash(child(), start, end, step, promqlPlan);
     }
 
     @Override
@@ -113,10 +113,10 @@ public boolean equals(Object obj) {
     public String nodeString() {
         StringBuilder sb = new StringBuilder();
         sb.append(nodeName());
-        if (start == stop) {
+        if (start == end) {
             sb.append("time=").append(start);
         } else {
-            sb.append("start=").append(start).append(", stop=").append(stop).append(", step=").append(step);
+            sb.append("start=").append(start).append(", end=").append(end).append(", step=").append(step);
         }
         sb.append(" promql=[<>\n");
         sb.append(promqlPlan.toString());