Differ between time set and start/end being equal

The responses in PromQL look different for these (`value` vs `values`)

Author: felixbarny

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

@@ -1246,9 +1246,7 @@ public PlanFactory visitPromqlCommand(EsqlBaseParser.PromqlCommandContext ctx) {
             throw PromqlParserUtils.adjustParsingException(pe, promqlStartLine, promqlStartColumn);
         }
 
-        return plan -> params.time() != null
-            ? new PromqlCommand(source, plan, promqlPlan, params.time())
-            : new PromqlCommand(source, plan, promqlPlan, params.start(), params.end(), params.step());
+        return plan -> new PromqlCommand(source, plan, promqlPlan, params);
 
     }
 

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

@@ -128,4 +128,12 @@ public static PromqlParams parse(EsqlBaseParser.PromqlCommandContext ctx, Source
         }
         return new PromqlParams(time, start, end, step);
     }
+
+    public boolean isInstantQuery() {
+        return time != null;
+    }
+
+    public boolean isRangeQuery() {
+        return step != null;
+    }
 }

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

@@ -13,6 +13,7 @@
 import org.elasticsearch.xpack.esql.common.Failures;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.parser.promql.PromqlParams;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
 import org.elasticsearch.xpack.esql.plan.logical.promql.selector.Selector;
@@ -31,35 +32,27 @@
 public class PromqlCommand extends UnaryPlan implements TelemetryAware, PostAnalysisVerificationAware {
 
     private final LogicalPlan promqlPlan;
-    private final Instant start, end;
-    private final Duration step;
-
-    // Instant query constructor - shortcut for a range constructor
-    public PromqlCommand(Source source, LogicalPlan child, LogicalPlan promqlPlan, Instant time) {
-        this(source, child, promqlPlan, time, time, null);
-    }
+    private final PromqlParams params;
 
     // Range query constructor
-    public PromqlCommand(Source source, LogicalPlan child, LogicalPlan promqlPlan, Instant start, Instant end, Duration step) {
+    public PromqlCommand(Source source, LogicalPlan child, LogicalPlan promqlPlan, PromqlParams params) {
         super(source, child);
         this.promqlPlan = promqlPlan;
-        this.start = start;
-        this.end = end;
-        this.step = step;
+        this.params = params;
     }
 
     @Override
     protected NodeInfo<PromqlCommand> info() {
-        return NodeInfo.create(this, PromqlCommand::new, child(), promqlPlan(), start(), end(), step());
+        return NodeInfo.create(this, PromqlCommand::new, child(), promqlPlan(), params());
     }
 
     @Override
     public PromqlCommand replaceChild(LogicalPlan newChild) {
-        return new PromqlCommand(source(), newChild, promqlPlan(), start(), end(), step());
+        return new PromqlCommand(source(), newChild, promqlPlan(), params());
     }
 
     public PromqlCommand withPromqlPlan(LogicalPlan newPromqlPlan) {
-        return new PromqlCommand(source(), child(), newPromqlPlan, start(), end(), step());
+        return new PromqlCommand(source(), child(), newPromqlPlan, params());
     }
 
     @Override
@@ -86,21 +79,37 @@ public LogicalPlan promqlPlan() {
         return promqlPlan;
     }
 
+    public PromqlParams params() {
+        return params;
+    }
+
     public Instant start() {
-        return start;
+        return params().start();
     }
 
     public Instant end() {
-        return end;
+        return params().end();
+    }
+
+    public Instant time() {
+        return params().time();
     }
 
     public Duration step() {
-        return step;
+        return params().step();
+    }
+
+    public boolean isInstantQuery() {
+        return params().isInstantQuery();
+    }
+
+    public boolean isRangeQuery() {
+        return params().isRangeQuery();
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(child(), start, end, step, promqlPlan);
+        return Objects.hash(child(), params, promqlPlan);
     }
 
     @Override
@@ -118,11 +127,8 @@ public boolean equals(Object obj) {
     public String nodeString() {
         StringBuilder sb = new StringBuilder();
         sb.append(nodeName());
-        if (start == end) {
-            sb.append("time=").append(start);
-        } else {
-            sb.append("start=").append(start).append(", end=").append(end).append(", step=").append(step);
-        }
+        sb.append("params=");
+        sb.append(params.toString());
         sb.append(" promql=[<>\n");
         sb.append(promqlPlan.toString());
         sb.append("\n<>]]");

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/promql/PromqlParamsTests.java

@@ -31,20 +31,27 @@ public void testValidRangeQuery() {
         assertThat(promql.start(), equalTo(Instant.parse("2025-10-31T00:00:00Z")));
         assertThat(promql.end(), equalTo(Instant.parse("2025-10-31T01:00:00Z")));
         assertThat(promql.step(), equalTo(Duration.ofMinutes(1)));
+        assertThat(promql.isRangeQuery(), equalTo(true));
+        assertThat(promql.isInstantQuery(), equalTo(false));
     }
 
     public void testValidRangeQueryOnlyStep() {
         PromqlCommand promql = parse("TS test | PROMQL step 1 (avg(foo))");
         assertThat(promql.start(), nullValue());
         assertThat(promql.end(), nullValue());
         assertThat(promql.step(), equalTo(Duration.ofSeconds(1)));
+        assertThat(promql.isRangeQuery(), equalTo(true));
+        assertThat(promql.isInstantQuery(), equalTo(false));
     }
 
     public void testValidInstantQuery() {
         PromqlCommand promql = parse("TS test | PROMQL time `2025-10-31T00:00:00Z` (avg(foo))");
-        assertThat(promql.start(), equalTo(Instant.parse("2025-10-31T00:00:00Z")));
-        assertThat(promql.end(), equalTo(Instant.parse("2025-10-31T00:00:00Z")));
+        assertThat(promql.start(), nullValue());
+        assertThat(promql.end(), nullValue());
+        assertThat(promql.time(), equalTo(Instant.parse("2025-10-31T00:00:00Z")));
         assertThat(promql.step(), nullValue());
+        assertThat(promql.isInstantQuery(), equalTo(true));
+        assertThat(promql.isRangeQuery(), equalTo(false));
     }
 
     // TODO nicer error messages for missing params