Fix failing UTs

Author: julian-elastic

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

@@ -364,6 +364,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO = def(9_137_0_00);
     public static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = def(9_138_0_00);
     public static final TransportVersion ESQL_LOOKUP_JOIN_ON_MANY_FIELDS = def(9_139_0_00);
+    public static final TransportVersion ESQL_LOOKUP_JOIN_PRE_JOIN_FILTER = def(9_140_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

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

@@ -85,8 +85,8 @@ private void buildPrePostJoinFilter(PhysicalPlan rightPreJoinPlan, ClusterServic
             } catch (IOException e) {
                 throw new IllegalArgumentException("Failed to translate pre-join filter: " + esQueryExec, e);
             }
-        } else {
-            throw new IllegalArgumentException("Unsupported pre-join filter type: " + preJoinFilters.getClass().getName());
+        } else if (rightPreJoinPlan != null) {
+            throw new IllegalArgumentException("Unsupported pre-join filter type: " + rightPreJoinPlan.getClass().getName());
         }
     }
 

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

@@ -62,7 +62,7 @@ public String describe() {
                     .append(" inputChannel=")
                     .append(matchField.channel());
             }
-            stringBuilder.append(" rightPreJoinPlan=").append(rightPreJoinPlan);
+            stringBuilder.append(" right_pre_join_plan=").append(rightPreJoinPlan);
             stringBuilder.append("]");
             return stringBuilder.toString();
         }

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

@@ -220,7 +220,7 @@ static TransportRequest readFrom(StreamInput in, BlockFactory blockFactory) thro
                 source = new Source(source.source(), sourceText);
             }
             PhysicalPlan rightPreJoinPlan = null;
-            if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_ON_MANY_FIELDS)) {
+            if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_PRE_JOIN_FILTER)) {
                 rightPreJoinPlan = planIn.readOptionalNamedWriteable(PhysicalPlan.class);
             }
             TransportRequest result = new TransportRequest(
@@ -275,7 +275,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_SOURCE_TEXT)) {
                 out.writeString(source.text());
             }
-            if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_ON_MANY_FIELDS)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOOKUP_JOIN_PRE_JOIN_FILTER)) {
                 planOut.writeOptionalNamedWriteable(rightPreJoinPlan);
             } else if (rightPreJoinPlan != null) {
                 throw new EsqlIllegalArgumentException("LOOKUP JOIN with pre-join filter is not supported on remote node");

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexOperatorTests.java

@@ -187,7 +187,7 @@ protected Matcher<String> expectedToStringOfSimple() {
         for (int i = 0; i < numberOfJoinColumns; i++) {
             sb.append(" input_type=LONG match_field=match").append(i).append(" inputChannel=").append(i);
         }
-        sb.append("]");
+        sb.append(" right_pre_join_plan=null]");
         return matchesPattern(sb.toString());
     }
 

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

@@ -7055,7 +7055,9 @@ public void testLookupJoinPushDownSeparatedForConjunctionBetweenLeftAndRightFiel
         assertThat(literal.value(), equalTo(1));
 
         var leftRel = as(filter.child(), EsRelation.class);
-        var rightRel = as(join.right(), EsRelation.class);
+        var filterRight = as(join.right(), Filter.class);
+        assertEquals("language_name == \"English\"", filterRight.condition().toString());
+        var rightRel = as(filterRight.child(), EsRelation.class);
     }
 
     /**