Transport version backport

Author: julian-elastic

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

@@ -330,7 +330,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
     public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
     public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
-    public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_119_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java

@@ -32,7 +32,6 @@
 import java.util.Objects;
 
 import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19;
-import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;
 
 /**
  * Implements the wildcard search query. Supported wildcards are {@code *}, which
@@ -107,9 +106,8 @@ public WildcardQueryBuilder(StreamInput in) throws IOException {
         value = in.readString();
         rewrite = in.readOptionalString();
         caseInsensitive = in.readBoolean();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
-            || in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1)
+            || in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)) {
             forceStringMatch = in.readBoolean();
         } else {
             forceStringMatch = false;
@@ -122,9 +120,8 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         out.writeString(value);
         out.writeOptionalString(rewrite);
         out.writeBoolean(caseInsensitive);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
-            || out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1)
+            || out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)) {
             out.writeBoolean(forceStringMatch);
         }
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/regex/WildcardLikeList.java

@@ -11,7 +11,6 @@
 import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -148,10 +147,7 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
     }
 
     private boolean supportsPushdown(TransportVersion version) {
-        return version == null
-            || version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
-            || version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1);
+        return version == null || version.onOrAfter(ESQL_FIXED_INDEX_LIKE_9_1) || version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19);
     }
 
     @Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanStreamWrapperQueryBuilder.java

@@ -53,14 +53,13 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ESQL_FIXED_INDEX_LIKE;
+        return TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;
     }
 
     @Override
     public boolean supportsVersion(TransportVersion version) {
-        return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19)
-            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1);
+        return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1)
+            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19);
     }
 
     @Override

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -91,7 +91,6 @@
 import org.elasticsearch.xpack.esql.plan.physical.TimeSeriesSourceExec;
 import org.elasticsearch.xpack.esql.plan.physical.TopNExec;
 import org.elasticsearch.xpack.esql.planner.FilterTests;
-import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.querydsl.query.SingleValueQuery;
 import org.elasticsearch.xpack.esql.rule.Rule;
@@ -2057,7 +2056,6 @@ public void testToDateNanosPushDown() {
         assertThat(expected.toString(), is(esQuery.query().toString()));
     }
 
-
     private boolean isMultiTypeEsField(Expression e) {
         return e instanceof FieldAttribute fa && fa.field() instanceof MultiTypeEsField;
     }