Merge remote-tracking branch 'upstream/main' into include-default-index-sort

Author: jordan-powers

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java

@@ -8,7 +8,6 @@
  */
 package org.elasticsearch.ingest.common;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
@@ -60,9 +59,7 @@ public Request(boolean sorted, String ecsCompatibility) {
         Request(StreamInput in) throws IOException {
             super(in);
             this.sorted = in.readBoolean();
-            this.ecsCompatibility = in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)
-                ? in.readString()
-                : GrokProcessor.DEFAULT_ECS_COMPATIBILITY_MODE;
+            this.ecsCompatibility = in.readString();
         }
 
         @Override
@@ -74,9 +71,7 @@ public ActionRequestValidationException validate() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeBoolean(sorted);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) {
-                out.writeString(ecsCompatibility);
-            }
+            out.writeString(ecsCompatibility);
         }
 
         public boolean sorted() {

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java

@@ -174,9 +174,7 @@ protected NodeResponse(StreamInput in) throws IOException {
             }
             databases = in.readCollectionAsImmutableSet(StreamInput::readString);
             filesInTemp = in.readCollectionAsImmutableSet(StreamInput::readString);
-            configDatabases = in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)
-                ? in.readCollectionAsImmutableSet(StreamInput::readString)
-                : null;
+            configDatabases = in.readCollectionAsImmutableSet(StreamInput::readString);
         }
 
         protected NodeResponse(
@@ -226,9 +224,7 @@ public void writeTo(StreamOutput out) throws IOException {
             }
             out.writeStringCollection(databases);
             out.writeStringCollection(filesInTemp);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) {
-                out.writeStringCollection(configDatabases);
-            }
+            out.writeStringCollection(configDatabases);
         }
 
         @Override

modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java

@@ -35,7 +35,6 @@
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.InputStreamStreamInput;
@@ -206,15 +205,7 @@ protected PercolateQueryBuilder(String field, Supplier<BytesReference> documentS
         super(in);
         field = in.readString();
         name = in.readOptionalString();
-        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            String documentType = in.readOptionalString();
-            assert documentType == null;
-        }
         indexedDocumentIndex = in.readOptionalString();
-        if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            String indexedDocumentType = in.readOptionalString();
-            assert indexedDocumentType == null;
-        }
         indexedDocumentId = in.readOptionalString();
         indexedDocumentRouting = in.readOptionalString();
         indexedDocumentPreference = in.readOptionalString();
@@ -248,15 +239,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         }
         out.writeString(field);
         out.writeOptionalString(name);
-        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            // In 7x, typeless percolate queries are represented by null documentType values
-            out.writeOptionalString(null);
-        }
         out.writeOptionalString(indexedDocumentIndex);
-        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            // In 7x, typeless percolate queries are represented by null indexedDocumentType values
-            out.writeOptionalString(null);
-        }
         out.writeOptionalString(indexedDocumentId);
         out.writeOptionalString(indexedDocumentRouting);
         out.writeOptionalString(indexedDocumentPreference);

muted-tests.yml

@@ -612,6 +612,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.expression.function.aggregate.IrateTests
   method: testGroupingAggregate {TestCase=<positive longs>}
   issue: https://github.com/elastic/elasticsearch/issues/135775
+- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
+  method: test
+  issue: https://github.com/elastic/elasticsearch/issues/135787
 
 # Examples:
 #