include indices from un-merged responses

Author: idegtiarenko

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

@@ -132,6 +132,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.function.Function;
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 
@@ -548,23 +549,17 @@ public static List<List<Object>> getValuesList(EsqlQueryResponse results) {
     }
 
     public static List<List<Object>> getValuesList(Iterator<Iterator<Object>> values) {
-        var valuesList = new ArrayList<List<Object>>();
-        values.forEachRemaining(row -> {
-            var rowValues = new ArrayList<>();
-            row.forEachRemaining(rowValues::add);
-            valuesList.add(rowValues);
-        });
-        return valuesList;
+        return toList(values, row -> toList(row, Function.identity()));
     }
 
     public static List<List<Object>> getValuesList(Iterable<Iterable<Object>> values) {
-        var valuesList = new ArrayList<List<Object>>();
-        values.iterator().forEachRemaining(row -> {
-            var rowValues = new ArrayList<>();
-            row.iterator().forEachRemaining(rowValues::add);
-            valuesList.add(rowValues);
-        });
-        return valuesList;
+        return toList(values.iterator(), row -> toList(row.iterator(), Function.identity()));
+    }
+
+    private static <E, T> List<T> toList(Iterator<E> iterable, Function<E, T> transformer) {
+        var list = new ArrayList<T>();
+        iterable.forEachRemaining(e -> list.add(transformer.apply(e)));
+        return list;
     }
 
     public static List<String> withDefaultLimitWarning(List<String> warnings) {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterEnrichIT.java

@@ -367,7 +367,8 @@ public void testLimitThenEnrichRemote() {
             FROM *:events,events
             | LIMIT 25
             | eval ip= TO_STR(host)
-            | %s | KEEP host, timestamp, user, os
+            | %s
+            | KEEP host, timestamp, user, os
             """, enrichHosts(Enrich.Mode.REMOTE));
         try (EsqlQueryResponse resp = runQuery(query, requestIncludeMeta)) {
             var values = getValuesList(resp);

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

@@ -42,6 +42,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import static java.util.stream.Collectors.toSet;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DATETIME;
 import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
 import static org.elasticsearch.xpack.esql.core.type.DataType.OBJECT;
@@ -78,7 +79,9 @@ public void resolveConcreteIndices(String indexPattern, QueryBuilder requestFilt
         client.execute(
             EsqlResolveFieldsAction.TYPE,
             createFieldCapsRequest(indexPattern, Set.of("_id"), requestFilter, false),
-            listener.delegateFailureAndWrap((l, response) -> l.onResponse(Set.of(response.getIndices())))
+            listener.delegateFailureAndWrap((l, response) -> {
+                l.onResponse(response.getIndexResponses().stream().map(FieldCapabilitiesIndexResponse::getIndexName).collect(toSet()));
+            })
         );
     }