Skip to content

Commit 4a5a19e

Browse files
afoucretafoucret
committed
Merge branch 'main' of https://github.com/elastic/elasticsearch into esql-reranker-boostrap
2 parents 132825d + 58c8f4a commit 4a5a19e

File tree

356 files changed

+3691
-1499
lines changed

Some content is hidden

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

356 files changed

+3691
-1499
lines changed

Diff for: ‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ expensive messages that will usually be discarded:
467467

468468
Logging is an important behaviour of the system and sometimes deserves its own
469469
unit tests, especially if there is complex logic for computing what is logged
470-
and when to log it. You can use a `org.elasticsearch.test.MockLogAppender` to
470+
and when to log it. You can use a `org.elasticsearch.test.MockLog` to
471471
make assertions about the logs that are being emitted.
472472

473473
Logging is a powerful diagnostic technique, but it is not the only possibility.

Diff for: ‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public enum DockerBase {
2222
// Chainguard based wolfi image with latest jdk
2323
// This is usually updated via renovatebot
2424
// spotless:off
25-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:c4e10ecf3d8a21cf4be2fb53a2f522de50e14c80ce1da487e3ffd13f4d48d24d",
25+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:29150cd940cc7f69407d978d5a19c86f4d9e67cf44e4d6ded787a497e8f27c9a",
2626
"-wolfi",
2727
"apk"
2828
),
29-
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7", "-fips", "apk"),
29+
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7@sha256:ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7", "-fips", "apk"),
3030
// spotless:on
3131
// Based on WOLFI above, with more extras. We don't set a base image because
3232
// we programmatically extend from the wolfi image.

Diff for: ‎build-tools-internal/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ protobuf = 3.25.5
3838
# test dependencies
3939
randomizedrunner = 2.8.2
4040
junit = 4.13.2
41-
junit5 = 5.7.1
42-
hamcrest = 2.1
41+
junit5 = 5.12.1
42+
hamcrest = 3.0
4343
mocksocket = 1.2
4444

4545
# test container dependencies

Diff for: ‎docs/changelog/125477.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125477
2+
summary: Prevent get datafeeds stats API returning an error when local tasks are slow to stop
3+
area: Machine Learning
4+
type: bug
5+
issues:
6+
- 104160

Diff for: ‎docs/changelog/125816.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125816
2+
summary: Use `FallbackSyntheticSourceBlockLoader` for point and `geo_point`
3+
area: Mapping
4+
type: enhancement
5+
issues: []

Diff for: ‎docs/changelog/125930.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125930
2+
summary: Infer the score mode to use from the Lucene collector
3+
area: "ES|QL"
4+
type: enhancement
5+
issues: []

Diff for: ‎docs/changelog/126077.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126077
2+
summary: Preventing `ConcurrentModificationException` when updating settings for more
3+
than one index
4+
area: Indices APIs
5+
type: bug
6+
issues: []

Diff for: ‎docs/changelog/126087.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 126087
2+
summary: Upgrade to repository-gcs to use com.google.cloud:google-cloud-storage-bom:2.50.0
3+
area: Snapshot/Restore
4+
type: upgrade
5+
issues: []

Diff for: ‎docs/redirects.yml

-142
This file was deleted.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/bucket.md

-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/kql.md

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/left.md

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/match.md

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/qstr.md

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/right.md

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/functions/examples/term.md

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/_snippets/operators/examples/is_not_null.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
**Example**
4+
5+
```esql
6+
FROM employees
7+
| WHERE is_rehired IS NOT NULL
8+
| STATS COUNT(emp_no)
9+
```
10+
11+
| COUNT(emp_no):long |
12+
| --- |
13+
| 84 |
14+
15+

Diff for: ‎docs/reference/query-languages/esql/_snippets/operators/examples/is_null.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
**Example**
4+
5+
```esql
6+
FROM employees
7+
| WHERE birth_date IS NULL
8+
```
9+
10+
| first_name:keyword | last_name:keyword |
11+
| --- | --- |
12+
| Basil | Tramer |
13+
| Florian | Syrotiuk |
14+
| Lucien | Rosenbaum |
15+
16+

Diff for: ‎docs/reference/query-languages/esql/_snippets/operators/examples/match_operator.md

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
```esql
66
FROM books
77
| WHERE MATCH(author, "Faulkner")
8-
| KEEP book_no, author
9-
| SORT book_no
10-
| LIMIT 5
118
```
129

1310
| book_no:keyword | author:text |

Diff for: ‎docs/reference/query-languages/esql/_snippets/operators/examples/predicates.md

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
```esql
66
FROM employees
77
| WHERE birth_date IS NULL
8-
| KEEP first_name, last_name
9-
| SORT first_name
10-
| LIMIT 3
118
```
129

1310
| first_name:keyword | last_name:keyword |

Diff for: ‎docs/reference/query-languages/esql/_snippets/operators/types/is_not_null.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
**Supported types**
4+
5+
| field | result |
6+
| --- | --- |
7+
| boolean | boolean |
8+
| cartesian_point | boolean |
9+
| cartesian_shape | boolean |
10+
| date | boolean |
11+
| date_nanos | boolean |
12+
| double | boolean |
13+
| geo_point | boolean |
14+
| geo_shape | boolean |
15+
| integer | boolean |
16+
| ip | boolean |
17+
| keyword | boolean |
18+
| long | boolean |
19+
| text | boolean |
20+
| unsigned_long | boolean |
21+
| version | boolean |
22+

Diff for: ‎docs/reference/query-languages/esql/_snippets/operators/types/is_null.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
% This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
2+
3+
**Supported types**
4+
5+
| field | result |
6+
| --- | --- |
7+
| boolean | boolean |
8+
| cartesian_point | boolean |
9+
| cartesian_shape | boolean |
10+
| date | boolean |
11+
| date_nanos | boolean |
12+
| double | boolean |
13+
| geo_point | boolean |
14+
| geo_shape | boolean |
15+
| integer | boolean |
16+
| ip | boolean |
17+
| keyword | boolean |
18+
| long | boolean |
19+
| text | boolean |
20+
| unsigned_long | boolean |
21+
| version | boolean |
22+

Diff for: ‎docs/reference/query-languages/esql/images/operators/is_not_null.svg

+1
Loading

Diff for: ‎docs/reference/query-languages/esql/images/operators/is_null.svg

+1
Loading

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/bucket.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/greatest.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/kql.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/least.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/left.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/match.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/median.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/median_absolute_deviation.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/mv_first.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/mv_last.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/reference/query-languages/esql/kibana/definition/functions/mv_slice.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)