Store split indices (#138396)

Author: idegtiarenko

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

@@ -102,7 +102,7 @@ public void setup() {
             mapping.put("field" + i, new EsField("field-" + i, TEXT, emptyMap(), true, EsField.TimeSeriesFieldType.NONE));
         }
 
-        var esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Set.of());
+        var esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Map.of(), Map.of(), Set.of());
 
         var functionRegistry = new EsqlFunctionRegistry();
 

server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java

@@ -88,12 +88,21 @@ public static List<String> getRemoteIndexExpressions(String... expressions) {
      */
     public static String parseClusterAlias(String indexExpression) {
         assert indexExpression != null : "Must not pass null indexExpression";
-        String[] parts = splitIndexName(indexExpression.trim());
-        if (parts[0] == null) {
-            return RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY;
-        } else {
-            return parts[0];
-        }
+        return getClusterAlias(splitIndexName(indexExpression.trim()));
+    }
+
+    /**
+     * @return the cluster alias or LOCAL_CLUSTER_GROUP_KEY if the split represents local index
+     */
+    public static String getClusterAlias(String[] split) {
+        return split[0] == null ? LOCAL_CLUSTER_GROUP_KEY : split[0];
+    }
+
+    /**
+     * @return the local index name from the qualified index name split by RemoteClusterAware#splitIndexName
+     */
+    public static String getLocalIndexName(String[] split) {
+        return split[1];
     }
 
     /**

server/src/main/resources/transport/definitions/referable/esql_es_relation_add_split_indices.csv

@@ -0,0 +1 @@
+9226000

server/src/main/resources/transport/upper_bounds/9.3.csv

@@ -1 +1 @@
-keystore_details_in_reload_secure_settings_response,9225000
+esql_es_relation_add_split_indices,9226000

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/Holder.java

@@ -7,6 +7,8 @@
 
 package org.elasticsearch.xpack.esql.core.util;
 
+import java.util.function.Supplier;
+
 /**
  * Simply utility class used for setting a state, typically
  * for closures (which require outside variables to be final).
@@ -36,7 +38,20 @@ public void setIfAbsent(T value) {
         }
     }
 
+    /**
+     * Sets a value in the holder, but only if none has already been set.
+     * @param value the new value to set.
+     */
+    public void setOnce(T value) {
+        assert this.value == null : "Value has already been set to " + this.value;
+        this.value = value;
+    }
+
     public T get() {
         return value;
     }
+
+    public T getOrDefault(Supplier<T> defaultValue) {
+        return value != null ? value : defaultValue.get();
+    }
 }

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

@@ -324,7 +324,7 @@ public static EsRelation relation() {
     }
 
     public static EsRelation relation(IndexMode mode) {
-        return new EsRelation(EMPTY, randomIdentifier(), mode, Map.of(), List.of());
+        return new EsRelation(EMPTY, randomIdentifier(), mode, Map.of(), Map.of(), Map.of(), List.of());
     }
 
     /**

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

@@ -246,7 +246,7 @@ private PhysicalPlan buildGreaterThanFilter(long value) {
             new EsField("l", DataType.LONG, Collections.emptyMap(), true, EsField.TimeSeriesFieldType.NONE)
         );
         Expression greaterThan = new GreaterThan(Source.EMPTY, filterAttribute, new Literal(Source.EMPTY, value, DataType.LONG));
-        EsRelation esRelation = new EsRelation(Source.EMPTY, "test", IndexMode.LOOKUP, Map.of(), List.of());
+        EsRelation esRelation = new EsRelation(Source.EMPTY, "test", IndexMode.LOOKUP, Map.of(), Map.of(), Map.of(), List.of());
         Filter filter = new Filter(Source.EMPTY, esRelation, greaterThan);
         return new FragmentExec(filter);
     }

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

@@ -303,6 +303,8 @@ private LogicalPlan resolveIndex(UnresolvedRelation plan, IndexResolution indexR
                 plan.source(),
                 esIndex.name(),
                 plan.indexMode(),
+                esIndex.originalIndices(),
+                esIndex.concreteIndices(),
                 esIndex.indexNameWithModes(),
                 attributes.isEmpty() ? NO_FIELDS : attributes
             );

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

@@ -456,9 +456,12 @@ public void messageReceived(LookupRequest request, TransportChannel channel, Tas
                             false,
                             false,
                             refs.acquire(indexResult -> {
-                                if (indexResult.isValid() && indexResult.get().concreteIndices().size() == 1) {
+                                if (indexResult.isValid() && indexResult.get().concreteQualifiedIndices().size() == 1) {
                                     EsIndex esIndex = indexResult.get();
-                                    var concreteIndices = Map.of(request.clusterAlias, Iterables.get(esIndex.concreteIndices(), 0));
+                                    var concreteIndices = Map.of(
+                                        request.clusterAlias,
+                                        Iterables.get(esIndex.concreteQualifiedIndices(), 0)
+                                    );
                                     var resolved = new ResolvedEnrichPolicy(
                                         p.getMatchField(),
                                         p.getType(),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/QueryBuilderResolver.java

@@ -85,7 +85,7 @@ private static QueryRewriteContext queryRewriteContext(TransportActionServices s
 
     private static Set<String> indexNames(LogicalPlan plan) {
         Set<String> indexNames = new HashSet<>();
-        plan.forEachDown(EsRelation.class, esRelation -> indexNames.addAll(esRelation.concreteIndices()));
+        plan.forEachDown(EsRelation.class, esRelation -> indexNames.addAll(esRelation.concreteQualifiedIndices()));
         return indexNames;
     }