Skip to content

Commit 817336d

Browse files
julian-elasticjulian-elastic
committed
Merge branch 'main' into indexLike_v3
2 parents fed0223 + 8acf94b commit 817336d

File tree

481 files changed

+13603
-3907
lines changed

Some content is hidden

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

481 files changed

+13603
-3907
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
3+
"targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.1.0$" : "main",
6+
"^v9.2.0$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/pipelines/intake.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,15 @@ steps:
5757
image: family/elasticsearch-ubuntu-2004
5858
machineType: n1-standard-32
5959
buildDirectory: /dev/shm/bk
60+
6061
- group: bwc-snapshots
6162
steps:
6263
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
6364
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
6465
timeout_in_minutes: 300
6566
matrix:
6667
setup:
67-
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
68+
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
6869
agents:
6970
provider: gcp
7071
image: family/elasticsearch-ubuntu-2404
@@ -74,9 +75,6 @@ steps:
7475
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7576
- label: bc-upgrade
7677
command: ".buildkite/scripts/run-bc-upgrade-tests.sh"
77-
agents:
78-
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.5"
79-
memory: "4G"
8078
- group: lucene-compat
8179
steps:
8280
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ steps:
302302
env:
303303
BWC_VERSION: 8.16.6
304304

305-
- label: "{{matrix.image}} / 8.17.8 / packaging-tests-upgrade"
306-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.8
305+
- label: "{{matrix.image}} / 8.17.9 / packaging-tests-upgrade"
306+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.9
307307
timeout_in_minutes: 300
308308
matrix:
309309
setup:
@@ -316,10 +316,10 @@ steps:
316316
machineType: custom-16-32768
317317
buildDirectory: /dev/shm/bk
318318
env:
319-
BWC_VERSION: 8.17.8
319+
BWC_VERSION: 8.17.9
320320

321-
- label: "{{matrix.image}} / 8.18.3 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.3
321+
- label: "{{matrix.image}} / 8.18.4 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.4
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,7 +332,7 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.3
335+
BWC_VERSION: 8.18.4
336336

337337
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
@@ -350,8 +350,8 @@ steps:
350350
env:
351351
BWC_VERSION: 8.19.0
352352

353-
- label: "{{matrix.image}} / 9.0.3 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.3
353+
- label: "{{matrix.image}} / 9.0.4 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.4
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,7 +364,7 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.3
367+
BWC_VERSION: 9.0.4
368368

369369
- label: "{{matrix.image}} / 9.1.0 / packaging-tests-upgrade"
370370
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.0
@@ -382,6 +382,22 @@ steps:
382382
env:
383383
BWC_VERSION: 9.1.0
384384

385+
- label: "{{matrix.image}} / 9.2.0 / packaging-tests-upgrade"
386+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.0
387+
timeout_in_minutes: 300
388+
matrix:
389+
setup:
390+
image:
391+
- rocky-8
392+
- ubuntu-2404
393+
agents:
394+
provider: gcp
395+
image: family/elasticsearch-{{matrix.image}}
396+
machineType: custom-16-32768
397+
buildDirectory: /dev/shm/bk
398+
env:
399+
BWC_VERSION: 9.2.0
400+
385401
- group: packaging-tests-windows
386402
steps:
387403
- label: "{{matrix.image}} / packaging-tests-windows"

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 8.17.8 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.8#bwcTest
328+
- label: 8.17.9 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.9#bwcTest
330330
timeout_in_minutes: 300
331331
agents:
332332
provider: gcp
@@ -335,7 +335,7 @@ steps:
335335
buildDirectory: /dev/shm/bk
336336
preemptible: true
337337
env:
338-
BWC_VERSION: 8.17.8
338+
BWC_VERSION: 8.17.9
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.3 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.3#bwcTest
347+
- label: 8.18.4 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.4#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.3
357+
BWC_VERSION: 8.18.4
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.3 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.3#bwcTest
385+
- label: 9.0.4 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.4#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.3
395+
BWC_VERSION: 9.0.4
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -420,6 +420,25 @@ steps:
420420
- signal_reason: agent_stop
421421
limit: 3
422422

423+
- label: 9.2.0 / bwc
424+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.2.0#bwcTest
425+
timeout_in_minutes: 300
426+
agents:
427+
provider: gcp
428+
image: family/elasticsearch-ubuntu-2404
429+
machineType: n1-standard-32
430+
buildDirectory: /dev/shm/bk
431+
preemptible: true
432+
env:
433+
BWC_VERSION: 9.2.0
434+
retry:
435+
automatic:
436+
- exit_status: "-1"
437+
limit: 3
438+
signal_reason: none
439+
- signal_reason: agent_stop
440+
limit: 3
441+
423442
- label: concurrent-search-tests
424443
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
425444
timeout_in_minutes: 420
@@ -487,7 +506,7 @@ steps:
487506
setup:
488507
ES_RUNTIME_JAVA:
489508
- openjdk21
490-
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
509+
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
491510
agents:
492511
provider: gcp
493512
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +550,7 @@ steps:
531550
ES_RUNTIME_JAVA:
532551
- openjdk21
533552
- openjdk23
534-
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
553+
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
535554
agents:
536555
provider: gcp
537556
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ BWC_VERSION:
1616
- "8.14.3"
1717
- "8.15.5"
1818
- "8.16.6"
19-
- "8.17.8"
20-
- "8.18.3"
19+
- "8.17.9"
20+
- "8.18.4"
2121
- "8.19.0"
22-
- "9.0.3"
22+
- "9.0.4"
2323
- "9.1.0"
24+
- "9.2.0"

‎.ci/scripts/resolve-dra-manifest.sh‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ strip_version() {
66
}
77

