Merge branch 'main' into skip-can-match-on-batched

Author: original-brownbear

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: []

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":
 

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/index/IndexFeatures.java

@@ -25,8 +25,16 @@ public Set<NodeFeature> getFeatures() {
 
     private static final NodeFeature SYNONYMS_SET_LENIENT_ON_NON_EXISTING = new NodeFeature("index.synonyms_set_lenient_on_non_existing");
 
+    private static final NodeFeature THROW_EXCEPTION_ON_INDEX_CREATION_IF_UNSUPPORTED_VALUE_TYPE_IN_ALIAS = new NodeFeature(
+        "index.throw_exception_on_index_creation_if_unsupported_value_type_in_alias"
+    );
+
     @Override
     public Set<NodeFeature> getTestFeatures() {
-        return Set.of(LOGSDB_NO_HOST_NAME_FIELD, SYNONYMS_SET_LENIENT_ON_NON_EXISTING);
+        return Set.of(
+            LOGSDB_NO_HOST_NAME_FIELD,
+            SYNONYMS_SET_LENIENT_ON_NON_EXISTING,
+            THROW_EXCEPTION_ON_INDEX_CREATION_IF_UNSUPPORTED_VALUE_TYPE_IN_ALIAS
+        );
     }
 }

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/ShardContext.java

@@ -8,6 +8,10 @@
 package org.elasticsearch.compute.lucene;
 
 import org.apache.lucene.search.IndexSearcher;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.index.mapper.BlockLoader;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.search.sort.SortAndFormats;
 import org.elasticsearch.search.sort.SortBuilder;
 
@@ -39,4 +43,14 @@ public interface ShardContext {
      * {@code _cat/shards}.
      */
     String shardIdentifier();
+
+    /**
+     * Build something to load source {@code _source}.
+     */
+    SourceLoader newSourceLoader();
+
+    /**
+     * Returns something to load values from this field into a {@link Block}.
+     */
+    BlockLoader blockLoader(String name, boolean asUnsupportedSource, MappedFieldType.FieldExtractPreference fieldExtractPreference);
 }