Skip to content

Commit c036769

Browse files
Merge branch 'main' into useCharPosInsteadOfBytePos
2 parents 8e380e4 + f9c5bc0 commit c036769

File tree

1,450 files changed

+32585
-13010
lines changed

Some content is hidden

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

1,450 files changed

+32585
-13010
lines changed

.buildkite/pipelines/intake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
59+
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ steps:
288288
env:
289289
BWC_VERSION: 8.15.4
290290

291-
- label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
292-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0
291+
- label: "{{matrix.image}} / 8.16.1 / packaging-tests-upgrade"
292+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.1
293293
timeout_in_minutes: 300
294294
matrix:
295295
setup:
@@ -302,7 +302,7 @@ steps:
302302
machineType: custom-16-32768
303303
buildDirectory: /dev/shm/bk
304304
env:
305-
BWC_VERSION: 8.16.0
305+
BWC_VERSION: 8.16.1
306306

307307
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
308308
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0

.buildkite/pipelines/periodic.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ steps:
306306
- signal_reason: agent_stop
307307
limit: 3
308308

309-
- label: 8.16.0 / bwc
310-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.0#bwcTest
309+
- label: 8.16.1 / bwc
310+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.1#bwcTest
311311
timeout_in_minutes: 300
312312
agents:
313313
provider: gcp
@@ -316,7 +316,7 @@ steps:
316316
buildDirectory: /dev/shm/bk
317317
preemptible: true
318318
env:
319-
BWC_VERSION: 8.16.0
319+
BWC_VERSION: 8.16.1
320320
retry:
321321
automatic:
322322
- exit_status: "-1"
@@ -429,7 +429,7 @@ steps:
429429
setup:
430430
ES_RUNTIME_JAVA:
431431
- openjdk21
432-
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
432+
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
433433
agents:
434434
provider: gcp
435435
image: family/elasticsearch-ubuntu-2004
@@ -471,7 +471,7 @@ steps:
471471
ES_RUNTIME_JAVA:
472472
- openjdk21
473473
- openjdk23
474-
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
474+
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
475475
agents:
476476
provider: gcp
477477
image: family/elasticsearch-ubuntu-2004

.buildkite/scripts/gradle-configuration-cache-validation.sh

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

33
set -euo pipefail
44

5-
# TODO/ FIXIT without a full resolved gradle home, we see issues configuration cache reuse
6-
./gradlew --max-workers=8 --parallel --scan --no-daemon precommit
5+
# This is a workaround for https://github.com/gradle/gradle/issues/28159
6+
.ci/scripts/run-gradle.sh --no-daemon precommit
77

8-
./gradlew --max-workers=8 --parallel --scan --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2
8+
.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2
99

1010
# Create a temporary file
1111
tmpOutputFile=$(mktemp)
1212
trap "rm $tmpOutputFile" EXIT
1313

1414
echo "2nd run"
15-
# TODO run-gradle.sh script causes issues because of init script handling
16-
./gradlew --max-workers=8 --parallel --scan --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 | tee $tmpOutputFile
15+
.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 | tee $tmpOutputFile
1716

1817
# Check if the command was successful
1918
if grep -q "Configuration cache entry reused." $tmpOutputFile; then

.ci/bwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ BWC_VERSION:
1515
- "8.13.4"
1616
- "8.14.3"
1717
- "8.15.4"
18-
- "8.16.0"
18+
- "8.16.1"
1919
- "8.17.0"
2020
- "9.0.0"

.ci/dockerOnLinuxExclusions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ sles-15.2
1515
sles-15.3
1616
sles-15.4
1717
sles-15.5
18+
sles-15.6
1819

1920
# These OSes are deprecated and filtered starting with 8.0.0, but need to be excluded
2021
# for PR checks

.ci/snapshotBwcVersions

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
BWC_VERSION:
2-
- "8.15.4"
3-
- "8.16.0"
2+
- "8.16.1"
43
- "8.17.0"
54
- "9.0.0"

README.asciidoc

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Elasticsearch is a distributed search and analytics engine, scalable data store
44

55
Use cases enabled by Elasticsearch include:
66

7-
* https://www.elastic.co/search-labs/blog/articles/retrieval-augmented-generation-rag[Retrieval Augmented Generation (RAG)]
7+
* https://www.elastic.co/search-labs/blog/articles/retrieval-augmented-generation-rag[Retrieval Augmented Generation (RAG)]
88
* https://www.elastic.co/search-labs/blog/categories/vector-search[Vector search]
99
* Full-text search
1010
* Logs
@@ -17,7 +17,7 @@ Use cases enabled by Elasticsearch include:
1717
To learn more about Elasticsearch's features and capabilities, see our
1818
https://www.elastic.co/products/elasticsearch[product page].
1919

