Rename

Author: nik9000

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

@@ -209,7 +209,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INDEX_STATS_AND_METADATA_INCLUDE_PEAK_WRITE_LOAD = def(9_041_0_00);
     public static final TransportVersion REPOSITORIES_METADATA_AS_PROJECT_CUSTOM = def(9_042_0_00);
     public static final TransportVersion BATCHED_QUERY_PHASE_VERSION = def(9_043_0_00);
-    public static final TransportVersion ESQL_VALUES_LOADED = def(9_044_0_00);
+    public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_044_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/ValuesSourceReaderOperator.java

@@ -47,7 +47,7 @@
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
 
-import static org.elasticsearch.TransportVersions.ESQL_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
 
 /**
  * Operator that extracts doc_values from a Lucene index out of pages that have been produced by {@link LuceneSourceOperator}
@@ -582,18 +582,14 @@ public static class Status extends AbstractPageMappingOperator.Status {
         Status(StreamInput in) throws IOException {
             super(in);
             readersBuilt = in.readOrderedMap(StreamInput::readString, StreamInput::readVInt);
-            if (in.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
-                valuesLoaded = in.readVLong();
-            } else {
-                valuesLoaded = 0;
-            }
+            valuesLoaded = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeMap(readersBuilt, StreamOutput::writeVInt);
-            if (out.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
+            if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
                 out.writeVLong(valuesLoaded);
             }
         }

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

@@ -20,7 +20,10 @@
 /**
  * Information returned when one of more {@link Driver}s is completed.
  * @param documentsFound The number of documents found by all lucene queries performed by these drivers.
- * @param valuesLoaded The number of values loaded from lucene for all drivers.
+ * @param valuesLoaded The number of values loaded from lucene for all drivers. This is
+ *                     <strong>roughly</strong> the number of documents times the number of
+ *                     fields per document. Except {@code null} values don't count.
+ *                     And multivalued fields count as many times as there are values.
  * @param collectedProfiles {@link DriverProfile}s from each driver. These are fairly cheap to build but
  *                          not free so this will be empty if the {@code profile} option was not set in
  *                          the request.

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

@@ -151,17 +151,27 @@ public String toString() {
      * The number of documents found by this driver.
      */
     public long documentsFound() {
-        long documentsFound = completedOperators.stream().mapToLong(OperatorStatus::documentsFound).sum();
-        documentsFound += activeOperators.stream().mapToLong(OperatorStatus::documentsFound).sum();
+        long documentsFound = 0;
+        for (OperatorStatus s : completedOperators) {
+            documentsFound += s.documentsFound();
+        }
+        for (OperatorStatus s : activeOperators) {
+            documentsFound += s.documentsFound();
+        }
         return documentsFound;
     }
 
     /**
      * The number of values loaded by this operator.
      */
     public long valuesLoaded() {
-        long valuesLoaded = completedOperators.stream().mapToLong(OperatorStatus::valuesLoaded).sum();
-        valuesLoaded += activeOperators.stream().mapToLong(OperatorStatus::valuesLoaded).sum();
+        long valuesLoaded = 0;
+        for (OperatorStatus s : completedOperators) {
+            valuesLoaded += s.valuesLoaded();
+        }
+        for (OperatorStatus s : activeOperators) {
+            valuesLoaded += s.valuesLoaded();
+        }
         return valuesLoaded;
     }
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -933,7 +933,7 @@ public enum Cap {
          * Are the {@code documents_found} and {@code values_loaded} fields available
          * in the response and profile?
          */
-        DOCUMENTS_FOUND,
+        DOCUMENTS_FOUND_AND_VALUES_LOADED,
 
         /**
          * Index component selector syntax (my-data-stream-name::failures)

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponse.java

@@ -35,7 +35,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import static org.elasticsearch.TransportVersions.ESQL_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
 
 public class EsqlQueryResponse extends org.elasticsearch.xpack.core.esql.action.EsqlQueryResponse
     implements
@@ -119,8 +119,8 @@ static EsqlQueryResponse deserialize(BlockStreamInput in) throws IOException {
         }
         List<ColumnInfoImpl> columns = in.readCollectionAsList(ColumnInfoImpl::new);
         List<Page> pages = in.readCollectionAsList(Page::new);
-        long documentsFound = in.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED) ? in.readVLong() : 0;
-        long valuesLoaded = in.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED) ? in.readVLong() : 0;
+        long documentsFound = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;
+        long valuesLoaded = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             profile = in.readOptionalWriteable(Profile::new);
         }
@@ -152,7 +152,7 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeCollection(columns);
         out.writeCollection(pages);
-        if (out.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
+        if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
             out.writeVLong(documentsFound);
             out.writeVLong(valuesLoaded);
         }

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

@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import static org.elasticsearch.TransportVersions.ESQL_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
 
 /**
  * The compute result of {@link DataNodeRequest} or {@link ClusterComputeRequest}
@@ -58,7 +58,7 @@ final class ComputeResponse extends TransportResponse {
     }
 
     ComputeResponse(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
+        if (in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
             completionInfo = new DriverCompletionInfo(in);
         } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             if (in.readBoolean()) {
@@ -92,7 +92,7 @@ final class ComputeResponse extends TransportResponse {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
+        if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
             completionInfo.writeTo(out);
         } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             out.writeBoolean(true);

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

@@ -17,7 +17,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import static org.elasticsearch.TransportVersions.ESQL_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
 
 /**
  * The compute result of {@link DataNodeRequest}
@@ -32,7 +32,7 @@ final class DataNodeComputeResponse extends TransportResponse {
     }
 
     DataNodeComputeResponse(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
+        if (in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
             this.completionInfo = new DriverCompletionInfo(in);
             this.shardLevelFailures = in.readMap(ShardId::new, StreamInput::readException);
             return;
@@ -48,7 +48,7 @@ final class DataNodeComputeResponse extends TransportResponse {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(ESQL_VALUES_LOADED)) {
+        if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
             completionInfo.writeTo(out);
             out.writeMap(shardLevelFailures, (o, v) -> v.writeTo(o), StreamOutput::writeException);
             return;

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml

@@ -188,7 +188,7 @@ basic with documents_found:
         - method: POST
           path: /_query
           parameters: []
-          capabilities: [documents_found]
+          capabilities: [documents_found_and_values_loaded]
       reason: "checks for documents_found and values_loaded"
 
   - do:
@@ -228,7 +228,7 @@ FROM EVAL SORT LIMIT with documents_found:
         - method: POST
           path: /_query
           parameters: []
-          capabilities: [documents_found]
+          capabilities: [documents_found_and_values_loaded]
       reason: "checks for documents_found and values_loaded"
 
   - do:

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml

@@ -145,7 +145,7 @@ documents found:
         - method: POST
           path: /_query
           parameters: []
-          capabilities: [documents_found]
+          capabilities: [documents_found_and_values_loaded]
       reason: "checks for documents_found and values_loaded"
 
   - do: