Merge branch 'main' into feature/apis

Author: GalLalouche

docs/changelog/124708.yaml

@@ -0,0 +1,5 @@
+pr: 124708
+summary: Throw exception for unknown token in RestIndexPutAliasAction
+area: Indices APIs
+type: enhancement
+issues: []

docs/changelog/124737.yaml

@@ -0,0 +1,5 @@
+pr: 124737
+summary: Throw exception for unsupported values type in Alias
+area: Indices APIs
+type: enhancement
+issues: []

docs/changelog/126629.yaml

@@ -0,0 +1,5 @@
+pr: 126629
+summary: Default new `semantic_text` fields to use BBQ when models are compatible
+area: Relevance
+type: enhancement
+issues: []

docs/changelog/127285.yaml

@@ -0,0 +1,5 @@
+pr: 127285
+summary: Restore model registry validation for the semantic text field
+area: Search
+type: enhancement
+issues: []

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml

@@ -86,6 +86,38 @@
   - is_false: test_index.aliases.test_clias.index_routing
   - is_false: test_index.aliases.test_clias.search_routing
 
+---
+  "Throw exception for unsupported value type":
+    - requires:
+        cluster_features: [ "index.throw_exception_on_index_creation_if_unsupported_value_type_in_alias" ]
+        reason: "Throw exception on index creation if unsupported value type in alias"
+
+    - do:
+        catch: /Unsupported String type value \[true\] for field \[is_write_index\] in alias \[test_alias\]/
+        indices.create:
+          index: test_index
+          body:
+            mappings:
+              properties:
+                field:
+                  type: text
+            aliases:
+              test_alias:
+                is_write_index: "true"
+
+    - do:
+        catch: /Unsupported boolean type value \[true\] for field \[routing\] in alias \[test_alias\]/
+        indices.create:
+          index: test_index
+          body:
+            mappings:
+              properties:
+                field:
+                  type: text
+            aliases:
+              test_alias:
+                routing: true
+
 ---
 "Create index with write aliases":
 

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml

@@ -103,3 +103,30 @@
         index: test_index
         name: test_alias
   - match: {test_index.aliases.test_alias: {"filter": {"range": {"date_nanos_field": {"gt": "now-7d/d"}}}}}
+
+---
+"Throw exception for unknown token":
+  - requires:
+      cluster_features: [ "index.throw_exception_for_unknown_token_in_rest_index_put_alias_action" ]
+      reason: "Throw exception for unknown token in RestIndexPutAliasAction"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      catch: /Unsupported field \[foo\]/
+      indices.put_alias:
+        index: test_index
+        name: test_alias
+        body:
+          is_write_index: true
+          foo: "bar"
+
+  - do:
+      catch: / Unexpected token \[START_ARRAY\]/
+      indices.put_alias:
+        index: test_index
+        name: test_alias
+        body:
+          routing: [ "routing" ]

server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.plugins.internal;
 
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.engine.EngineFactory;
 import org.elasticsearch.index.engine.InternalEngine;
