transport version

Author: javanna

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

@@ -223,6 +223,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING = def(9_050_0_00);
     public static final TransportVersion ESQL_QUERY_PLANNING_DURATION = def(9_051_0_00);
     public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_052_0_00);
+    public static final TransportVersion INCREMENTAL_TOP_DOCS_NULL = def(9_053_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/common/lucene/Lucene.java

@@ -64,6 +64,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Version;
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -384,7 +385,7 @@ public static void writeTotalHits(StreamOutput out, TotalHits totalHits) throws
      * by shard for sorting purposes.
      */
     public static void writeTopDocsIncludingShardIndex(StreamOutput out, TopDocs topDocs) throws IOException {
-        if (topDocs == null) {
+        if (topDocs == null && out.getTransportVersion().onOrAfter(TransportVersions.INCREMENTAL_TOP_DOCS_NULL)) {
             out.writeByte((byte) -1);
         } else if (topDocs instanceof TopFieldGroups topFieldGroups) {
             out.writeByte((byte) 2);
@@ -427,6 +428,7 @@ public static void writeSortFieldArray(StreamOutput out, SortField[] sortFields)
     public static TopDocs readTopDocsIncludingShardIndex(StreamInput in) throws IOException {
         byte type = in.readByte();
         if (type == -1) {
+            assert in.getTransportVersion().onOrAfter(TransportVersions.INCREMENTAL_TOP_DOCS_NULL);
             return null;
         } else if (type == 0) {
             TotalHits totalHits = readTotalHits(in);