Merge remote-tracking branch 'upstream/main' into unmapped-fields-special-field-visitor-2

Author: jordan-powers

docs/changelog/132408.yaml

@@ -0,0 +1,5 @@
+pr: 132408
+summary: Correct exception for missing nested path
+area: Search
+type: bug
+issues: []

docs/changelog/132414.yaml

@@ -0,0 +1,5 @@
+pr: 132414
+summary: Adjust date docvalue formatting to return 4xx instead of 5xx
+area: Search
+type: bug
+issues: []

muted-tests.yml

@@ -482,12 +482,6 @@ tests:
 - class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1EnrichUnavailableRemotesIT
   method: testEsqlEnrichWithSkipUnavailable
   issue: https://github.com/elastic/elasticsearch/issues/132078
-- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
-  method: test {yaml=update/100_synthetic_source/stored text}
-  issue: https://github.com/elastic/elasticsearch/issues/132108
-- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
-  method: test {yaml=update/100_synthetic_source/keyword}
-  issue: https://github.com/elastic/elasticsearch/issues/132110
 - class: org.elasticsearch.index.engine.MergeWithLowDiskSpaceIT
   method: testRelocationWhileForceMerging
   issue: https://github.com/elastic/elasticsearch/issues/131789

rest-api-spec/build.gradle

@@ -90,4 +90,6 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
   task.skipTest("indices.create/21_synthetic_source_stored/field param - keep root array", "Synthetic source keep arrays now stores leaf arrays natively")
   task.skipTest("cluster.info/30_info_thread_pool/Cluster HTTP Info", "The search_throttled thread pool has been removed")
   task.skipTest("synonyms/80_synonyms_from_index/Fail loading synonyms from index if synonyms_set doesn't exist", "Synonyms do no longer fail if the synonyms_set doesn't exist")
+  task.skipTest("update/100_synthetic_source/keyword", "synthetic recovery source means _recovery_source field will not be present")
+  task.skipTest("update/100_synthetic_source/stored text", "synthetic recovery source means _recovery_source field will not be present")
 })

server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java

@@ -300,7 +300,7 @@ public static <E extends Exception> Query toQuery(
             if (ignoreUnmapped) {
                 return new MatchNoDocsQuery();
             } else {
-                throw new IllegalStateException("[" + NAME + "] failed to find nested object under path [" + path + "]");
+                throw new QueryShardException(context, "[" + NAME + "] failed to find nested object under path [" + path + "]");
             }
         }
         final BitSetProducer parentFilter;

server/src/main/java/org/elasticsearch/search/DocValueFormat.java

@@ -34,6 +34,7 @@
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Base64;
@@ -304,7 +305,14 @@ public DateMathParser getDateMathParser() {
 
         @Override
         public String format(long value) {
-            return formatter.format(resolution.toInstant(value).atZone(timeZone));
+            try {
+                return formatter.format(resolution.toInstant(value).atZone(timeZone));
+            } catch (DateTimeException dte) {
+                throw new IllegalArgumentException(
+                    "Failed formatting value [" + value + "] as date with pattern [" + formatter.pattern() + "]",
+                    dte
+                );
+            }
         }
 
         @Override

server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java

@@ -294,10 +294,7 @@ public void testIgnoreUnmapped() throws IOException {
 
         final NestedQueryBuilder failingQueryBuilder = new NestedQueryBuilder("unmapped", new MatchAllQueryBuilder(), ScoreMode.None);
         failingQueryBuilder.ignoreUnmapped(false);
-        IllegalStateException e = expectThrows(
-            IllegalStateException.class,
-            () -> failingQueryBuilder.toQuery(createSearchExecutionContext())
-        );
+        QueryShardException e = expectThrows(QueryShardException.class, () -> failingQueryBuilder.toQuery(createSearchExecutionContext()));
         assertThat(e.getMessage(), containsString("[" + NestedQueryBuilder.NAME + "] failed to find nested object under path [unmapped]"));
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java

@@ -123,6 +123,7 @@
 import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.indexWithDateDateNanosUnionType;
 import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.loadMapping;
 import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.tsdbIndexResolution;
+import static org.elasticsearch.xpack.esql.core.plugin.EsqlCorePlugin.DENSE_VECTOR_FEATURE_FLAG;
 import static org.elasticsearch.xpack.esql.core.tree.Source.EMPTY;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DATETIME;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_NANOS;
@@ -3755,7 +3756,9 @@ public void testRerankInvalidQueryTypes() {
     }
 
     public void testRerankFieldsInvalidTypes() {
-        List<String> invalidFieldNames = List.of("date", "date_nanos", "ip", "version", "dense_vector");
+        List<String> invalidFieldNames = DENSE_VECTOR_FEATURE_FLAG.isEnabled()
+            ? List.of("date", "date_nanos", "ip", "version", "dense_vector")
+            : List.of("date", "date_nanos", "ip", "version");
 
         for (String fieldName : invalidFieldNames) {
             LogManager.getLogger(AnalyzerTests.class).warn("[{}]", fieldName);