Use PromqlCommand.stepColumnName() for step lookup fallback

sidosera · sidosera · commit 4fd76d46c99d · 2026-03-26T15:01:23.000Z
Upstream moved STEP_COLUMN_NAME to PromqlCommand; use the accessor.
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/promql/TranslatePromqlToEsqlPlan.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/promql/TranslatePromqlToEsqlPlan.java
@@ -899,7 +899,7 @@ private static List<NamedExpression> resolveOutput(PromqlCommand promqlCommand,
 
         Attribute stepAttr = findAttributeById(plan.output(), promqlCommand.stepId());
         if (stepAttr == null) {
-            stepAttr = findAttributeByFieldName(plan.output(), STEP_COLUMN_NAME);
+            stepAttr = findAttributeByFieldName(plan.output(), promqlCommand.stepColumnName());
         }
         if (stepAttr == null) {
             throw new IllegalStateException("PromQL root projection requires a step column");

Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,7 @@ private static List<NamedExpression> resolveOutput(PromqlCommand promqlCommand,`
`899`	`899`
`900`	`900`	`Attribute stepAttr = findAttributeById(plan.output(), promqlCommand.stepId());`
`901`	`901`	`if (stepAttr == null) {`
`902`		`- stepAttr = findAttributeByFieldName(plan.output(), STEP_COLUMN_NAME);`
	`902`	`+ stepAttr = findAttributeByFieldName(plan.output(), promqlCommand.stepColumnName());`
`903`	`903`	`}`
`904`	`904`	`if (stepAttr == null) {`
`905`	`905`	`throw new IllegalStateException("PromQL root projection requires a step column");`