Merge branch 'main' into ml-fix-resource-exists

Author: jonathan-buttner

docs/changelog/136632.yaml

@@ -0,0 +1,6 @@
+pr: 136632
+summary: Field caps transport changes to return for each original expression what
+  it was resolved to
+area: Search
+type: enhancement
+issues: []

modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java

@@ -678,4 +678,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -385,4 +385,9 @@ public void testLoadSyntheticSourceFromStringOrBytesRef() throws IOException {
             }
         }
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -215,4 +215,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -209,4 +209,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean syntheticSource)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -649,4 +649,12 @@ private double encodeDecode(double value, double scalingFactor) {
     private static double randomValue() {
         return randomBoolean() ? randomDoubleBetween(-Double.MAX_VALUE, Double.MAX_VALUE, true) : randomFloat();
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of(
+            // TODO doubles currently disable pruning, can we re-enable?
+            new SortShortcutSupport(this::minimalMapping, this::writeField, false)
+        );
+    }
 }

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

@@ -877,4 +877,9 @@ protected RandomIndexWriter indexWriterForSyntheticSource(Directory directory) t
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -264,4 +264,9 @@ public void testAggregationsDocValuesDisabled() throws IOException {
         }));
         assertAggregatableConsistency(mapperService.fieldType("field"));
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

muted-tests.yml

@@ -417,33 +417,6 @@ tests:
 - class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
   method: test {p0=field_caps/10_basic/Field caps for number field with only doc values}
   issue: https://github.com/elastic/elasticsearch/issues/136244
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testDataStreams {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136353
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testServiceAccountApiKey {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136390
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testWatcher {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136391
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testSingleDoc {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136392
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testTransformLegacyTemplateCleanup {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136393
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testApiKeySuperuser {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136394
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testSecurityNativeRealm {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136395
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testSlmPolicyAndStats {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136399
-- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
-  method: testRollupAfterRestart {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/136437
 - class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
   method: test {p0=search.vectors/200_dense_vector_docvalue_fields/Enable docvalue_fields parameter for dense_vector fields}
   issue: https://github.com/elastic/elasticsearch/issues/136443
@@ -501,9 +474,12 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.PushQueriesIT
   method: testEqualityAndOther {SEMANTIC_TEXT_WITH_KEYWORD}
   issue: https://github.com/elastic/elasticsearch/issues/137491
-- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapperTests
-  method: testUpdates
-  issue: https://github.com/elastic/elasticsearch/issues/137512
+- class: org.elasticsearch.xpack.ilm.CCRIndexLifecycleIT
+  method: testBasicCCRAndILMIntegration {targetCluster=FOLLOWER}
+  issue: https://github.com/elastic/elasticsearch/issues/137494
+- class: org.elasticsearch.xpack.ilm.CCRIndexLifecycleIT
+  method: testCcrAndIlmWithRollover {targetCluster=FOLLOWER}
+  issue: https://github.com/elastic/elasticsearch/issues/137528
 
 # Examples:
 #

plugins/analysis-icu/src/test/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapperTests.java

@@ -318,4 +318,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }