Skip to content

Commit 3578c16

Browse files
jan-elasticjan-elastic
authored
Merge branch '8.x' into backport-118319-8.x
2 parents 0519800 + 159ecaf commit 3578c16

File tree

542 files changed

+23617
-8572
lines changed

Some content is hidden

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

542 files changed

+23617
-8572
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
- rhel-8
2424
- rhel-9
2525
- almalinux-8
26+
- almalinux-9
2627
agents:
2728
provider: gcp
2829
image: family/elasticsearch-{{matrix.image}}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ steps:
2424
- rhel-8
2525
- rhel-9
2626
- almalinux-8
27+
- almalinux-9
2728
agents:
2829
provider: gcp
2930
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
- rhel-8
2424
- rhel-9
2525
- almalinux-8
26+
- almalinux-9
2627
agents:
2728
provider: gcp
2829
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/pull-request/packaging-tests-unix.yml‎

Lines changed: 8 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,9 @@ config:
33
steps:
44
- group: packaging-tests-unix
55
steps:
6-
- label: "{{matrix.image}} / docker / packaging-tests-unix"
7-
key: "packaging-tests-unix-docker"
8-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker-cloud-ess
9-
timeout_in_minutes: 300
10-
matrix:
11-
setup:
12-
image:
13-
- debian-11
14-
- debian-12
15-
- opensuse-leap-15
16-
- oraclelinux-7
17-
- oraclelinux-8
18-
- sles-12
19-
- sles-15
20-
- ubuntu-1804
21-
- ubuntu-2004
22-
- ubuntu-2204
23-
- rocky-8
24-
- rocky-9
25-
- rhel-7
26-
- rhel-8
27-
- rhel-9
28-
- almalinux-8
29-
agents:
30-
provider: gcp
31-
image: family/elasticsearch-{{matrix.image}}
32-
diskSizeGb: 350
33-
machineType: custom-16-32768
34-
- label: "{{matrix.image}} / packages / packaging-tests-unix"
35-
key: "packaging-tests-unix-packages"
36-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.packages
37-
timeout_in_minutes: 300
38-
matrix:
39-
setup:
40-
image:
41-
- debian-11
42-
- debian-12
43-
- opensuse-leap-15
44-
- oraclelinux-7
45-
- oraclelinux-8
46-
- sles-12
47-
- sles-15
48-
- ubuntu-1804
49-
- ubuntu-2004
50-
- ubuntu-2204
51-
- rocky-8
52-
- rocky-9
53-
- rhel-7
54-
- rhel-8
55-
- rhel-9
56-
- almalinux-8
57-
agents:
58-
provider: gcp
59-
image: family/elasticsearch-{{matrix.image}}
60-
diskSizeGb: 350
61-
machineType: custom-16-32768
62-
- label: "{{matrix.image}} / archives / packaging-tests-unix"
63-
key: "packaging-tests-unix-archives"
64-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.archives
6+
- label: "{{matrix.image}} / {{matrix.PACKAGING_TASK}} / packaging-tests-unix"
7+
key: "packaging-tests-unix"
8+
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.{{matrix.PACKAGING_TASK}}
659
timeout_in_minutes: 300
6610
matrix:
6711
setup:
@@ -82,6 +26,11 @@ steps:
8226
- rhel-8
8327
- rhel-9
8428
- almalinux-8
29+
- almalinux-9
30+
PACKAGING_TASK:
31+
- docker-cloud-ess
32+
- packages
33+
- archives
8534
agents:
8635
provider: gcp
8736
image: family/elasticsearch-{{matrix.image}}

‎benchmarks/src/main/java/org/elasticsearch/benchmark/search/fetch/subphase/FetchSourcePhaseBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void setup() throws IOException {
6363
);
6464
includesSet = Set.of(fetchContext.includes());
6565
excludesSet = Set.of(fetchContext.excludes());
66-
parserConfig = XContentParserConfiguration.EMPTY.withFiltering(includesSet, excludesSet, false);
66+
parserConfig = XContentParserConfiguration.EMPTY.withFiltering(null, includesSet, excludesSet, false);
6767
}
6868

6969
private BytesReference read300BytesExample() throws IOException {

‎benchmarks/src/main/java/org/elasticsearch/benchmark/xcontent/FilterContentBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private XContentParserConfiguration buildParseConfig(boolean matchDotsInFieldNam
170170
includes = null;
171171
excludes = filters;
172172
}
173-
return XContentParserConfiguration.EMPTY.withFiltering(includes, excludes, matchDotsInFieldNames);
173+
return XContentParserConfiguration.EMPTY.withFiltering(null, includes, excludes, matchDotsInFieldNames);
174174
}
175175

176176
private BytesReference filter(XContentParserConfiguration contentParserConfiguration) throws IOException {

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ commonscodec = 1.15
3535
protobuf = 3.25.5
3636

3737
# test dependencies
38-
randomizedrunner = 2.8.0
38+
randomizedrunner = 2.8.2
3939
junit = 4.13.2
4040
junit5 = 5.7.1
4141
hamcrest = 2.1

‎docs/changelog/113827.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 113827
2+
summary: Add Optional Source Filtering to Source Loaders
3+
area: Mapping
4+
type: enhancement
5+
issues: []

‎docs/changelog/114618.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114618
2+
summary: Add a new index setting to skip recovery source when synthetic source is enabled
3+
area: Logs
4+
type: enhancement
5+
issues: []

‎docs/changelog/116663.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116663
2+
summary: KNN vector rescoring for quantized vectors
3+
area: Vector Search
4+
type: feature
5+
issues: []

0 commit comments

Comments
 (0)