ESQL: Prepare for backport of documents_found (elastic#130039)

nik9000 · mridula-s109 · commit e91a01b4fb7a · 2025-07-03T11:48:18.000+01:00
Prepares the `main` branch for the backport of elastic#125631. Specifically, this adds the version constant for 8.19 to main and the serialization code that lets main talk to 8.19.
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -208,6 +208,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = def(8_841_0_58);
     public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19 = def(8_841_0_59);
     public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60);
+    public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
     public static final TransportVersion V_9_0_0 = def(9_000_0_09);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/ValuesSourceReaderOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/ValuesSourceReaderOperator.java
@@ -11,6 +11,7 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -47,6 +48,7 @@
 import java.util.function.Supplier;
 
 import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;
 
 /**
  * Operator that extracts doc_values from a Lucene index out of pages that have been produced by {@link LuceneSourceOperator}
@@ -617,18 +619,23 @@ public static class Status extends AbstractPageMappingOperator.Status {
         Status(StreamInput in) throws IOException {
             super(in);
             readersBuilt = in.readOrderedMap(StreamInput::readString, StreamInput::readVInt);
-            valuesLoaded = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;
+            valuesLoaded = supportsValuesLoaded(in.getTransportVersion()) ? in.readVLong() : 0;
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeMap(readersBuilt, StreamOutput::writeVInt);
-            if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
+            if (supportsValuesLoaded(out.getTransportVersion())) {
                 out.writeVLong(valuesLoaded);
             }
         }
 
+        private static boolean supportsValuesLoaded(TransportVersion version) {
+            return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
+                || version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
+        }
+
         @Override
         public String getWriteableName() {
             return ENTRY.name;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponse.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponse.java
@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.esql.action;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Iterators;
@@ -37,6 +38,7 @@
 import java.util.Optional;
 
 import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;
 
 public class EsqlQueryResponse extends org.elasticsearch.xpack.core.esql.action.EsqlQueryResponse
     implements
@@ -120,8 +122,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_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;
-        long valuesLoaded = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;
+        long documentsFound = supportsValuesLoaded(in.getTransportVersion()) ? in.readVLong() : 0;
+        long valuesLoaded = supportsValuesLoaded(in.getTransportVersion()) ? in.readVLong() : 0;
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             profile = in.readOptionalWriteable(Profile::readFrom);
         }
@@ -153,7 +155,7 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeCollection(columns);
         out.writeCollection(pages);
-        if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
+        if (supportsValuesLoaded(out.getTransportVersion())) {
             out.writeVLong(documentsFound);
             out.writeVLong(valuesLoaded);
         }
@@ -166,6 +168,11 @@ public void writeTo(StreamOutput out) throws IOException {
         }
     }
 
+    private static boolean supportsValuesLoaded(TransportVersion version) {
+        return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
+            || version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
+    }
+
     public List<ColumnInfoImpl> columns() {
         return columns;
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeResponse.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeResponse.java
@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.esql.plugin;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.search.ShardSearchFailure;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -20,6 +21,7 @@
 import java.util.List;
 
 import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;
 
 /**
  * The compute result of {@link DataNodeRequest} or {@link ClusterComputeRequest}
@@ -58,7 +60,7 @@ final class ComputeResponse extends TransportResponse {
     }
 
     ComputeResponse(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
+        if (supportsCompletionInfo(in.getTransportVersion())) {
             completionInfo = DriverCompletionInfo.readFrom(in);
         } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             if (in.readBoolean()) {
@@ -92,7 +94,7 @@ final class ComputeResponse extends TransportResponse {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
+        if (supportsCompletionInfo(out.getTransportVersion())) {
             completionInfo.writeTo(out);
         } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             out.writeBoolean(true);
@@ -111,6 +113,11 @@ public void writeTo(StreamOutput out) throws IOException {
         }
     }
 
+    private static boolean supportsCompletionInfo(TransportVersion version) {
+        return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
+            || version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
+    }
+
     public DriverCompletionInfo getCompletionInfo() {
         return completionInfo;
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeComputeResponse.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeComputeResponse.java
@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.esql.plugin;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.compute.operator.DriverCompletionInfo;
@@ -19,6 +20,7 @@
 import java.util.Map;
 
 import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;
 
 /**
  * The compute result of {@link DataNodeRequest}
@@ -33,7 +35,7 @@ final class DataNodeComputeResponse extends TransportResponse {
     }
 
     DataNodeComputeResponse(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
+        if (supportsCompletionInfo(in.getTransportVersion())) {
             this.completionInfo = DriverCompletionInfo.readFrom(in);
             this.shardLevelFailures = in.readMap(ShardId::new, StreamInput::readException);
             return;
@@ -49,7 +51,7 @@ final class DataNodeComputeResponse extends TransportResponse {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {
+        if (supportsCompletionInfo(out.getTransportVersion())) {
             completionInfo.writeTo(out);
             out.writeMap(shardLevelFailures, (o, v) -> v.writeTo(o), StreamOutput::writeException);
             return;
@@ -65,6 +67,11 @@ public void writeTo(StreamOutput out) throws IOException {
         new ComputeResponse(completionInfo).writeTo(out);
     }
 
+    private static boolean supportsCompletionInfo(TransportVersion version) {
+        return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
+            || version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
+    }
+
     public DriverCompletionInfo completionInfo() {
         return completionInfo;
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlQueryAction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlQueryAction.java
@@ -349,7 +349,7 @@ private EsqlQueryResponse toResponse(Task task, EsqlQueryRequest request, Config
                 columns,
                 result.pages(),
                 result.completionInfo().documentsFound(),
-                result.completionInfo().documentsFound(),
+                result.completionInfo().valuesLoaded(),
                 profile,
                 request.columnar(),
                 asyncExecutionId,
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java
@@ -312,7 +312,6 @@ protected EsqlQueryResponse mutateInstance(EsqlQueryResponse instance) {
             }
             default -> throw new IllegalArgumentException();
         }
-        ;
         return new EsqlQueryResponse(columns, pages, documentsFound, valuesLoaded, profile, columnar, isAsync, executionInfo);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`package org.elasticsearch.xpack.esql.action;`
`9`	`9`
	`10`	`+import org.elasticsearch.TransportVersion;`
`10`	`11`	`import org.elasticsearch.TransportVersions;`
`11`	`12`	`import org.elasticsearch.common.Strings;`
`12`	`13`	`import org.elasticsearch.common.collect.Iterators;`
`@@ -37,6 +38,7 @@`
`37`	`38`	`import java.util.Optional;`
`38`	`39`
`39`	`40`	`import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;`
	`41`	`+import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;`
`40`	`42`
`41`	`43`	`public class EsqlQueryResponse extends org.elasticsearch.xpack.core.esql.action.EsqlQueryResponse`
`42`	`44`	`implements`
`@@ -120,8 +122,8 @@ static EsqlQueryResponse deserialize(BlockStreamInput in) throws IOException {`
`120`	`122`	`}`
`121`	`123`	`List<ColumnInfoImpl> columns = in.readCollectionAsList(ColumnInfoImpl::new);`
`122`	`124`	`List<Page> pages = in.readCollectionAsList(Page::new);`
`123`		`- long documentsFound = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;`
`124`		`- long valuesLoaded = in.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED) ? in.readVLong() : 0;`
	`125`	`+ long documentsFound = supportsValuesLoaded(in.getTransportVersion()) ? in.readVLong() : 0;`
	`126`	`+ long valuesLoaded = supportsValuesLoaded(in.getTransportVersion()) ? in.readVLong() : 0;`
`125`	`127`	`if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {`
`126`	`128`	`profile = in.readOptionalWriteable(Profile::readFrom);`
`127`	`129`	`}`
`@@ -153,7 +155,7 @@ public void writeTo(StreamOutput out) throws IOException {`
`153`	`155`	`}`
`154`	`156`	`out.writeCollection(columns);`
`155`	`157`	`out.writeCollection(pages);`
`156`		`- if (out.getTransportVersion().onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)) {`
	`158`	`+ if (supportsValuesLoaded(out.getTransportVersion())) {`
`157`	`159`	`out.writeVLong(documentsFound);`
`158`	`160`	`out.writeVLong(valuesLoaded);`
`159`	`161`	`}`
`@@ -166,6 +168,11 @@ public void writeTo(StreamOutput out) throws IOException {`
`166`	`168`	`}`
`167`	`169`	`}`
`168`	`170`
	`171`	`+ private static boolean supportsValuesLoaded(TransportVersion version) {`
	`172`	`+ return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)`
	`173`	`+ \|\| version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);`
	`174`	`+ }`
	`175`	`+`
`169`	`176`	`public List<ColumnInfoImpl> columns() {`
`170`	`177`	`return columns;`
`171`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,6 @@ protected EsqlQueryResponse mutateInstance(EsqlQueryResponse instance) {`
`312`	`312`	`}`
`313`	`313`	`default -> throw new IllegalArgumentException();`
`314`	`314`	`}`
`315`		`- ;`
`316`	`315`	`return new EsqlQueryResponse(columns, pages, documentsFound, valuesLoaded, profile, columnar, isAsync, executionInfo);`
`317`	`316`	`}`
`318`	`317`