20-
To access information on https://www.elastic.co/search-labs/blog/categories/ml-research[machine learning innovations] and the latest https://www.elastic.co/search-labs/blog/categories/lucene[Lucene contributions from Elastic], more information can be found in https://www.elastic.co/search-labs[Search Labs].
20+
To access information on https://www.elastic.co/search-labs/blog/categories/ml-research[machine learning innovations] and the latest https://www.elastic.co/search-labs/blog/categories/lucene[Lucene contributions from Elastic], more information can be found in https://www.elastic.co/search-labs[Search Labs].
2121

2222
[[get-started]]
2323
== Get started
@@ -27,20 +27,20 @@ https://www.elastic.co/cloud/as-a-service[Elasticsearch Service on Elastic
2727
Cloud].
2828

2929
If you prefer to install and manage Elasticsearch yourself, you can download
30-
the latest version from
30+
the latest version from
3131
https://www.elastic.co/downloads/elasticsearch[elastic.co/downloads/elasticsearch].
3232

3333
=== Run Elasticsearch locally
3434

35-
////
35+
////
3636
IMPORTANT: This content is replicated in the Elasticsearch repo. See `run-elasticsearch-locally.asciidoc`.
3737
Ensure both files are in sync.
3838
3939
https://github.com/elastic/start-local is the source of truth.
40-
////
40+
////
4141

4242
[WARNING]
43-
====
43+
====
4444
DO NOT USE THESE INSTRUCTIONS FOR PRODUCTION DEPLOYMENTS.
4545
4646
This setup is intended for local development and testing only.
@@ -93,20 +93,20 @@ Use this key to connect to Elasticsearch with a https://www.elastic.co/guide/en/
9393
From the `elastic-start-local` folder, check the connection to Elasticsearch using `curl`:
9494

9595
[source,sh]
96-
----
96+
----
9797
source .env
9898
curl $ES_LOCAL_URL -H "Authorization: ApiKey ${ES_LOCAL_API_KEY}"
9999
----
100100
// NOTCONSOLE
101101

102102
=== Send requests to Elasticsearch
103103

104-
You send data and other requests to Elasticsearch through REST APIs.
105-
You can interact with Elasticsearch using any client that sends HTTP requests,
104+
You send data and other requests to Elasticsearch through REST APIs.
105+
You can interact with Elasticsearch using any client that sends HTTP requests,
106106
such as the https://www.elastic.co/guide/en/elasticsearch/client/index.html[Elasticsearch
107-
language clients] and https://curl.se[curl].
107+
language clients] and https://curl.se[curl].
108108

109-
==== Using curl
109+
==== Using curl
110110

111111
Here's an example curl command to create a new Elasticsearch index, using basic auth:
112112

@@ -149,19 +149,19 @@ print(client.info())
149149

150150
==== Using the Dev Tools Console
151151

152-
Kibana's developer console provides an easy way to experiment and test requests.
152+
Kibana's developer console provides an easy way to experiment and test requests.
153153
To access the console, open Kibana, then go to **Management** > **Dev Tools**.
154154

155155
**Add data**
156156

157-
You index data into Elasticsearch by sending JSON objects (documents) through the REST APIs.
158-
Whether you have structured or unstructured text, numerical data, or geospatial data,
159-
Elasticsearch efficiently stores and indexes it in a way that supports fast searches.
157+
You index data into Elasticsearch by sending JSON objects (documents) through the REST APIs.
158+
Whether you have structured or unstructured text, numerical data, or geospatial data,
159+
Elasticsearch efficiently stores and indexes it in a way that supports fast searches.
160160

161161
For timestamped data such as logs and metrics, you typically add documents to a
162162
data stream made up of multiple auto-generated backing indices.
163163

164-
To add a single document to an index, submit an HTTP post request that targets the index.
164+
To add a single document to an index, submit an HTTP post request that targets the index.
165165

166166
----
167167
POST /customer/_doc/1
@@ -171,19 +171,19 @@ POST /customer/_doc/1
171171
}
172172
----
173173

174-
This request automatically creates the `customer` index if it doesn't exist,
175-
adds a new document that has an ID of 1, and
174+
This request automatically creates the `customer` index if it doesn't exist,
175+
adds a new document that has an ID of 1, and
176176
stores and indexes the `firstname` and `lastname` fields.
177177

178-
The new document is available immediately from any node in the cluster.
178+
The new document is available immediately from any node in the cluster.
179179
You can retrieve it with a GET request that specifies its document ID:
180180

181181
----
182182
GET /customer/_doc/1
183183
----
184184

185185
To add multiple documents in one request, use the `_bulk` API.
186-
Bulk data must be newline-delimited JSON (NDJSON).
186+
Bulk data must be newline-delimited JSON (NDJSON).
187187
Each line must end in a newline character (`\n`), including the last line.
188188

