Merge branch 'main' into jackson221

Author: jdconrad

docs/changelog/142181.yaml

@@ -0,0 +1,6 @@
+area: Inference
+issues: []
+pr: 142181
+summary: "[Inference API] Do not write \"task\" field in Jina embedding request if\
+  \ unsupported"
+type: bug

docs/changelog/142238.yaml

@@ -0,0 +1,5 @@
+area: Inference
+issues: []
+pr: 142238
+summary: "[Inference API] Fix `ChunkingSettings` field missing from `ModelConfigurations` equals method"
+type: bug

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java

@@ -422,6 +422,15 @@ private static void collectIndexSettingsValues(
     ) {
         for (Index index : backingIndices) {
             IndexMetadata indexMetadata = metadata.index(index);
+            if (indexMetadata == null) {
+                // This should never happen that the index metadata is null,
+                // but protect against it defensively to prevent an NPE below regardless
+                String message = "backing index [" + index.getName() + "] has null metadata in data stream [" + dataStream.getName() + "]";
+                LOGGER.warn(message);
+                assert false : message;
+                backingIndicesSettingsValues.put(index, new IndexProperties(true, null, ManagedBy.UNMANAGED, null));
+                continue;
+            }
             Boolean preferIlm = PREFER_ILM_SETTING.get(indexMetadata.getSettings());
             assert preferIlm != null : "must use the default prefer ilm setting value, if nothing else";
             ManagedBy managedBy;

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java

@@ -31,6 +31,7 @@
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.DocumentMapper;
+import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.FieldStorageVerifier;
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.LuceneDocument;
@@ -109,6 +110,9 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
             b -> { b.field("meta", Collections.singletonMap("format", "mysql.access")); },
             m -> assertEquals(Collections.singletonMap("format", "mysql.access"), m.fieldType().meta())
         );
+        if (FieldMapper.DocValuesParameter.EXTENDED_DOC_VALUES_PARAMS_FF.isEnabled()) {
+            checker.registerConflictCheck("doc_values", b -> b.field("doc_values", true));
+        }
     }
 
     @Override
@@ -686,4 +690,52 @@ protected List<SortShortcutSupport> getSortShortcutSupport() {
     protected boolean supportsDocValuesSkippers() {
         return false;
     }
+
+    public void testDocValuesDisabledByDefault() throws IOException {
+        MapperService mapperService = createMapperService(fieldMapping(b -> b.field("type", "match_only_text")));
+        MappedFieldType fieldType = mapperService.fieldType("field");
+        assertFalse("doc_values should be disabled by default", fieldType.hasDocValues());
+    }
+
+    public void testDocValuesEnabled() throws IOException {
+        assumeTrue(
+            "match_only_text field doc_values feature must be enabled",
+            FieldMapper.DocValuesParameter.EXTENDED_DOC_VALUES_PARAMS_FF.isEnabled()
+        );
+        MapperService mapperService = createMapperService(fieldMapping(b -> b.field("type", "match_only_text").field("doc_values", true)));
+        MappedFieldType fieldType = mapperService.fieldType("field");
+        assertTrue("doc_values should be enabled", fieldType.hasDocValues());
+    }
+
+    public void testDocValuesExplicitlyDisabled() throws IOException {
+        assumeTrue(
+            "match_only_text field doc_values feature must be enabled",
+            FieldMapper.DocValuesParameter.EXTENDED_DOC_VALUES_PARAMS_FF.isEnabled()
+        );
+        MapperService mapperService = createMapperService(fieldMapping(b -> b.field("type", "match_only_text").field("doc_values", false)));
+        MappedFieldType fieldType = mapperService.fieldType("field");
+        assertFalse("doc_values should be disabled", fieldType.hasDocValues());
+    }
+
+    public void testPhraseQueryWithDocValuesEnabled() throws IOException {
+        assumeTrue(
+            "match_only_text field doc_values feature must be enabled",
+            FieldMapper.DocValuesParameter.EXTENDED_DOC_VALUES_PARAMS_FF.isEnabled()
+        );
+        MapperService mapperService = createMapperService(fieldMapping(b -> b.field("type", "match_only_text").field("doc_values", true)));
+
+        try (Directory directory = newDirectory()) {
+            RandomIndexWriter iw = new RandomIndexWriter(random(), directory);
+            LuceneDocument doc = mapperService.documentMapper().parse(source(b -> b.field("field", "the quick brown fox"))).rootDoc();
+            iw.addDocument(doc);
+            iw.close();
+            try (DirectoryReader reader = DirectoryReader.open(directory)) {
+                SearchExecutionContext context = createSearchExecutionContext(mapperService, newSearcher(reader));
+                MatchPhraseQueryBuilder queryBuilder = new MatchPhraseQueryBuilder("field", "brown fox");
+                TopDocs docs = context.searcher().search(queryBuilder.toQuery(context), 1);
+                assertThat(docs.totalHits.value(), equalTo(1L));
+                assertThat(docs.totalHits.relation(), equalTo(TotalHits.Relation.EQUAL_TO));
+            }
+        }
+    }
 }

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java

@@ -242,6 +242,8 @@ public void testBlockLoaderUsesStoredFieldsForLoadingWhenSyntheticSourceDelegate
             false,
             false,
             null,
+            false,
+            false,
             false
         );
 
@@ -263,7 +265,9 @@ public void testBlockLoaderUsesBinaryDocValuesForLoadingWhenSyntheticSourceDeleg
             false,
             false,
             null,
-            true
+            true,
+            false,
+            false
         );
 
         // when
@@ -291,7 +295,9 @@ public void testBlockLoaderUsesSyntheticSourceDelegateWhenIgnoreAboveIsNotSet()
             false,
             false,
             syntheticSourceDelegate,
-            true
+            true,
+            false,
+            false
         );
 
         // when
@@ -337,6 +343,8 @@ public void testBlockLoaderDoesNotUseSyntheticSourceDelegateWhenIgnoreAboveIsSet
             false,
             false,
             syntheticSourceDelegate,
+            false,
+            false,
             false
         );
 
@@ -386,6 +394,8 @@ public void testBlockLoaderDoesNotUseSyntheticSourceDelegateWhenIgnoreAboveIsSet
             false,
             false,
             syntheticSourceDelegate,
+            false,
+            false,
             false
         );
 
@@ -420,6 +430,8 @@ public void testBlockLoaderDelegateToKeywordFieldWhenSyntheticSourceIsDisabled()
             true,
             false,
             keywordFieldType,
+            false,
+            false,
             false
         );
 
@@ -467,6 +479,8 @@ public void testBlockLoaderLoadsFromFallbackStoredFieldWhenSyntheticSourceIsEnab
             false,
             false,
             null,
+            false,
+            false,
             false
         );
 
@@ -489,7 +503,9 @@ public void testBlockLoaderLoadsFromFallbackBinaryDocValuesWhenSyntheticSourceIs
             false,
             false,
             null,
-            true
+            true,
+            false,
+            false
         );
 
         // when