Skip to content

Commit 8cacf13

Browse files
mhl-bmhl-b
committed
Merge remote-tracking branch 'upstream/main' into rest-content-aggregation
2 parents 6e97ca1 + 12be820 commit 8cacf13

File tree

124 files changed

+3699
-1457
lines changed

Some content is hidden

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

124 files changed

+3699
-1457
lines changed

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: sanity-check
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -9,39 +9,39 @@ steps:
99
buildDirectory: /dev/shm/bk
1010
- wait
1111
- label: part1
12-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
12+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
1616
image: family/elasticsearch-ubuntu-2004
1717
machineType: n1-standard-32
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
20-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
20+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
2424
image: family/elasticsearch-ubuntu-2004
2525
machineType: n1-standard-32
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
28-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
28+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: n1-standard-32
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
36-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
36+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: n1-standard-32
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
44-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
44+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
@@ -51,7 +51,7 @@ steps:
5151
- group: bwc-snapshots
5252
steps:
5353
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
54-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
54+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5555
timeout_in_minutes: 300
5656
matrix:
5757
setup:
@@ -64,7 +64,7 @@ steps:
6464
env:
6565
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6666
- label: rest-compat
67-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
67+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6868
timeout_in_minutes: 300
6969
agents:
7070
provider: gcp

‎.buildkite/pipelines/intake.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated. See .buildkite/pipelines/intake.template.yml
22
steps:
33
- label: sanity-check
4-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
4+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
@@ -10,39 +10,39 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
- wait
1212
- label: part1
13-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
13+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1414
timeout_in_minutes: 300
1515
agents:
1616
provider: gcp
1717
image: family/elasticsearch-ubuntu-2004
1818
machineType: n1-standard-32
1919
buildDirectory: /dev/shm/bk
2020
- label: part2
21-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
21+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2222
timeout_in_minutes: 300
2323
agents:
2424
provider: gcp
2525
image: family/elasticsearch-ubuntu-2004
2626
machineType: n1-standard-32
2727
buildDirectory: /dev/shm/bk
2828
- label: part3
29-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
29+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
3030
timeout_in_minutes: 300
3131
agents:
3232
provider: gcp
3333
image: family/elasticsearch-ubuntu-2004
3434
machineType: n1-standard-32
3535
buildDirectory: /dev/shm/bk
3636
- label: part4
37-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
37+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3838
timeout_in_minutes: 300
3939
agents:
4040
provider: gcp
4141
image: family/elasticsearch-ubuntu-2004
4242
machineType: n1-standard-32
4343
buildDirectory: /dev/shm/bk
4444
- label: part5
45-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
45+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4646
timeout_in_minutes: 300
4747
agents:
4848
provider: gcp
@@ -52,7 +52,7 @@ steps:
5252
- group: bwc-snapshots
5353
steps:
5454
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
55-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
55+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
@@ -65,7 +65,7 @@ steps:
6565
env:
6666
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6767
- label: rest-compat
68-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
68+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6969
timeout_in_minutes: 300
7070
agents:
7171
provider: gcp

‎.buildkite/pipelines/lucene-snapshot/run-tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- label: sanity-check
3-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints precommit
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
@@ -9,39 +9,39 @@ steps:
99
buildDirectory: /dev/shm/bk
1010
- wait: null
1111
- label: part1
12-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
12+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart1
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
1616
image: family/elasticsearch-ubuntu-2004
1717
machineType: custom-32-98304
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
20-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
20+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
2424
image: family/elasticsearch-ubuntu-2004
2525
machineType: custom-32-98304
2626
buildDirectory: /dev/shm/bk
2727
- label: part3
28-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
28+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart3
2929
timeout_in_minutes: 300
3030
agents:
3131
provider: gcp
3232
image: family/elasticsearch-ubuntu-2004
3333
machineType: custom-32-98304
3434
buildDirectory: /dev/shm/bk
3535
- label: part4
36-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
36+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart4
3737
timeout_in_minutes: 300
3838
agents:
3939
provider: gcp
4040
image: family/elasticsearch-ubuntu-2004
4141
machineType: custom-32-98304
4242
buildDirectory: /dev/shm/bk
4343
- label: part5
44-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
44+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart5
4545
timeout_in_minutes: 300
4646
agents:
4747
provider: gcp
@@ -51,7 +51,7 @@ steps:
5151
- group: bwc-snapshots
5252
steps:
5353
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
54-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
54+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5555
timeout_in_minutes: 300
5656
matrix:
5757
setup:
@@ -66,7 +66,7 @@ steps:
6666
env:
6767
BWC_VERSION: "{{matrix.BWC_VERSION}}"
6868
- label: rest-compat
69-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat
69+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
7070
timeout_in_minutes: 300
7171
agents:
7272
provider: gcp

‎.buildkite/scripts/gradle-build-cache-validation.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
set -euo pipefail
44

5-
VALIDATION_SCRIPTS_VERSION=2.5.1
5+
VALIDATION_SCRIPTS_VERSION=2.7.1
66
GRADLE_ENTERPRISE_ACCESS_KEY=$(vault kv get -field=value secret/ci/elastic-elasticsearch/gradle-enterprise-api-key)
77
export GRADLE_ENTERPRISE_ACCESS_KEY
8-
9-
curl -s -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/v$VALIDATION_SCRIPTS_VERSION/gradle-enterprise-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip && unzip -q -o gradle-enterprise-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip
8+
curl -s -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/v$VALIDATION_SCRIPTS_VERSION/develocity-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip && unzip -q -o develocity-gradle-build-validation-$VALIDATION_SCRIPTS_VERSION.zip
109

1110
# Create a temporary file
1211
tmpOutputFile=$(mktemp)
1312
trap "rm $tmpOutputFile" EXIT
1413

1514
set +e
16-
gradle-enterprise-gradle-build-validation/03-validate-local-build-caching-different-locations.sh -r https://github.com/elastic/elasticsearch.git -b $BUILDKITE_BRANCH --gradle-enterprise-server https://gradle-enterprise.elastic.co -t precommit --fail-if-not-fully-cacheable | tee $tmpOutputFile
15+
develocity-gradle-build-validation/03-validate-local-build-caching-different-locations.sh -r https://github.com/elastic/elasticsearch.git -b $BUILDKITE_BRANCH --develocity-server https://gradle-enterprise.elastic.co -t precommit --fail-if-not-fully-cacheable | tee $tmpOutputFile
1716
# Capture the return value
1817
retval=$?
1918
set -e

‎docs/changelog/117199.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117199
2+
summary: Speed up bit compared with floats or bytes script operations
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/117271.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117271
2+
summary: Don't skip shards in coord rewrite if timestamp is an alias
3+
area: Search
4+
type: bug
5+
issues: []

‎docs/changelog/117748.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 117748
2+
summary: Add IMDSv2 support to `repository-s3`
3+
area: Snapshot/Restore
4+
type: enhancement
5+
issues:
6+
- 105135

‎docs/changelog/117842.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117842
2+
summary: Limit size of `Literal#toString`
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/reference/esql/esql-across-clusters.asciidoc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88

99
preview::["{ccs-cap} for {esql} is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features."]
1010

11-
[NOTE]
12-
====
13-
For {ccs-cap} with {esql} on version 8.16 or later, remote clusters must also be on version 8.16 or later.
14-
====
15-
1611
With {esql}, you can execute a single query across multiple clusters.
1712

1813
[discrete]

‎docs/reference/esql/functions/description/categorize.asciidoc‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)