Merge remote-tracking branch 'upstream/main' into flash1293/grok-multiple-patterns

Author: flash1293

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

@@ -76,7 +76,7 @@ public void setup() {
             Locale.US,
             null,
             null,
-            new QueryPragmas(Settings.EMPTY),
+            QueryPragmas.EMPTY,
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_MAX_SIZE.getDefault(Settings.EMPTY),
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
             "",

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

@@ -56,6 +56,7 @@
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThan;
 import org.elasticsearch.xpack.esql.planner.Layout;
+import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -358,7 +359,7 @@ private static Configuration configuration() {
             Locale.ROOT,
             null,
             null,
-            null,
+            QueryPragmas.EMPTY,
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_MAX_SIZE.get(Settings.EMPTY),
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_DEFAULT_SIZE.get(Settings.EMPTY),
             null,

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java

@@ -16,8 +16,8 @@
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramCircuitBreaker;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramGenerator;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramMerger;
+import org.elasticsearch.xpack.analytics.mapper.IndexWithCount;
 import org.elasticsearch.xpack.exponentialhistogram.CompressedExponentialHistogram;
-import org.elasticsearch.xpack.exponentialhistogram.IndexWithCount;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionModuleCheckTaskProvider.java

@@ -53,6 +53,7 @@ public class InternalDistributionModuleCheckTaskProvider {
         "org.elasticsearch.base",
         "org.elasticsearch.cli",
         "org.elasticsearch.entitlement",
+        "org.elasticsearch.exponentialhistogram",
         "org.elasticsearch.geo",
         "org.elasticsearch.grok",
         "org.elasticsearch.logging",

docs/changelog/135961.yaml

@@ -0,0 +1,5 @@
+pr: 135961
+summary: Late materialization of dimension fields in time-series
+area: TSDB
+type: enhancement
+issues: []

docs/changelog/136039.yaml

@@ -0,0 +1,18 @@
+pr: 136039
+summary: Disable cross-cluster functionality for `_fleet/_fleet_search`
+area: Search
+type: breaking
+issues: []
+breaking:
+  title: Disable cross-cluster functionality for `_fleet/_fleet_search`
+  area: Search
+  details: |-
+    This endpoint is largely used for local searches only and is not compatible with true cross-cluster searches where
+    arbitrary number of indices and remotes can be specified. Although it is meant to accept an index parameter that
+    denotes a single searchable target, such a limitation can be bypassed through various means.
+
+    Keeping in view this endpoint's stated intent and future scope, cross-cluster functionality is being explicitly disabled.
+  impact: |-
+    This endpoint will no longer accept remote indices. Should one be provided, a top-level error is returned with
+    an appropriate explanation.
+  notable: false

docs/changelog/136684.yaml

@@ -0,0 +1,5 @@
+pr: 136684
+summary: Lazy compute and cache `grantsAll` per privilege
+area: Authorization
+type: enhancement
+issues: []

docs/reference/query-languages/query-dsl/query-dsl-semantic-query.md

@@ -13,8 +13,18 @@ applies_to:
 We don't recommend this legacy query type for _new_ projects. Use the match query (with [QueryDSL](/reference/query-languages/query-dsl/query-dsl-match-query.md) or [ESQL](/reference/query-languages/esql/functions-operators/search-functions.md#esql-match)) instead. The semantic query remains available to support existing implementations.
 ::::
 
-The `semantic` query type enables you to perform [semantic search](docs-content://solutions/search/semantic-search.md) on data stored in a [`semantic_text`](/reference/elasticsearch/mapping-reference/semantic-text.md) field.
+The `semantic` query type enables you to perform [semantic search](docs-content://solutions/search/semantic-search.md) on data stored in a [`semantic_text`](/reference/elasticsearch/mapping-reference/semantic-text.md) field. This query accepts natural-language text and uses the field’s configured inference endpoint to generate a query embedding and match documents.
 
+For an overview of all query options available for `semantic_text` fields, see [Querying `semantic_text` fields](/reference/elasticsearch/mapping-reference/semantic-text.md#querying-semantic-text-fields).
+
+## Inference endpoint selection
+
+The target field of `semantic` query must be mapped as `semantic_text` and associated with an inference endpoint. At query time, the inference endpoint is chosen as follows:
+- If `search_inference_id` is defined, the semantic query uses that endpoint to embed the query.
+- If no `search_inference_id` is defined, `inference_id` is used for both indexing and search.
+- If no endpoint is specified at mapping, `inference_id` defaults to `.elser-2-elasticsearch`.
+
+The underlying vector type (dense or sparse) is determined by the endpoint automatically. No extra query parameters are required.
 
 ## Example request [semantic-query-example]
 

docs/reference/query-languages/query-dsl/query-dsl-sparse-vector-query.md

@@ -208,6 +208,54 @@ GET my-index/_search
 ```
 %  TEST[skip: Requires inference]
 
+## Example query on a `semantic_text` field
+
+You can also run a `sparse_vector` query directly on a [`semantic_text`](/reference/elasticsearch/mapping-reference/semantic-text.md) field. In this case Elasticsearch automatically uses the inference endpoint configured in the field mapping to expand the query into sparse tokens.
+
+First, create an index with a `semantic_text` field:
+
+```console
+PUT /my-semantic-sparse-index
+{
+  "mappings": {
+    "properties": {
+      "title": { "type": "text" },
+      "content_semantic": {
+        "type": "semantic_text",
+        "inference_id": ".elser-2-elasticsearch"
+      }
+    }
+  }
+}
+```
+
+Index some example documents:
+
+```console
+POST /my-semantic-sparse-index/_bulk
+{ "index": { "_index": "my-semantic-sparse-index", "_id": "1" } }
+{ "title": "Best surfing spots", "content_semantic": "Hawaii has world-class surfing with warm water and consistent swells." }
+{ "index": { "_index": "my-semantic-sparse-index", "_id": "2" } }
+{ "title": "City breaks", "content_semantic": "Paris offers museums, cafés, and beautiful architecture." }
+{ "index": { "_index": "my-semantic-sparse-index", "_id": "3" } }
+{ "title": "Learning to surf", "content_semantic": "Beginners often start on longboards at gentle beach breaks." }
+```
+
+Then query with `sparse_vector` against the `semantic_text` field:
+
+```console
+GET my-semantic-sparse-index/_search
+{
+  "size": 3,
+  "query": {
+    "sparse_vector": {
+      "field": "content_semantic",
+      "query": "best places to surf as a beginner" 
+    }
+  }
+}
+```
+
 
 ## Example ELSER query with pruning configuration and rescore [sparse-vector-query-with-pruning-config-and-rescore-example]
 

libs/exponential-histogram/build.gradle

@@ -17,7 +17,9 @@ dependencies {
   api project(':libs:x-content')
   api "org.apache.lucene:lucene-core:${versions.lucene}"
 
-  testImplementation(project(":test:framework"))
+  testImplementation(project(":test:framework")) {
+    exclude group: 'org.elasticsearch', module: 'exponential-histogram'
+  }
   testImplementation('ch.obermuhlner:big-math:2.3.2')
   testImplementation('org.apache.commons:commons-math3:3.6.1')
   testImplementation project(':libs:x-content:impl')