Merge branch 'main' into esql-inference-ccs-v2

Author: afoucret

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java

@@ -83,7 +83,8 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                 }
             },
             bitsetFilterCache::getBitSetProducer,
-            MapperMetrics.NOOP
+            MapperMetrics.NOOP,
+            null
         );
 
         try {

benchmarks/src/main/java/org/elasticsearch/benchmark/indices/common/MappingParsingBenchmark.java

@@ -153,7 +153,8 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                     }
                 },
                 bitsetFilterCache::getBitSetProducer,
-                MapperMetrics.NOOP
+                MapperMetrics.NOOP,
+                null
             );
 
             mapperServices.add(mapperService);

benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java

@@ -108,7 +108,8 @@ public class ScriptScoreBenchmark {
     private final CircuitBreakerService breakerService = new NoneCircuitBreakerService();
     private final SearchLookup lookup = new SearchLookup(
         fieldTypes::get,
-        (mft, lookup, fdo) -> mft.fielddataBuilder(FieldDataContext.noRuntimeFields("benchmark")).build(fieldDataCache, breakerService),
+        (mft, lookup, fdo) -> mft.fielddataBuilder(FieldDataContext.noRuntimeFields("index", "benchmark"))
+            .build(fieldDataCache, breakerService),
         SourceProvider.fromLookup(MappingLookup.EMPTY, null, SourceFieldMetrics.NOOP)
     );
 

benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java

@@ -191,7 +191,8 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                 }
             },
             query -> { throw new UnsupportedOperationException(); },
-            MapperMetrics.NOOP
+            MapperMetrics.NOOP,
+            null
         );
 
         try {

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/AggConstructionContentionBenchmark.java

@@ -215,7 +215,7 @@ public Analyzer buildCustomAnalyzer(
         protected IndexFieldData<?> buildFieldData(MappedFieldType ft) {
             IndexFieldDataCache indexFieldDataCache = indicesFieldDataCache.buildIndexFieldDataCache(new IndexFieldDataCache.Listener() {
             }, index, ft.name());
-            return ft.fielddataBuilder(FieldDataContext.noRuntimeFields("benchmark")).build(indexFieldDataCache, breakerService);
+            return ft.fielddataBuilder(FieldDataContext.noRuntimeFields("index", "benchmark")).build(indexFieldDataCache, breakerService);
         }
 
         @Override

docs/changelog/137511.yaml

@@ -2,4 +2,6 @@ pr: 137511
 summary: Fixes esql class cast bug in STATS at planning level
 area: ES|QL
 type: bug
-issues: []
+issues:
+  - 133992
+  - 136598

docs/changelog/138489.yaml

@@ -0,0 +1,5 @@
+pr: 138489
+summary: Use existing `DocumentMapper` when creating new `MapperService`
+area: Mapping
+type: enhancement
+issues: []

docs/changelog/138515.yaml

@@ -0,0 +1,5 @@
+pr: 138515
+summary: Integrate stored fields format bloom filter with synthetic `_id`
+area: Codec
+type: enhancement
+issues: []

docs/changelog/138968.yaml

@@ -0,0 +1,19 @@
+pr: 138492
+summary: Enable new exponential histograms field type
+area: Mapping
+type: enhancement
+issues: []
+highlight:
+  title: New exponential_histogram field type for native OpenTelemetry exponential histogram support
+  body: |-
+    A new `exponential_histogram` field type has been added to Elasticsearch, providing native support for
+    OpenTelemetry exponential histograms.
+
+    Exponential histograms offer an efficient way to collect distributions (e.g. response times) at a high compression
+    ratio while still maintaining good accuracy for percentile estimation. They can be easily collected via
+    OpenTelemetry SDKs, as the only required configuration is the maximum allowed number of buckets. The actual buckets will be
+    chosen automatically based on the observed values.
+
+    The new `exponential_histogram` field type is supported in ES|QL.
+    It can be aggregated using the `PERCENTILES`, `AVG`, `MIN`, `MAX` and `SUM` functions.
+  notable: true

docs/changelog/139106.yaml

@@ -0,0 +1,5 @@
+pr: 139106
+summary: Let terms queries rewrite to a filter on `constant_keyword` fields
+area: Aggregations
+type: enhancement
+issues: []