189189
----
@@ -200,15 +200,15 @@ PUT customer/_bulk
200200

201201
**Search**
202202

203-
Indexed documents are available for search in near real-time.
204-
The following search matches all customers with a first name of _Jennifer_
203+
Indexed documents are available for search in near real-time.
204+
The following search matches all customers with a first name of _Jennifer_
205205
in the `customer` index.
206206

207207
----
208208
GET customer/_search
209209
{
210210
"query" : {
211-
"match" : { "firstname": "Jennifer" }
211+
"match" : { "firstname": "Jennifer" }
212212
}
213213
}
214214
----
@@ -223,9 +223,9 @@ data streams, or index aliases.
223223

224224
. Go to **Management > Stack Management > Kibana > Data Views**.
225225
. Select **Create data view**.
226-
. Enter a name for the data view and a pattern that matches one or more indices,
227-
such as _customer_.
228-
. Select **Save data view to Kibana**.
226+
. Enter a name for the data view and a pattern that matches one or more indices,
227+
such as _customer_.
228+
. Select **Save data view to Kibana**.
229229

230230
To start exploring, go to **Analytics > Discover**.
231231

@@ -254,11 +254,6 @@ To build a distribution for another platform, run the related command:
254254
./gradlew :distribution:archives:windows-zip:assemble
255255
----
256256

257-
To build distributions for all supported platforms, run:
258-
----
259-
./gradlew assemble
260-
----
261-
262257
Distributions are output to `distribution/archives`.
263258

264259
To run the test suite, see xref:TESTING.asciidoc[TESTING].
@@ -281,7 +276,7 @@ The https://github.com/elastic/elasticsearch-labs[`elasticsearch-labs`] repo con
281276
[[contribute]]
282277
== Contribute
283278

284-
For contribution guidelines, see xref:CONTRIBUTING.md[CONTRIBUTING].
279+
For contribution guidelines, see xref:CONTRIBUTING.md[CONTRIBUTING].
285280

286281
[[questions]]
287282
== Questions? Problems? Suggestions?

TESTING.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ You can run a group of YAML test by using wildcards:
472472
--tests "org.elasticsearch.test.rest.ClientYamlTestSuiteIT.test {yaml=index/*/*}"
473473
---------------------------------------------------------------------------
474474

475-
or
475+
or
476476

477477
---------------------------------------------------------------------------
478478
./gradlew :rest-api-spec:yamlRestTest \
@@ -564,8 +564,8 @@ Sometimes a backward compatibility change spans two versions.
564564
A common case is a new functionality that needs a BWC bridge in an unreleased versioned of a release branch (for example, 5.x).
565565
Another use case, since the introduction of serverless, is to test BWC against main in addition to the other released branches.
566566
To do so, specify the `bwc.refspec` remote and branch to use for the BWC build as `origin/main`.
567-
To test against main, you will also need to create a new version in link:./server/src/main/java/org/elasticsearch/Version.java[Version.java],
568-
increment `elasticsearch` in link:./build-tools-internal/version.properties[version.properties], and hard-code the `project.version` for ml-cpp
567+
To test against main, you will also need to create a new version in link:./server/src/main/java/org/elasticsearch/Version.java[Version.java],
568+
increment `elasticsearch` in link:./build-tools-internal/version.properties[version.properties], and hard-code the `project.version` for ml-cpp
569569
in link:./x-pack/plugin/ml/build.gradle[ml/build.gradle].
570570

571571
In general, to test the changes, you can instruct Gradle to build the BWC version from another remote/branch combination instead of pulling the release branch from GitHub.
@@ -625,7 +625,7 @@ For specific YAML rest tests one can use
625625
For disabling entire types of tests for subprojects, one can use for example:
626626

627627
------------------------------------------------
628-
if (BuildParams.inFipsJvm){
628+
if (buildParams.inFipsJvm) {
629629
// This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC
630630
tasks.named("javaRestTest").configure{enabled = false }
631631
}

benchmarks/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.elasticsearch.gradle.internal.info.BuildParams
21
import org.elasticsearch.gradle.internal.test.TestUtil
32

43
/*
@@ -78,7 +77,7 @@ tasks.register("copyPainless", Copy) {
7877
}
7978

8079
tasks.named("run").configure {
81-
executable = "${BuildParams.runtimeJavaHome}/bin/java"
80+
executable = "${buildParams.runtimeJavaHome.get()}/bin/java"
8281
args << "-Dplugins.dir=${buildDir}/plugins" << "-Dtests.index=${buildDir}/index"
8382
dependsOn "copyExpression", "copyPainless", configurations.nativeLib
8483
systemProperty 'es.nativelibs.path', TestUtil.getTestLibraryPath(file("../libs/native/libraries/build/platform/").toString())

0 commit comments

Comments
 (0)