Skip to content

Commit d058e6e

Browse files
ywangdywangd
committed
Merge remote-tracking branch 'origin/main' into ES-12375-basic-project-deletion
2 parents 56e1152 + 8ff02e2 commit d058e6e

File tree

281 files changed

+5601
-2078
lines changed

Some content is hidden

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

281 files changed

+5601
-2078
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
68+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.0", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 9 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.9 / packaging-tests-upgrade"
306-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.9
305+
- label: "{{matrix.image}} / 8.17.10 / packaging-tests-upgrade"
306+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.10
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.9
319+
BWC_VERSION: 8.17.10
320320

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
321+
- label: "{{matrix.image}} / 8.18.5 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.5
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.4
335+
BWC_VERSION: 8.18.5
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.4 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.4
353+
- label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5
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.4
367+
BWC_VERSION: 9.0.5
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

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 11 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.9 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.9#bwcTest
328+
- label: 8.17.10 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.10#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.9
338+
BWC_VERSION: 8.17.10
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.4 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.4#bwcTest
347+
- label: 8.18.5 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.5#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.4
357+
BWC_VERSION: 8.18.5
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.4 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.4#bwcTest
385+
- label: 9.0.5 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.5#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.4
395+
BWC_VERSION: 9.0.5
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
506506
setup:
507507
ES_RUNTIME_JAVA:
508508
- openjdk21
509-
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
509+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.0", "9.2.0"]
510510
agents:
511511
provider: gcp
512512
image: family/elasticsearch-ubuntu-2404
@@ -550,7 +550,7 @@ steps:
550550
ES_RUNTIME_JAVA:
551551
- openjdk21
552552
- openjdk23
553-
BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"]
553+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.0", "9.2.0"]
554554
agents:
555555
provider: gcp
556556
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ BWC_VERSION:
1616
- "8.14.3"
1717
- "8.15.5"
1818
- "8.16.6"
19-
- "8.17.9"
20-
- "8.18.4"
19+
- "8.17.10"
20+
- "8.18.5"
2121
- "8.19.0"
22-
- "9.0.4"
22+
- "9.0.5"
2323
- "9.1.0"
2424
- "9.2.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BWC_VERSION:
2-
- "8.17.9"
3-
- "8.18.4"
2+
- "8.17.10"
3+
- "8.18.5"
44
- "8.19.0"
5-
- "9.0.4"
5+
- "9.0.5"
66
- "9.1.0"
77
- "9.2.0"

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ jobs:
1010
if: github.repository == 'elastic/elasticsearch'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # Release v2.1.1
13+
- uses: actions/checkout@v4
14+
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # Release v4.4.1

‎benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/ValuesSourceReaderBenchmark.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ record ItrAndOrd(PrimitiveIterator.OfInt itr, int ord) {}
579579
pages.add(
580580
new Page(
581581
new DocVector(
582-
583582
ShardRefCounted.ALWAYS_REFERENCED,
584583
blockFactory.newConstantIntBlockWith(0, size).asVector(),
585584
leafs.build().asBlock().asVector(),

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/OptimizedScalarQuantizerBenchmark.java‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class OptimizedScalarQuantizerBenchmark {
4343

4444
float[] vector;
4545
float[] centroid;
46-
byte[] legacyDestination;
4746
int[] destination;
4847

4948
@Param({ "1", "4", "7" })
@@ -55,7 +54,6 @@ public class OptimizedScalarQuantizerBenchmark {
5554
public void init() {
5655
ThreadLocalRandom random = ThreadLocalRandom.current();
5756
// random byte arrays for binary methods
58-
legacyDestination = new byte[dims];
5957
destination = new int[dims];
6058
vector = new float[dims];
6159
centroid = new float[dims];
@@ -66,16 +64,9 @@ public void init() {
6664
}
6765

6866
@Benchmark
69-
public byte[] scalar() {
70-
osq.legacyScalarQuantize(vector, legacyDestination, bits, centroid);
71-
return legacyDestination;
72-
}
73-
74-
@Benchmark
75-
@Fork(jvmArgsPrepend = { "--add-modules=jdk.incubator.vector" })
76-
public byte[] legacyVector() {
77-
osq.legacyScalarQuantize(vector, legacyDestination, bits, centroid);
78-
return legacyDestination;
67+
public int[] scalar() {
68+
osq.scalarQuantize(vector, destination, bits, centroid);
69+
return destination;
7970
}
8071

8172
@Benchmark

‎build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111

1212
public enum Architecture {
1313

14-
X64("x86_64", "linux/amd64"),
15-
AARCH64("aarch64", "linux/arm64");
14+
X64("x86_64", "linux/amd64", "amd64"),
15+
AARCH64("aarch64", "linux/arm64", "arm64");
1616

1717
public final String classifier;
1818
public final String dockerPlatform;
19+
public final String dockerClassifier;
1920

20-
Architecture(String classifier, String dockerPlatform) {
21+
Architecture(String classifier, String dockerPlatform, String dockerClassifier) {
2122
this.classifier = classifier;
2223
this.dockerPlatform = dockerPlatform;
24+
this.dockerClassifier = dockerClassifier;
2325
}
2426

2527
public static Architecture current() {

‎distribution/docker/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ subprojects { Project subProject ->
659659
it.setCompression(Compression.GZIP)
660660
it.getArchiveBaseName().set("elasticsearch${base.suffix}-${VersionProperties.elasticsearch}-docker-image")
661661
it.getArchiveVersion().set("")
662-
it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '')
662+
it.getArchiveClassifier().set(architecture.dockerClassifier)
663663
it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions'))
664664
it.dependsOn(exportTask)
665665
}

0 commit comments

Comments
 (0)