88
fetch_build() {
9-
curl -sS https://artifacts-$1.elastic.co/$2/latest/$3.json \
9+
>&2 echo "Checking for build id: https://artifacts-$1.elastic.co/$2/latest/$3.json"
10+
curl -sSf https://artifacts-$1.elastic.co/$2/latest/$3.json \
1011
| jq -r '.build_id'
1112
}
1213

@@ -15,7 +16,15 @@ BRANCH="${BRANCH:-$2}"
1516
ES_VERSION="${ES_VERSION:-$3}"
1617
WORKFLOW=${WORKFLOW:-$4}
1718

18-
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $BRANCH)
19+
if [[ "$WORKFLOW" == "staging" ]]; then
20+
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $ES_VERSION)
21+
elif [[ "$WORKFLOW" == "snapshot" ]]; then
22+
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $BRANCH)
23+
else
24+
echo "Unknown workflow: $WORKFLOW"
25+
exit 1
26+
fi
27+
1928
LATEST_VERSION=$(strip_version $LATEST_BUILD)
2029

2130
# If the latest artifact version doesn't match what we expect, try the corresponding version branch.

‎.ci/snapshotBwcVersions‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
BWC_VERSION:
2-
- "8.17.8"
3-
- "8.18.3"
2+
- "8.17.9"
3+
- "8.18.4"
44
- "8.19.0"
5-
- "9.0.3"
5+
- "9.0.4"
66
- "9.1.0"
7+
- "9.2.0"

‎benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/ValuesSourceReaderBenchmark.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.elasticsearch.compute.data.LongVector;
4141
import org.elasticsearch.compute.data.Page;
4242
import org.elasticsearch.compute.lucene.LuceneSourceOperator;
43+
import org.elasticsearch.compute.lucene.ShardRefCounted;
4344
import org.elasticsearch.compute.lucene.ValuesSourceReaderOperator;
4445
import org.elasticsearch.compute.operator.topn.TopNOperator;
4546
import org.elasticsearch.core.IOUtils;
@@ -477,6 +478,7 @@ private void setupPages() {
477478
pages.add(
478479
new Page(
479480
new DocVector(
481+
ShardRefCounted.ALWAYS_REFERENCED,
480482
blockFactory.newConstantIntBlockWith(0, end - begin).asVector(),
481483
blockFactory.newConstantIntBlockWith(ctx.ord, end - begin).asVector(),
482484
docs.build(),
@@ -512,7 +514,14 @@ record ItrAndOrd(PrimitiveIterator.OfInt itr, int ord) {}
512514
if (size >= BLOCK_LENGTH) {
513515
pages.add(
514516
new Page(
515-
new DocVector(blockFactory.newConstantIntVector(0, size), leafs.build(), docs.build(), null).asBlock()
517+
new DocVector(
518+
519+
ShardRefCounted.ALWAYS_REFERENCED,
520+
blockFactory.newConstantIntVector(0, size),
521+
leafs.build(),
522+
docs.build(),
523+
null
524+
).asBlock()
516525
)
517526
);
518527
docs = blockFactory.newIntVectorBuilder(BLOCK_LENGTH);
@@ -525,6 +534,8 @@ record ItrAndOrd(PrimitiveIterator.OfInt itr, int ord) {}
525534
pages.add(
526535
new Page(
527536
new DocVector(
537+
538+
ShardRefCounted.ALWAYS_REFERENCED,
528539
blockFactory.newConstantIntBlockWith(0, size).asVector(),
529540
leafs.build().asBlock().asVector(),
530541
docs.build(),
@@ -551,6 +562,8 @@ record ItrAndOrd(PrimitiveIterator.OfInt itr, int ord) {}
551562
pages.add(
552563
new Page(
553564
new DocVector(
565+
566+
ShardRefCounted.ALWAYS_REFERENCED,
554567
blockFactory.newConstantIntVector(0, 1),
555568
blockFactory.newConstantIntVector(next.ord, 1),
556569
blockFactory.newConstantIntVector(next.itr.nextInt(), 1),

‎branches.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
{
55
"branch": "main"
66
},
7+
{
8+
"branch": "9.1"
9+
},
710
{
811
"branch": "9.0"
912
},

‎build-tools-internal/src/main/resources/checkstyle_suppressions.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<suppress files="qa[/\\]rolling-upgrade[/\\]src[/\\]javaRestTest[/\\]java[/\\]org[/\\]elasticsearch[/\\]upgrades[/\\]TsdbIT.java" checks="LineLength" />
3838
<suppress files="qa[/\\]rolling-upgrade[/\\]src[/\\]javaRestTest[/\\]java[/\\]org[/\\]elasticsearch[/\\]upgrades[/\\]TsdbIndexingRollingUpgradeIT.java" checks="LineLength" />
3939
<suppress files="qa[/\\]rolling-upgrade[/\\]src[/\\]javaRestTest[/\\]java[/\\]org[/\\]elasticsearch[/\\]upgrades[/\\]LogsdbIndexingRollingUpgradeIT.java" checks="LineLength" />
40+
<suppress files="plugin[/\\]logsdb[/\\]qa[/\\]rolling-upgrade[/\\]src[/\\]javaRestTest[/\\]java[/\\]org[/\\]elasticsearch[/\\]upgrades[/\\]MatchOnlyTextRollingUpgradeIT.java" checks="LineLength" />
4041

4142
<!-- Gradle requires inputs to be seriablizable -->
4243
<suppress files="build-tools-internal[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]gradle[/\\]internal[/\\]precommit[/\\]TestingConventionRule.java" checks="RegexpSinglelineJava" />

0 commit comments

Comments
 (0)