Skip to content

Commit 0ab66d2

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents a4237d9 + 9946cea commit 0ab66d2

File tree

160 files changed

+1380
-803
lines changed

Some content is hidden

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

160 files changed

+1380
-803
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ indent_size = 4
209209
max_line_length = 140
210210
ij_java_class_count_to_use_import_on_demand = 999
211211
ij_java_names_count_to_use_import_on_demand = 999
212-
ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,javax.**,|,$*
212+
ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
213213

214214
[*.json]
215215
indent_size = 2

build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,18 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
142142
description = 'Enables preview features on native library module'
143143
dependsOn tasks.named("enableExternalConfiguration")
144144

145-
doLast {
146-
['main', 'test'].each { sourceSet ->
147-
modifyXml(".idea/modules/libs/native/elasticsearch.libs.native.${sourceSet}.iml") { xml ->
148-
xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = 'JDK_21_PREVIEW'
145+
ext {
146+
enablePreview = { moduleFile, languageLevel ->
147+
modifyXml(moduleFile) { xml ->
148+
xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = languageLevel
149149
}
150150
}
151151
}
152+
153+
doLast {
154+
enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.main.iml', 'JDK_21_PREVIEW')
155+
enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.test.iml', 'JDK_21_PREVIEW')
156+
}
152157
}
153158

154159
tasks.register('buildDependencyArtifacts') {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum DockerBase {
2222
// Chainguard based wolfi image with latest jdk
2323
// This is usually updated via renovatebot
2424
// spotless:off
25-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:55b297da5151d2a2997e8ab9729fe1304e4869389d7090ab7031cc29530f69f8",
25+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:32f06b169bb4b0f257fbb10e8c8379f06d3ee1355c89b3327cb623781a29590e",
2626
"-wolfi",
2727
"apk"
2828
),

build-tools-internal/src/main/resources/forbidden/es-server-signatures.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,3 @@ org.elasticsearch.cluster.SnapshotDeletionsInProgress$Entry#<init>(java.lang.Str
167167
@defaultMessage Use a Thread constructor with a name, anonymous threads are more difficult to debug
168168
java.lang.Thread#<init>(java.lang.Runnable)
169169
java.lang.Thread#<init>(java.lang.ThreadGroup, java.lang.Runnable)
170-
171-
org.elasticsearch.common.bytes.BytesReference#copyBytes(org.elasticsearch.common.bytes.BytesReference) @ This method is a subject for removal. Copying bytes is prone to performance regressions and unnecessary allocations.

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
9898
private static final int ES_DESTROY_TIMEOUT = 20;
9999
private static final TimeUnit ES_DESTROY_TIMEOUT_UNIT = TimeUnit.SECONDS;
100100

101-
private static final int NODE_UP_TIMEOUT = 2;
101+
private static final int NODE_UP_TIMEOUT = 3;
102102
private static final TimeUnit NODE_UP_TIMEOUT_UNIT = TimeUnit.MINUTES;
103103
private static final int ADDITIONAL_CONFIG_TIMEOUT = 15;
104104
private static final TimeUnit ADDITIONAL_CONFIG_TIMEOUT_UNIT = TimeUnit.SECONDS;

docs/changelog/116739.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116739
2+
summary: Change default Docker image to be based on UBI minimal instead of Ubuntu
3+
area: Infra/Core
4+
type: enhancement
5+
issues: []

docs/changelog/117235.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117235
2+
summary: "Deprecate `ChunkingOptions` parameter"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/117303.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117303
2+
summary: Remove HTTP content copies
3+
area: Network
4+
type: enhancement
5+
issues: []

docs/changelog/117551.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117551
2+
summary: Fix stats by constant expresson with alias
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/117595.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117595
2+
summary: Fix for Deberta tokenizer when input sequence exceeds 512 tokens
3+
area: Machine Learning
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)