Skip to content

Commit 1a18881

Browse files
authored
Merge branch 'main' into refactoring/remove_completion_extension
2 parents b558a66 + fc7fbdf commit 1a18881

File tree

91 files changed

+4074
-3004
lines changed

Some content is hidden

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

91 files changed

+4074
-3004
lines changed

docs/changelog/124574.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124574
2+
summary: Allow passing several reserved state chunks in single process call
3+
area: Infra/Settings
4+
type: enhancement
5+
issues: []

docs/changelog/124594.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124594
2+
summary: Store arrays offsets for numeric fields natively with synthetic source
3+
area: Mapping
4+
type: enhancement
5+
issues: []

docs/changelog/124611.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124611
2+
summary: Reuse child `outputSet` inside the plan where possible
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,6 @@ tests:
390390
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
391391
method: test {p0=search/610_function_score/Random}
392392
issue: https://github.com/elastic/elasticsearch/issues/125010
393-
- class: org.elasticsearch.packaging.test.DockerTests
394-
method: test010Install
395-
issue: https://github.com/elastic/elasticsearch/issues/119441
396393
- class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests
397394
method: testGetDataStreamResponse
398395
issue: https://github.com/elastic/elasticsearch/issues/125083

qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public static void waitForElasticsearchToStart() {
187187
Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS);
188188

189189
// Set COLUMNS so that `ps` doesn't truncate its output
190-
psOutput = dockerShell.run("bash -c 'COLUMNS=3000 ps ax'").stdout();
190+
psOutput = dockerShell.run("bash -c 'COLUMNS=4000 ps ax'").stdout();
191191

192192
if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) {
193193
isElasticsearchRunning = true;

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ static TransportVersion def(int id) {
148148
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_19 = def(8_841_0_07);
149149
public static final TransportVersion INFERENCE_CONTEXT_8_X = def(8_841_0_08);
150150
public static final TransportVersion ML_INFERENCE_DEEPSEEK_8_19 = def(8_841_0_09);
151+
public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE_8_19 = def(8_841_0_10);
152+
public static final TransportVersion ESQL_FAILURE_FROM_REMOTE_8_19 = def(8_841_0_11);
151153
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
152154
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
153155
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);

server/src/main/java/org/elasticsearch/index/IndexVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ private static Version parseUnchecked(String version) {
152152
public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD = def(9_013_0_00, Version.LUCENE_10_1_0);
153153
public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_IP = def(9_014_0_00, Version.LUCENE_10_1_0);
154154
public static final IndexVersion ADD_RESCORE_PARAMS_TO_QUANTIZED_VECTORS = def(9_015_0_00, Version.LUCENE_10_1_0);
155+
public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER = def(9_016_0_00, Version.LUCENE_10_1_0);
155156
/*
156157
* STOP! READ THIS FIRST! No, really,
157158
* ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _

server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,8 @@ public boolean newDynamicLongField(DocumentParserContext context, String name) t
353353
ScriptCompiler.NONE,
354354
context.indexSettings().getSettings(),
355355
context.indexSettings().getIndexVersionCreated(),
356-
context.indexSettings().getMode()
356+
context.indexSettings().getMode(),
357+
context.indexSettings().sourceKeepMode()
357358
),
358359
context
359360
);
@@ -371,7 +372,8 @@ public boolean newDynamicDoubleField(DocumentParserContext context, String name)
371372
ScriptCompiler.NONE,
372373
context.indexSettings().getSettings(),
373374
context.indexSettings().getIndexVersionCreated(),
374-
context.indexSettings().getMode()
375+
context.indexSettings().getMode(),
376+
context.indexSettings().sourceKeepMode()
375377
),
376378
context
377379
);

server/src/main/java/org/elasticsearch/index/mapper/FieldArrayContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ static String getOffsetsFieldName(
9797
&& sourceKeepMode == Mapper.SourceKeepMode.ARRAYS
9898
&& hasDocValues
9999
&& isStored == false
100+
&& context.isInNestedContext() == false
100101
&& fieldMapperBuilder.copyTo.copyToFields().isEmpty()
101102
&& fieldMapperBuilder.multiFieldsBuilder.hasMultiFields() == false
102103
&& indexVersionSupportStoringArraysNatively(indexCreatedVersion, minSupportedVersionMain)) {

0 commit comments

Comments
 (0)