Skip to content

Commit 6b8db44

Browse files
authored
Merge branch 'main' into esql_docs_for_unresolved
2 parents fd1ce4c + a096e42 commit 6b8db44

File tree

60 files changed

+1847
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1847
-732
lines changed

docs/changelog/129369.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 129369
2+
summary: Support semantic reranking using contextual snippets instead of entire field
3+
text
4+
area: Relevance
5+
type: enhancement
6+
issues: []

docs/changelog/131711.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131711
2+
summary: Track & log when there is insufficient disk space available to execute merges
3+
area: Engine
4+
type: enhancement
5+
issues: []

docs/reference/elasticsearch/index-settings/index-modules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,5 +267,5 @@ $$$index-esql-stored-fields-sequential-proportion$$$
267267
`index.esql.stored_fields_sequential_proportion`
268268
: Tuning parameter for deciding when {{esql}} will load [Stored fields](/reference/elasticsearch/rest-apis/retrieve-selected-fields.md#stored-fields) using a strategy tuned for loading dense sequence of documents. Allows values between 0.0 and 1.0 and defaults to 0.2. Indices with documents smaller than 10kb may see speed improvements loading `text` fields by setting this lower.
269269

270-
$$$index-dense-vector-hnsw-early-termination$$$ `index.dense_vector.hnsw_early_termination`
270+
$$$index-dense-vector-hnsw-early-termination$$$ `index.dense_vector.hnsw_early_termination` {applies_to}`stack: ga 9.2` {applies_to}`serverless: all`
271271
: Whether to apply _patience_ based early termination strategy to knn queries over HNSW graphs (see [paper](https://cs.uwaterloo.ca/~jimmylin/publications/Teofili_Lin_ECIR2025.pdf)). This is only applicable to `dense_vector` fields with `hnsw`, `int8_hnsw`, `int4_hnsw` and `bbq_hnsw` index types. Defaults to `false`.

docs/reference/elasticsearch/mapping-reference/dense-vector.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,18 @@ POST /my-bit-vectors/_search?filter_path=hits.hits
396396

397397
To better accommodate scaling and performance needs, updating the `type` setting in `index_options` is possible with the [Update Mapping API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-mapping), according to the following graph (jumps allowed):
398398

399+
::::{tab-set}
400+
:::{tab-item} {{stack}} 9.1+
399401
```txt
400402
flat --> int8_flat --> int4_flat --> bbq_flat --> hnsw --> int8_hnsw --> int4_hnsw --> bbq_hnsw
401403
```
404+
:::
405+
:::{tab-item} {{stack}} 9.0
406+
```txt
407+
flat --> int8_flat --> int4_flat --> hnsw --> int8_hnsw --> int4_hnsw
408+
```
409+
:::
410+
::::
402411

403412
For updating all HNSW types (`hnsw`, `int8_hnsw`, `int4_hnsw`, `bbq_hnsw`) the number of connections `m` must either stay the same or increase. For the scalar quantized formats `int8_flat`, `int4_flat`, `int8_hnsw` and `int4_hnsw` the `confidence_interval` must always be consistent (once defined, it cannot change).
404413

docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ The `linear` retriever supports the following normalizers:
9090
```
9191
score = (score - min) / (max - min)
9292
```
93-
* `l2_norm`: Normalizes scores using the L2 norm of the score values
93+
* `l2_norm`: Normalizes scores using the L2 norm of the score values {applies_to}`stack: ga 9.1`

docs/reference/elasticsearch/security-privileges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ This section lists the privileges that you can assign to a role.
199199
`monitor_enrich`
200200
: All read-only operations related to managing and executing enrich policies.
201201

202-
`monitor_esql`
202+
`monitor_esql` {applies_to}`stack: ga 9.1`
203203
: All read-only operations related to ES|QL queries.
204204

205205
`monitor_inference`

docs/reference/search-connectors/elastic-managed-connectors.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
applies_to:
3-
ess: removed 9.0.0
3+
stack: unavailable 9.0, preview 9.1
4+
deployment:
5+
ess: unavailable
46
mapped_pages:
57
- https://www.elastic.co/guide/en/elasticsearch/reference/current/es-native-connectors.html
68
---
@@ -11,4 +13,4 @@ mapped_pages:
1113
As of Elastic 9.0, managed connectors on Elastic Cloud Hosted are no longer available. All connectors must be [self-managed](/reference/search-connectors/self-managed-connectors.md).
1214

1315
Refer to the [8.18 documentation](https://www.elastic.co/guide/en/elasticsearch/reference/8.18/es-native-connectors.html) if you are using an older version of Elastic.
14-
::::
16+
::::

muted-tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ tests:
143143
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
144144
method: test {p0=nodes.stats/11_indices_metrics/indices mappings exact count test for indices level}
145145
issue: https://github.com/elastic/elasticsearch/issues/120950
146-
- class: org.elasticsearch.xpack.ml.integration.PyTorchModelIT
147-
issue: https://github.com/elastic/elasticsearch/issues/121165
148146
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
149147
issue: https://github.com/elastic/elasticsearch/issues/121407
150148
- class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
@@ -309,9 +307,6 @@ tests:
309307
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
310308
method: testCCSClusterDetailsWhereAllShardsSkippedInCanMatch
311309
issue: https://github.com/elastic/elasticsearch/issues/128418
312-
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithFiltersIT
313-
method: testTimestampFilterFromQuery
314-
issue: https://github.com/elastic/elasticsearch/issues/127332
315310
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
316311
method: testSearchWhileRelocating
317312
issue: https://github.com/elastic/elasticsearch/issues/128500

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9292
.feature(FeatureFlag.TIME_SERIES_MODE)
9393
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
9494
.feature(FeatureFlag.IVF_FORMAT)
95-
.feature(FeatureFlag.SYNTHETIC_VECTORS);
95+
.feature(FeatureFlag.SYNTHETIC_VECTORS)
96+
.feature(FeatureFlag.RERANK_SNIPPETS);
9697

9798
private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local()
9899
.name(REMOTE_CLUSTER_NAME)

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9494
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
9595
.feature(FeatureFlag.IVF_FORMAT)
9696
.feature(FeatureFlag.SYNTHETIC_VECTORS)
97+
.feature(FeatureFlag.RERANK_SNIPPETS)
9798
.user("test_admin", "x-pack-test-password");
9899

99100
private static ElasticsearchCluster fulfillingCluster = ElasticsearchCluster.local()

0 commit comments

Comments
 (0)