Merge remote-tracking branch 'felixbarny/promql-adjust-source' into promql-adjust-source

Author: felixbarny

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizer.java

@@ -117,10 +117,10 @@ public LogicalPlanOptimizer(LogicalOptimizerContext optimizerContext) {
     public LogicalPlan optimize(LogicalPlan verified) {
         var optimized = execute(verified);
 
-//        Failures failures = verifier.verify(optimized, verified.output());
-//        if (failures.hasFailures()) {
-//            throw new VerificationException(failures);
-//        }
+        // Failures failures = verifier.verify(optimized, verified.output());
+        // if (failures.hasFailures()) {
+        // throw new VerificationException(failures);
+        // }
         optimized.setOptimized();
         return optimized;
     }

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

@@ -241,10 +241,7 @@ public static Source adjustSource(Source source, int startLine, int startColumn)
      * position inside the full ES|QL query.
      */
     public static Location adjustLocation(Location location, int startLine, int startColumn) {
-        return new Location(
-            adjustLine(location.getLineNumber(), startLine),
-            adjustColumn(location.getColumnNumber(), startColumn)
-        );
+        return new Location(adjustLine(location.getLineNumber(), startLine), adjustColumn(location.getColumnNumber(), startColumn));
     }
 
     /**

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

@@ -102,9 +102,9 @@ public int hashCode() {
     public boolean equals(Object obj) {
         if (super.equals(obj)) {
 
-        PromqlCommand other = (PromqlCommand) obj;
-        return Objects.equals(child(), other.child()) && Objects.equals(promqlPlan, other.promqlPlan);
-    }
+            PromqlCommand other = (PromqlCommand) obj;
+            return Objects.equals(child(), other.child()) && Objects.equals(promqlPlan, other.promqlPlan);
+        }
 
         return false;
     }

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

@@ -9,7 +9,6 @@
 
 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;
@@ -23,7 +22,6 @@
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.junit.BeforeClass;
 
-import java.util.Collections;
 import java.util.Map;
 
 import static java.util.Collections.emptyMap;