Skip to content

Commit 1d0c731

Browse files
committed
Merge branch 'lucene_snapshot' into bfloat16-vector-format
2 parents 6a8ccff + 095c235 commit 1d0c731

File tree

664 files changed

+10066
-2687
lines changed

Some content is hidden

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

664 files changed

+10066
-2687
lines changed

.github/workflows/docs-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
with:
1414
path-pattern: docs/**
1515
path-pattern-ignore: docs/changelog/**/*.yaml
16+
enable-cumulative-comment: true
1617
permissions:
1718
deployments: write
1819
id-token: write

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/AggregatorBenchmark.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,11 @@ public Block eval(Page page) {
666666
return mask;
667667
}
668668

669+
@Override
670+
public long baseRamBytesUsed() {
671+
return 0;
672+
}
673+
669674
@Override
670675
public void close() {
671676
mask.close();

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void selfTest() {
144144
public String operation;
145145

146146
private static Operator operator(String operation) {
147-
return new EvalOperator(driverContext.blockFactory(), evaluator(operation));
147+
return new EvalOperator(driverContext, evaluator(operation));
148148
}
149149

150150
private static EvalOperator.ExpressionEvaluator evaluator(String operation) {

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private ExponentialHistogram asCompressedHistogram(ExponentialHistogram histogra
130130
CompressedExponentialHistogram.writeHistogramBytes(histoBytes, histogram.scale(), negativeBuckets, positiveBuckets);
131131
CompressedExponentialHistogram result = new CompressedExponentialHistogram();
132132
BytesRef data = histoBytes.bytes().toBytesRef();
133-
result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, data);
133+
result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, histogram.sum(), data);
134134
return result;
135135
} catch (IOException e) {
136136
throw new RuntimeException(e);

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 9.2.0
2-
lucene = 10.3.0-snapshot-586dc103361
2+
lucene = 10.3.0-snapshot-fa706145062
33

44
bundled_jdk_vendor = openjdk
55
bundled_jdk = 24.0.2+12@fdc5d0102fe0414db21410ad5834341f

distribution/build.gradle

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -629,22 +629,6 @@ subprojects {
629629
}
630630
}
631631

632-
['archives:windows-zip',
633-
'archives:darwin-tar',
634-
'archives:darwin-aarch64-tar',
635-
'archives:linux-aarch64-tar',
636-
'archives:linux-tar',
637-
'archives:integ-test-zip',
638-
'packages:rpm', 'packages:deb',
639-
'packages:aarch64-rpm', 'packages:aarch64-deb',
640-
].forEach { subName ->
641-
Project subproject = project("${project.path}:${subName}")
642-
Configuration configuration = configurations.create(subproject.name)
643-
dependencies {
644-
"${configuration.name}" project(path: subproject.path, configuration:'default')
645-
}
646-
}
647-
648632
// This artifact makes it possible for other projects to pull
649633
// in the final log4j2.properties configuration, as it appears in the
650634
// archive distribution.

distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:173cd032e2a8b194c04e08f605b40c743cc52f8eb4ecfc9c5e3280ae97c119b4 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:d9382de1615bfd6fe66348a9c80258c63fa311b1f583a607addde8ec5bf0f343 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:173cd032e2a8b194c04e08f605b40c743cc52f8eb4ecfc9c5e3280ae97c119b4
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:d9382de1615bfd6fe66348a9c80258c63fa311b1f583a607addde8ec5bf0f343
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:45d6016686787642209440ee29f410a125d2392e6752701cb9960f0ac0c80c1d AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4dbe94045c967ec89afcee3727cfb746820bd3f699bbbb621e529bde1ce122b1 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:45d6016686787642209440ee29f410a125d2392e6752701cb9960f0ac0c80c1d
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4dbe94045c967ec89afcee3727cfb746820bd3f699bbbb621e529bde1ce122b1
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

docs/changelog/130824.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130824
2+
summary: Add read permissions for osquery manager result indices
3+
area: Security
4+
type: enhancement
5+
issues: []

docs/changelog/132536.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 132536
2+
summary: Avoid stack overflow in `IndicesClusterStateService` `applyClusterState`
3+
area: Cluster Coordination
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)