Fix merge errors

Author: julian-elastic

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

@@ -336,7 +336,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = def(9_117_0_00);
     public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_118_0_00);
 
-
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java

@@ -48,8 +48,6 @@
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
 
 @ThreadLeakFilters(filters = TestClustersThreadFilter.class)
 public class MultiClustersIT extends ESRestTestCase {
@@ -297,7 +295,7 @@ private void assertClusterDetailsMap(Map<String, Object> result, boolean remoteO
         assertThat(
             remoteClusterShards,
             matchesMap().entry("total", greaterThanOrEqualTo(0))
-        assertThat((Integer) remoteClusterShards.get("skipped"), greaterThanOrEqualTo(0));
+                .entry("successful", remoteClusterShards.get("total"))
                 .entry("skipped", greaterThanOrEqualTo(0))
                 .entry("failed", 0)
         );
@@ -315,7 +313,7 @@ private void assertClusterDetailsMap(Map<String, Object> result, boolean remoteO
             assertThat(
                 localClusterShards,
                 matchesMap().entry("total", greaterThanOrEqualTo(0))
-            assertThat((Integer) localClusterShards.get("skipped"), greaterThanOrEqualTo(0));
+                    .entry("successful", localClusterShards.get("total"))
                     .entry("skipped", greaterThanOrEqualTo(0))
                     .entry("failed", 0)
             );
@@ -432,6 +430,7 @@ public void testLikeIndex() throws Exception {
         assertResultMapForLike(includeCCSMetadata, result, columns, values, false, false);
     }
 
+    public void testLikeIndexLegacySettingNoResults() throws Exception {
         // the feature is completely supported if both local and remote clusters support it
         assumeTrue("not supported", capabilitiesSupportedNewAndOld(List.of("like_on_index_fields")));
         try (
@@ -551,28 +550,6 @@ public void testRLikeIndex() throws Exception {
         assertResultMapForLike(includeCCSMetadata, result, columns, values, false, false);
     }
 
-    public void testNotRLikeIndex() throws Exception {
-        boolean includeCCSMetadata = includeCCSMetadata();
-        Map<String, Object> result = run("""
-            FROM test-local-index,*:test-remote-index METADATA _index
-            | WHERE _index NOT RLIKE ".*remote.*"
-            | STATS c = COUNT(*) BY _index
-            | SORT _index ASC
-            """, includeCCSMetadata);
-        var columns = List.of(Map.of("name", "c", "type", "long"), Map.of("name", "_index", "type", "keyword"));
-        var values = List.of(List.of(localDocs.size(), localIndex));
-        assertResultMapForLike(includeCCSMetadata, result, columns, values, false, false);
-        Map<String, Object> result = run("""
-            FROM test-local-index,*:test-remote-index METADATA _index
-            | WHERE _index RLIKE ".*remote.*"
-            | STATS c = COUNT(*) BY _index
-            | SORT _index ASC
-            """, includeCCSMetadata);
-        var columns = List.of(Map.of("name", "c", "type", "long"), Map.of("name", "_index", "type", "keyword"));
-        var values = List.of(List.of(remoteDocs.size(), REMOTE_CLUSTER_NAME + ":" + remoteIndex));
-        assertResultMapForLike(includeCCSMetadata, result, columns, values, false, false);
-    }
-
     public void testNotRLikeIndex() throws Exception {
         boolean includeCCSMetadata = includeCCSMetadata();
         Map<String, Object> result = run("""

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

@@ -130,7 +130,6 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
 
     // TODO: see whether escaping is needed
     private Query translateField(String targetFieldName, boolean forceStringMatch) {
-        boolean forceStringMatch = configuration != null && configuration.stringLikeOnIndex();
         return new WildcardQuery(source(), targetFieldName, pattern().asLuceneWildcard(), caseInsensitive(), forceStringMatch);
     }
 }

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

@@ -10,6 +10,7 @@
 import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 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;

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

@@ -94,6 +94,7 @@
 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;
@@ -2083,7 +2084,12 @@ public void testVerifierOnMissingReferences() throws Exception {
         // We want to verify that the localOptimize detects the missing attribute.
         // However, it also throws an error in one of the rules before we get to the verifier.
         // So we use an implementation of LocalPhysicalPlanOptimizer that does not have any rules.
-        LocalPhysicalOptimizerContext context = new LocalPhysicalOptimizerContext(config, FoldContext.small(), SearchStats.EMPTY);
+        LocalPhysicalOptimizerContext context = new LocalPhysicalOptimizerContext(
+            new EsqlFlags(true),
+            config,
+            FoldContext.small(),
+            SearchStats.EMPTY
+        );
         LocalPhysicalPlanOptimizer optimizerWithNoopExecute = new LocalPhysicalPlanOptimizer(context) {
             @Override
             protected List<Batch<PhysicalPlan>> batches() {