@@ -104,7 +105,7 @@ public IndexResult index(Index index) throws IOException {
                     IndexResult result = super.index(index);
 
                     DocumentSizeReporter documentParsingReporter = documentParsingProvider.newDocumentSizeReporter(
-                        shardId.getIndexName(),
+                        shardId.getIndex(),
                         config().getMapperService(),
                         DocumentSizeAccumulator.EMPTY_INSTANCE
                     );
@@ -131,22 +132,22 @@ public <T> XContentMeteringParserDecorator newMeteringParserDecorator(IndexReque
 
                 @Override
                 public DocumentSizeReporter newDocumentSizeReporter(
-                    String indexName,
+                    Index index,
                     MapperService mapperService,
                     DocumentSizeAccumulator documentSizeAccumulator
                 ) {
-                    return new TestDocumentSizeReporter(indexName);
+                    return new TestDocumentSizeReporter(index);
                 }
             };
         }
     }
 
     public static class TestDocumentSizeReporter implements DocumentSizeReporter {
 
-        private final String indexName;
+        private final Index index;
 
-        public TestDocumentSizeReporter(String indexName) {
-            this.indexName = indexName;
+        public TestDocumentSizeReporter(Index index) {
+            this.index = index;
         }
 
         @Override
@@ -155,7 +156,7 @@ public void onIndexingCompleted(ParsedDocument parsedDocument) {
             if (delta > XContentMeteringParserDecorator.UNKNOWN_SIZE) {
                 COUNTER.addAndGet(delta);
             }
-            assertThat(indexName, equalTo(TEST_INDEX_NAME));
+            assertThat(index.getName(), equalTo(TEST_INDEX_NAME));
         }
     }
 

server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java

@@ -25,7 +25,6 @@
 import org.elasticsearch.cluster.routing.ShardIterator;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.core.Predicates;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.injection.guice.Inject;
@@ -105,14 +104,7 @@ protected void masterOperation(
         Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(project.metadata(), request.indices());
         for (String index : concreteIndices) {
             final AliasFilter aliasFilter = indicesService.buildAliasFilter(project, index, indicesAndAliases);
-            final String[] aliases = indexNameExpressionResolver.indexAliases(
-                project.metadata(),
-                index,
-                Predicates.always(),
-                Predicates.always(),
-                true,
-                indicesAndAliases
-            );
+            final String[] aliases = indexNameExpressionResolver.allIndexAliases(project.metadata(), index, indicesAndAliases);
             indicesAndFilters.put(index, AliasFilter.of(aliasFilter.getQueryBuilder(), aliases));
         }
 

server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java

@@ -257,12 +257,32 @@ public static Alias fromXContent(XContentParser parser) throws IOException {
                     alias.indexRouting(parser.text());
                 } else if (SEARCH_ROUTING.match(currentFieldName, parser.getDeprecationHandler())) {
                     alias.searchRouting(parser.text());
+                } else {
+                    throw new IllegalArgumentException(
+                        "Unsupported String type value ["
+                            + parser.text()
+                            + "] for field ["
+                            + currentFieldName
+                            + "] in alias ["
+                            + alias.name
+                            + "]"
+                    );
                 }
             } else if (token == XContentParser.Token.VALUE_BOOLEAN) {
                 if (IS_WRITE_INDEX.match(currentFieldName, parser.getDeprecationHandler())) {
                     alias.writeIndex(parser.booleanValue());
                 } else if (IS_HIDDEN.match(currentFieldName, parser.getDeprecationHandler())) {
                     alias.isHidden(parser.booleanValue());
+                } else {
+                    throw new IllegalArgumentException(
+                        "Unsupported boolean type value ["
+                            + parser.text()
+                            + "] for field ["
+                            + currentFieldName
+                            + "] in alias ["
+                            + alias.name
+                            + "]"
+                    );
                 }
             } else {
                 throw new IllegalArgumentException("Unknown token [" + token + "] in alias [" + alias.name + "]");

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -62,7 +62,6 @@
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.util.concurrent.CountDown;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
-import org.elasticsearch.core.Predicates;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNotFoundException;
@@ -232,14 +231,7 @@ private Map<String, OriginalIndices> buildPerIndexOriginalIndices(
                 blocks.indexBlockedRaiseException(projectState.projectId(), ClusterBlockLevel.READ, index);
             }
 
-            String[] aliases = indexNameExpressionResolver.indexAliases(
-                projectState.metadata(),
-                index,
-                Predicates.always(),
-                Predicates.always(),
-                true,
-                indicesAndAliases
-            );
+            String[] aliases = indexNameExpressionResolver.allIndexAliases(projectState.metadata(), index, indicesAndAliases);
             String[] finalIndices = Strings.EMPTY_ARRAY;
             if (aliases == null
                 || aliases.length == 0