fixup

Author: nik9000

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

@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -476,12 +477,8 @@ public void testNotLikeIndex() throws Exception {
     }
 
     public void testLikeListIndex() throws Exception {
-        List<String> requiredCapabilities = new ArrayList<>(List.of("like_list_on_index_fields"));
         // the feature is completely supported if both local and remote clusters support it
-        if (capabilitiesSupportedNewAndOld(requiredCapabilities) == false) {
-            logger.info("-->  skipping testNotLikeListIndex, due to missing capability");
-            return;
-        }
+        assumeTrue("not supported", capabilitiesSupportedNewAndOld(List.of("like_list_on_index_fields")));
         boolean includeCCSMetadata = includeCCSMetadata();
         Map<String, Object> result = run("""
             FROM test-local-index,*:test-remote-index METADATA _index
@@ -495,12 +492,7 @@ public void testLikeListIndex() throws Exception {
     }
 
     public void testNotLikeListIndex() throws Exception {
-        List<String> requiredCapabilities = new ArrayList<>(List.of("like_list_on_index_fields"));
-        // the feature is completely supported if both local and remote clusters support it
-        if (capabilitiesSupportedNewAndOld(requiredCapabilities) == false) {
-            logger.info("-->  skipping testNotLikeListIndex, due to missing capability");
-            return;
-        }
+        assumeTrue("not supported", capabilitiesSupportedNewAndOld(List.of("like_list_on_index_fields")));
         boolean includeCCSMetadata = includeCCSMetadata();
         Map<String, Object> result = run("""
             FROM test-local-index,*:test-remote-index METADATA _index
@@ -513,13 +505,8 @@ public void testNotLikeListIndex() throws Exception {
         assertResultMapForLike(includeCCSMetadata, result, columns, values, false, true);
     }
 
-    public void testNotLikeListKeyWord() throws Exception {
-        List<String> requiredCapabilities = new ArrayList<>(List.of("like_list_on_index_fields"));
-        // the feature is completely supported if both local and remote clusters support it
-        if (capabilitiesSupportedNewAndOld(requiredCapabilities) == false) {
-            logger.info("-->  skipping testNotLikeListIndex, due to missing capability");
-            return;
-        }
+    public void testNotLikeListKeyword() throws Exception {
+        assumeTrue("not supported", capabilitiesSupportedNewAndOld(List.of("like_with_list_of_patterns")));
         boolean includeCCSMetadata = includeCCSMetadata();
         Map<String, Object> result = run("""
             FROM test-local-index,*:test-remote-index METADATA _index
@@ -528,7 +515,11 @@ public void testNotLikeListKeyWord() throws Exception {
             | 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));
+        Predicate<Doc> filter = d -> false == (d.color.contains("blue") || d.color.contains("red"));
+        var values = List.of(
+            List.of((int) remoteDocs.stream().filter(filter).count(), REMOTE_CLUSTER_NAME + ":" + remoteIndex),
+            List.of((int) localDocs.stream().filter(filter).count(), localIndex)
+        );
         assertResultMapForLike(includeCCSMetadata, result, columns, values, false, true);
     }
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -1199,6 +1199,8 @@ public enum Cap {
 
         LIKE_WITH_LIST_OF_PATTERNS,
 
+        LIKE_LIST_ON_INDEX_FIELDS,
+
         /**
          * Support parameters for SAMPLE command.
          */

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

@@ -9,6 +9,8 @@
 
 import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 import org.apache.lucene.util.automaton.Automaton;
+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;
@@ -96,10 +98,10 @@ protected WildcardLikeList replaceChild(Expression newLeft) {
      */
     @Override
     public Translatable translatable(LucenePushdownPredicates pushdownPredicates) {
-        if (pushdownPredicates.minTransportVersion() == null) {
+        if (supportsPushdown(pushdownPredicates.minTransportVersion())) {
             return pushdownPredicates.isPushableAttribute(field()) ? Translatable.YES : Translatable.NO;
         } else {
-            // The AutomatonQuery that we use right now isn't serializable.
+            // The ExpressionQuery we use isn't serializable to all nodes in the cluster.
             return Translatable.NO;
         }
     }
@@ -119,6 +121,10 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
         return translateField(targetFieldName);
     }
 
+    private boolean supportsPushdown(TransportVersion version) {
+        return version == null || version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE);
+    }
+
     @Override
     public org.apache.lucene.search.Query asLuceneQuery(
         MappedFieldType fieldType,

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

@@ -15,6 +15,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.SearchExecutionContext;
+import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.esql.session.Configuration;
 
@@ -35,20 +36,23 @@ public class PlanStreamWrapperQueryBuilder implements QueryBuilder {
     private final QueryBuilder next;
 
     public PlanStreamWrapperQueryBuilder(Configuration configuration, QueryBuilder next) {
+        LogManager.getLogger(PlanStreamWrapperQueryBuilder.class).error("ASFAFDSAFDSF wrap {}", next);
         this.configuration = configuration;
         this.next = next;
     }
 
     public PlanStreamWrapperQueryBuilder(StreamInput in) throws IOException {
         configuration = Configuration.readWithoutTables(in);
+        LogManager.getLogger(PlanStreamWrapperQueryBuilder.class).error("ASFAFDSAFDSF streamread {}", configuration);
         PlanStreamInput planStreamInput = new PlanStreamInput(in, in.namedWriteableRegistry(), configuration);
         next = planStreamInput.readNamedWriteable(QueryBuilder.class);
+        LogManager.getLogger(PlanStreamWrapperQueryBuilder.class).error("ASFAFDSAFDSF stream {}", next);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         configuration.withoutTables().writeTo(out);
-        next.writeTo(new PlanStreamOutput(out, configuration));
+        new PlanStreamOutput(out, configuration).writeNamedWriteable(next);
     }
 
     @Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.index.query.CoordinatorRewriteContext;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.SearchExecutionContext;
+import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
 import org.elasticsearch.xpack.esql.core.expression.AttributeSet;
@@ -262,6 +263,7 @@ && translatable(exp, ctx).finish() == TranslationAware.FinishedTranslatable.YES)
                 if (matches.isEmpty() == false) {
                     Query qlQuery = TRANSLATOR_HANDLER.asQuery(ctx, Predicates.combineAnd(matches));
                     QueryBuilder builder = qlQuery.toQueryBuilder();
+                    LogManager.getLogger(PlannerUtils.class).error("ASFAFDSAFDSF {} {}", qlQuery, qlQuery.containsPlan());
                     if (qlQuery.containsPlan()) {
                         builder = new PlanStreamWrapperQueryBuilder(configuration, builder);
                     }

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

@@ -73,6 +73,7 @@
 import org.elasticsearch.xpack.esql.execution.PlanExecutor;
 import org.elasticsearch.xpack.esql.expression.ExpressionWritables;
 import org.elasticsearch.xpack.esql.io.stream.ExpressionQueryBuilder;
+import org.elasticsearch.xpack.esql.io.stream.PlanStreamWrapperQueryBuilder;
 import org.elasticsearch.xpack.esql.plan.PlanWritables;
 import org.elasticsearch.xpack.esql.querydsl.query.SingleValueQuery;
 import org.elasticsearch.xpack.esql.querylog.EsqlQueryLog;
@@ -335,6 +336,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         entries.add(EnrichLookupOperator.Status.ENTRY);
         entries.add(LookupFromIndexOperator.Status.ENTRY);
         entries.add(ExpressionQueryBuilder.ENTRY);
+        entries.add(PlanStreamWrapperQueryBuilder.ENTRY);
 
         entries.addAll(ExpressionWritables.getNamedWriteables());
         entries.addAll(PlanWritables.getNamedWriteables());

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/Configuration.java

@@ -120,6 +120,7 @@ public Configuration(BlockStreamInput in) throws IOException {
             this.allowPartialResults = false;
         }
         if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)) {
+            // NOCOMMIT can we look this up without putting it in Configuration?
             this.stringLikeOnIndex = in.readBoolean();
         } else {
             this.stringLikeOnIndex = false;