Skip to content

Commit 2a968f6

Browse files
szabosteveszabosteve
authored
Merge branch 'main' into elser-on-eis
2 parents bdc3db8 + 1f174d1 commit 2a968f6

File tree

446 files changed

+16426
-4159
lines changed

Some content is hidden

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

446 files changed

+16426
-4159
lines changed

‎.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(),

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
5959
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:early-deprecation-rest");
6060
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:rest");
6161
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:downsample:qa:with-security");
62-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest");
63-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest-with-advanced-security");
64-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest-with-security");
6562
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search:qa:rest");
6663
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:ccs-rolling-upgrade");
6764
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");

‎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
}

‎docs/changelog/128627.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128627
2+
summary: Fail `profile` on text response formats
3+
area: ES|QL
4+
type: feature
5+
issues: []

‎docs/changelog/129369.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 129369
2+
summary: Support semantic reranking using contextual snippets instead of entire field
3+
text
4+
area: Relevance
5+
type: enhancement
6+
issues: []

‎docs/changelog/130140.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130140
2+
summary: Correct slow log user for RCS 2.0
3+
area: Authentication
4+
type: enhancement
5+
issues: []

‎docs/changelog/130279.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130279
2+
summary: Fix missing removal of query cancellation callback in QueryPhase
3+
area: Search
4+
type: bug
5+
issues: [130071]

‎docs/changelog/130510.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130510
2+
summary: Add fast path for single value in VALUES aggregator
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)