Merge branch 'main' of https://github.com/elastic/elasticsearch into esql-reranker-boostrap

Author: afoucret

server/src/main/java/org/elasticsearch/action/ResolvedIndices.java

@@ -11,13 +11,15 @@
 
 import org.elasticsearch.action.search.SearchContextId;
 import org.elasticsearch.action.support.IndicesOptions;
+import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNotFoundException;
+import org.elasticsearch.indices.InvalidIndexNameException;
 import org.elasticsearch.search.builder.PointInTimeBuilder;
 import org.elasticsearch.transport.RemoteClusterAware;
 import org.elasticsearch.transport.RemoteClusterService;
@@ -176,6 +178,20 @@ public static ResolvedIndices resolveWithIndexNamesAndOptions(
             ? Index.EMPTY_ARRAY
             : indexNameExpressionResolver.concreteIndices(projectMetadata, localIndices, startTimeInMillis);
 
+        // prevent using selectors with remote cluster patterns
+        if (DataStream.isFailureStoreFeatureFlagEnabled()) {
+            for (final var indicesPerRemoteClusterAlias : remoteClusterIndices.entrySet()) {
+                final String[] indices = indicesPerRemoteClusterAlias.getValue().indices();
+                if (indices != null) {
+                    for (final String index : indices) {
+                        if (IndexNameExpressionResolver.hasSelectorSuffix(index)) {
+                            throw new InvalidIndexNameException(index, "Selectors are not yet supported on remote cluster patterns");
+                        }
+                    }
+                }
+            }
+        }
+
         return new ResolvedIndices(
             remoteClusterIndices,
             localIndices,

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

@@ -80,11 +80,6 @@ private SearchContextStats(List<SearchExecutionContext> contexts) {
         assert contexts != null && contexts.isEmpty() == false;
     }
 
-    public boolean exists(String field) {
-        var stat = cache.computeIfAbsent(field, this::makeFieldStats);
-        return stat.config.exists;
-    }
-
     private FieldStats makeFieldStats(String field) {
         var stat = new FieldStats();
         stat.config = makeFieldConfig(field);
@@ -123,19 +118,30 @@ private FieldConfig makeFieldConfig(String field) {
         }
     }
 
+    private boolean fastNoCacheFieldExists(String field) {
+        for (SearchExecutionContext context : contexts) {
+            if (context.isFieldMapped(field)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean exists(String field) {
+        var stat = cache.get(field);
+        return stat != null ? stat.config.exists : fastNoCacheFieldExists(field);
+    }
+
     public boolean isIndexed(String field) {
-        var stat = cache.computeIfAbsent(field, this::makeFieldStats);
-        return stat.config.indexed;
+        return cache.computeIfAbsent(field, this::makeFieldStats).config.indexed;
     }
 
     public boolean hasDocValues(String field) {
-        var stat = cache.computeIfAbsent(field, this::makeFieldStats);
-        return stat.config.hasDocValues;
+        return cache.computeIfAbsent(field, this::makeFieldStats).config.hasDocValues;
     }
 
     public boolean hasExactSubfield(String field) {
-        var stat = cache.computeIfAbsent(field, this::makeFieldStats);
-        return stat.config.hasExactSubfield;
+        return cache.computeIfAbsent(field, this::makeFieldStats).config.hasExactSubfield;
     }
 
     public long count() {
@@ -218,7 +224,7 @@ public boolean isSingleValue(String field) {
         var stat = cache.computeIfAbsent(field, this::makeFieldStats);
         if (stat.singleValue == null) {
             // there's no such field so no need to worry about multi-value fields
-            if (exists(field) == false) {
+            if (stat.config.exists == false) {
                 stat.singleValue = true;
             } else {
                 // fields are MV per default