Skip to content

Commit 076140f

Browse files
authored
Merge branch 'main' into mute_tests
2 parents 393aa7d + 547d4a4 commit 076140f

File tree

169 files changed

+2807
-1465
lines changed

Some content is hidden

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

169 files changed

+2807
-1465
lines changed

distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:68e0781cd592beda39880428985d5fecca1cf2abb18365da73bf1f7ebd994974 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:799fc6d2ed4e9be0b1f2a05b92a593f69de19525061088bd1432fcd27048cc87 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:68e0781cd592beda39880428985d5fecca1cf2abb18365da73bf1f7ebd994974
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:799fc6d2ed4e9be0b1f2a05b92a593f69de19525061088bd1432fcd27048cc87
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:3d19648819612728a676ab4061edfb3283bd7117a22c6c4479ee1c1d51831832 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:fdfd7f357a09f933ab22143273849f8b247360f2f94f4dc2ea473001c59f9f0b AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:3d19648819612728a676ab4061edfb3283bd7117a22c6c4479ee1c1d51831832
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:fdfd7f357a09f933ab22143273849f8b247360f2f94f4dc2ea473001c59f9f0b
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

docs/changelog/130158.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130158
2+
summary: Handle unavailable MD5 in ES|QL
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/130336.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130336
2+
summary: "[EIS] Rename the elser 2 default model and the default inference endpoint"
3+
area: Machine Learning
4+
type: bug
5+
issues: []

docs/reference/elasticsearch/mapping-reference/range.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,70 @@ The following parameters are accepted by range types:
215215
[`store`](/reference/elasticsearch/mapping-reference/mapping-store.md)
216216
: Whether the field value should be stored and retrievable separately from the [`_source`](/reference/elasticsearch/mapping-reference/mapping-source-field.md) field. Accepts `true` or `false` (default).
217217

218+
## Sorting
219+
220+
Sorting is not supported for any of the `range` field types. Attempting to sort by a field of type range_field will result in a `400 Bad Request` response.
221+
For example, executing a sort query on a field of type `integer_range`,
222+
```console
223+
PUT idx
224+
{
225+
"mappings": {
226+
"properties": {
227+
"my_range": {
228+
"type": "integer_range"
229+
}
230+
}
231+
}
232+
}
233+
234+
POST idx/_search
235+
{
236+
"sort": [
237+
{
238+
"my_range": {
239+
"order": "asc"
240+
}
241+
}
242+
]
243+
}
244+
```
245+
results in the following response:
246+
```console-result
247+
{
248+
"error": {
249+
"root_cause": [
250+
{
251+
"type": "illegal_argument_exception",
252+
"reason": "Sorting by range field [my_range] is not supported"
253+
}
254+
],
255+
"type": "search_phase_execution_exception",
256+
"reason": "all shards failed",
257+
"phase": "query",
258+
"grouped": true,
259+
"failed_shards": [
260+
{
261+
"shard": 0,
262+
"index": "idx",
263+
"node": "7pzVSCf5TuSNZYj-N7u3tw",
264+
"reason": {
265+
"type": "illegal_argument_exception",
266+
"reason": "Sorting by range field [my_range] is not supported"
267+
}
268+
}
269+
],
270+
"caused_by": {
271+
"type": "illegal_argument_exception",
272+
"reason": "Sorting by range field [my_range] is not supported",
273+
"caused_by": {
274+
"type": "illegal_argument_exception",
275+
"reason": "Sorting by range field [my_range] is not supported"
276+
}
277+
}
278+
},
279+
"status": 400
280+
}
281+
```
218282

219283
## Synthetic `_source` [range-synthetic-source]
220284

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ PUT my-index
2626

2727
## Token pruning
2828
```{applies_to}
29-
stack: preview 9.1
29+
stack: ga 9.1
3030
```
3131

3232
With any new indices created, token pruning will be turned on by default with appropriate defaults. You can control this behaviour using the optional `index_options` parameters for the field:
@@ -63,23 +63,23 @@ The following parameters are accepted by `sparse_vector` fields:
6363
* Exclude the field from [_source](/reference/elasticsearch/rest-apis/retrieve-selected-fields.md#source-filtering).
6464
* Use [synthetic `_source`](/reference/elasticsearch/mapping-reference/mapping-source-field.md#synthetic-source).
6565

66-
index_options {applies_to}`stack: preview 9.1`
66+
index_options {applies_to}`stack: ga 9.1`
6767
: (Optional, object) You can set index options for your `sparse_vector` field to determine if you should prune tokens, and the parameter configurations for the token pruning. If pruning options are not set in your [`sparse_vector` query](/reference/query-languages/query-dsl/query-dsl-sparse-vector-query.md), Elasticsearch will use the default options configured for the field, if any.
6868

6969
Parameters for `index_options` are:
7070

71-
`prune` {applies_to}`stack: preview 9.1`
71+
`prune` {applies_to}`stack: ga 9.1`
7272
: (Optional, boolean) Whether to perform pruning, omitting the non-significant tokens from the query to improve query performance. If `prune` is true but the `pruning_config` is not specified, pruning will occur but default values will be used. Default: true.
7373

74-
`pruning_config` {applies_to}`stack: preview 9.1`
74+
`pruning_config` {applies_to}`stack: ga 9.1`
7575
: (Optional, object) Optional pruning configuration. If enabled, this will omit non-significant tokens from the query in order to improve query performance. This is only used if `prune` is set to `true`. If `prune` is set to `true` but `pruning_config` is not specified, default values will be used. If `prune` is set to false but `pruning_config` is specified, an exception will occur.
7676

7777
Parameters for `pruning_config` include:
7878

79-
`tokens_freq_ratio_threshold` {applies_to}`stack: preview 9.1`
79+
`tokens_freq_ratio_threshold` {applies_to}`stack: ga 9.1`
8080
: (Optional, integer) Tokens whose frequency is more than `tokens_freq_ratio_threshold` times the average frequency of all tokens in the specified field are considered outliers and pruned. This value must between 1 and 100. Default: `5`.
8181

82-
`tokens_weight_threshold` {applies_to}`stack: preview 9.1`
82+
`tokens_weight_threshold` {applies_to}`stack: ga 9.1`
8383
: (Optional, float) Tokens whose weight is less than `tokens_weight_threshold` are considered insignificant and pruned. This value must be between 0 and 1. Default: `0.4`.
8484

8585
::::{note}

0 commit comments

Comments
 (0)