Skip to content

Commit 84fb7ee

Browse files
carlosdelestcarlosdelest
committed
Merge branch 'main' into feature/esql-match-operator-non-snapshot
# Conflicts: # x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens # x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java
2 parents cdf896c + b89d578 commit 84fb7ee

File tree

328 files changed

+8834
-5572
lines changed

Some content is hidden

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

328 files changed

+8834
-5572
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
145145

146146
doLast {
147147
['main', 'test'].each { sourceSet ->
148-
modifyXml(".idea/modules/libs/native/elasticsearch.libs.${project.project(':libs:native').name}.${sourceSet}.iml") { xml ->
148+
modifyXml(".idea/modules/libs/native/elasticsearch.libs.native.${sourceSet}.iml") { xml ->
149149
xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = 'JDK_21_PREVIEW'
150150
}
151151
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void skipTest(String fullTestName, String reason) {
137137
// However, the folder can be arbitrarily nest so, a == a1/a2/a3, and the test name can include forward slashes, so c == c1/c2/c3
138138
// So we also need to support a1/a2/a3/b/c1/c2/c3
139139

140-
String[] testParts = fullTestName.split("/");
140+
String[] testParts = fullTestName.split("/", 3);
141141
if (testParts.length < 3) {
142142
throw new IllegalArgumentException(
143143
"To skip tests, all 3 parts [folder/file/test name] must be defined. found [" + fullTestName + "]"

‎docs/changelog/115091.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pr: 115091
2+
summary: Added stricter range type checks and runtime warnings for ENRICH
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 107357
7+
- 116799

‎docs/changelog/116515.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116515
2+
summary: Esql/lookup join grammar
3+
area: ES|QL
4+
type: feature
5+
issues: []

‎docs/changelog/116689.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pr: 116689
2+
summary: Deprecate `_source.mode` in mappings
3+
area: Mapping
4+
type: deprecation
5+
issues: []
6+
deprecation:
7+
title: Deprecate `_source.mode` in mappings
8+
area: Mapping
9+
details: Configuring `_source.mode` in mappings is deprecated and will be removed in future versions. Use `index.mapping.source.mode` index setting instead.
10+
impact: Use `index.mapping.source.mode` index setting instead

‎docs/changelog/116944.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pr: 116944
2+
summary: "Remove support for type, fields, `copy_to` and boost in metadata field definition"
3+
area: Mapping
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: "Remove support for type, fields, copy_to and boost in metadata field definition"
8+
area: Mapping
9+
details: The type, fields, copy_to and boost parameters are no longer supported in metadata field definition
10+
impact: Users providing type, fields, copy_to or boost as part of metadata field definition should remove them from their mappings.
11+
notable: false

‎docs/changelog/116970.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pr: 116970
2+
summary: Remove legacy params from range query
3+
area: Search
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: Remove legacy params from range query
8+
area: REST API
9+
details: The deprecated range query parameters `to`, `from`, `include_lower`, and `include_upper` are no longer supported.
10+
impact: Users should use `lt`, `lte`, `gt`, and `gte` query parameters instead.
11+
notable: false

‎docs/changelog/90529.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
pr: 90529
2+
summary: Output a consistent format when generating error json
3+
area: Infra/REST API
4+
type: "breaking"
5+
issues:
6+
- 89387
7+
breaking:
8+
title: Error JSON structure has changed when detailed errors are disabled
9+
area: REST API
10+
details: |-
11+
This change modifies the JSON format of error messages returned to REST clients
12+
when detailed messages are turned off.
13+
Previously, JSON returned when an exception occurred, and `http.detailed_errors.enabled: false` was set,
14+
just consisted of a single `"error"` text field with some basic information.
15+
Setting `http.detailed_errors.enabled: true` (the default) changed this field
16+
to an object with more detailed information.
17+
With this change, non-detailed errors now have the same structure as detailed errors. `"error"` will now always
18+
be an object with, at a minimum, a `"type"` and `"reason"` field. Additional fields are included when detailed
19+
errors are enabled.
20+
To use the previous structure for non-detailed errors, use the v8 REST API.
21+
impact: |-
22+
If you have set `http.detailed_errors.enabled: false` (the default is `true`)
23+
the structure of JSON when any exceptions occur now matches the structure when
24+
detailed errors are enabled.
25+
To use the previous structure for non-detailed errors, use the v8 REST API.
26+
notable: false

‎docs/reference/cluster/allocation-explain.asciidoc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ node.
159159
<5> The decider which led to the `no` decision for the node.
160160
<6> An explanation as to why the decider returned a `no` decision, with a helpful hint pointing to the setting that led to the decision. In this example, a newly created index has <<indices-get-settings,an index setting>> that requires that it only be allocated to a node named `nonexistent_node`, which does not exist, so the index is unable to allocate.
161161

162+
See https://www.youtube.com/watch?v=5z3n2VgusLE[this video] for a walkthrough of troubleshooting a node and index setting mismatch.
163+
162164
[[maximum-number-of-retries-exceeded]]
163165
====== Maximum number of retries exceeded
164166

@@ -235,7 +237,9 @@ primary shard that was previously allocated.
235237
----
236238
// NOTCONSOLE
237239

238-
TIP: If a shard is unassigned with an allocation status of `no_valid_shard_copy`, then you should <<fix-cluster-status-recover-nodes,make sure that all nodes are in the cluster>>. If all the nodes containing in-sync copies of a shard are lost, then you can <<fix-cluster-status-restore,recover the data for the shard>>.
240+
If a shard is unassigned with an allocation status of `no_valid_shard_copy`, then you should <<fix-cluster-status-recover-nodes,make sure that all nodes are in the cluster>>. If all the nodes containing in-sync copies of a shard are lost, then you can <<fix-cluster-status-restore,recover the data for the shard>>.
241+
242+
See https://www.youtube.com/watch?v=6OAg9IyXFO4[this video] for a walkthrough of troubleshooting `no_valid_shard_copy`.
239243

240244
===== Unassigned replica shard
241245

‎docs/reference/esql/esql-commands.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ image::images/esql/processing-command.svg[A processing command changing an input
3838
* <<esql-eval>>
3939
* <<esql-grok>>
4040
ifeval::["{release-state}"=="unreleased"]
41-
* experimental:[] <<esql-inlinestats-by>>
41+
//* experimental:[] <<esql-inlinestats-by>>
4242
endif::[]
4343
* <<esql-keep>>
4444
* <<esql-limit>>
4545
ifeval::["{release-state}"=="unreleased"]
46-
* experimental:[] <<esql-lookup>>
46+
//* experimental:[] <<esql-lookup>>
4747
endif::[]
4848
* experimental:[] <<esql-mv_expand>>
4949
* <<esql-rename>>
@@ -63,12 +63,12 @@ include::processing-commands/enrich.asciidoc[]
6363
include::processing-commands/eval.asciidoc[]
6464
include::processing-commands/grok.asciidoc[]
6565
ifeval::["{release-state}"=="unreleased"]
66-
include::processing-commands/inlinestats.asciidoc[]
66+
//include::processing-commands/inlinestats.asciidoc[]
6767
endif::[]
6868
include::processing-commands/keep.asciidoc[]
6969
include::processing-commands/limit.asciidoc[]
7070
ifeval::["{release-state}"=="unreleased"]
71-
include::processing-commands/lookup.asciidoc[]
71+
//include::processing-commands/lookup.asciidoc[]
7272
endif::[]
7373
include::processing-commands/mv_expand.asciidoc[]
7474
include::processing-commands/rename.asciidoc[]

0 commit comments

Comments
 (0)