Address code review comments

Author: julian-elastic

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -362,7 +362,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = def(9_138_0_00);
     public static final TransportVersion ESQL_LOOKUP_JOIN_ON_MANY_FIELDS = def(9_139_0_00);
 
-
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/lookup/ExpressionQueryList.java

@@ -48,7 +48,7 @@ public int getPositionCount() {
         int positionCount = queryLists.get(0).getPositionCount();
         for (QueryList queryList : queryLists) {
             if (queryList.getPositionCount() != positionCount) {
-                throw new IllegalArgumentException(
+                throw new IllegalStateException(
                     "All QueryLists must have the same position count, expected: "
                         + positionCount
                         + ", but got: "

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FirstLongByTimestampAggregatorFunctionTests.java

@@ -14,7 +14,7 @@
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.SourceOperator;
-import org.elasticsearch.compute.operator.TupleLongLongBlockSourceOperator;
+import org.elasticsearch.compute.test.TupleLongLongBlockSourceOperator;
 import org.elasticsearch.core.Tuple;
 
 import java.util.List;

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/LastLongByTimestampAggregatorFunctionTests.java

@@ -14,7 +14,7 @@
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.SourceOperator;
-import org.elasticsearch.compute.operator.TupleLongLongBlockSourceOperator;
+import org.elasticsearch.compute.test.TupleLongLongBlockSourceOperator;
 import org.elasticsearch.core.Tuple;
 
 import java.util.List;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexOperator.java

@@ -239,28 +239,28 @@ public static class Status extends AsyncOperator.Status {
             Status::new
         );
 
-        private final long totalTerms;
+        private final long totalRows;
         /**
          * Total number of pages emitted by this {@link Operator}.
          */
         private final long emittedPages;
 
-        Status(long receivedPages, long completedPages, long totalTimeInMillis, long totalTerms, long emittedPages) {
+        Status(long receivedPages, long completedPages, long totalTimeInMillis, long totalRows, long emittedPages) {
             super(receivedPages, completedPages, totalTimeInMillis);
-            this.totalTerms = totalTerms;
+            this.totalRows = totalRows;
             this.emittedPages = emittedPages;
         }
 
         Status(StreamInput in) throws IOException {
             super(in);
-            this.totalTerms = in.readVLong();
+            this.totalRows = in.readVLong();
             this.emittedPages = in.readVLong();
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
-            out.writeVLong(totalTerms);
+            out.writeVLong(totalRows);
             out.writeVLong(emittedPages);
         }
 
@@ -273,16 +273,16 @@ public long emittedPages() {
             return emittedPages;
         }
 
-        public long totalTerms() {
-            return totalTerms;
+        public long totalRows() {
+            return totalRows;
         }
 
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject();
             super.innerToXContent(builder);
             builder.field("emitted_pages", emittedPages());
-            builder.field("total_terms", totalTerms());
+            builder.field("total_rows", totalRows());
             return builder.endObject();
         }
 
@@ -295,12 +295,12 @@ public boolean equals(Object o) {
                 return false;
             }
             Status status = (Status) o;
-            return totalTerms == status.totalTerms && emittedPages == status.emittedPages;
+            return totalRows == status.totalRows && emittedPages == status.emittedPages;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(super.hashCode(), totalTerms, emittedPages);
+            return Objects.hash(super.hashCode(), totalRows, emittedPages);
         }
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexOperatorStatusTests.java

@@ -39,7 +39,7 @@ protected LookupFromIndexOperator.Status mutateInstance(LookupFromIndexOperator.
         long receivedPages = in.receivedPages();
         long completedPages = in.completedPages();
         long procesNanos = in.procesNanos();
-        long totalTerms = in.totalTerms();
+        long totalTerms = in.totalRows();
         long emittedPages = in.emittedPages();
         switch (randomIntBetween(0, 4)) {
             case 0 -> receivedPages = randomValueOtherThan(receivedPages, ESTestCase::randomNonNegativeLong);
@@ -62,7 +62,7 @@ public void testToXContent() {
               "received_pages" : 100,
               "completed_pages" : 50,
               "emitted_pages" : 88,
-              "total_terms" : 120
+              "total_rows" : 120
             }"""));
     }
 }