Skip to content

Commit d26055a

Browse files
committed
Merge branch 'check-array-size-at-parse-time' of github.com:drempapis/elasticsearch into check-array-size-at-parse-time
2 parents 5e2a748 + 2234112 commit d26055a

File tree

18 files changed

+779
-222
lines changed

18 files changed

+779
-222
lines changed

docs/changelog/122497.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122497
2+
summary: Check if index patterns conform to valid format before validation
3+
area: CCS
4+
type: enhancement
5+
issues: []

docs/reference/elasticsearch/index-settings/slow-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ navigation_title: Slow log
88

99
The slow log records database searching and indexing events that have execution durations above specified thresholds. You can use these logs to investigate analyze or troubleshoot your cluster’s historical search and indexing performance.
1010

11-
Slow logs report task duration at the shard level for searches, and at the index level for indexing, but might not encompass the full task execution time observed on the client. For example, slow logs don’t surface HTTP network delays or the impact of [task queues](docs-content://troubleshoot/elasticsearch/task-queue-backlog.md).
11+
Slow logs report task duration at the shard level for searches, and at the index level for indexing, but might not encompass the full task execution time observed on the client. For example, slow logs don’t surface HTTP network delays or the impact of [task queues](docs-content://troubleshoot/elasticsearch/task-queue-backlog.md). For more information about the higher-level operations affecting response times, refer to [Reading and writing documents](docs-content://deploy-manage/distributed-architecture/reading-and-writing-documents.md).
1212

1313
Events that meet the specified threshold are emitted into [{{es}} logging](docs-content://deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md) under the `fileset.name` of `slowlog`. These logs can be viewed in the following locations:
1414

docs/release-notes/breaking-changes.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,15 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
1212

1313
% ## Next version [elasticsearch-nextversion-breaking-changes]
1414

15-
```{applies_to}
16-
stack: coming 9.0.3
17-
```
1815
## 9.0.3 [elasticsearch-9.0.3-breaking-changes]
1916

2017
No breaking changes in this version.
2118

22-
```{applies_to}
23-
stack: coming 9.0.2
24-
```
2519
## 9.0.2 [elasticsearch-9.0.2-breaking-changes]
2620

2721
Snapshot/Restore:
2822
* Make S3 custom query parameter optional [#128043](https://github.com/elastic/elasticsearch/pull/128043)
2923

30-
31-
3224
## 9.0.1 [elasticsearch-9.0.1-breaking-changes]
3325

3426
No breaking changes in this version.

docs/release-notes/changelog-bundles/9.0.2.yml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 9.0.2
2-
released: false
3-
generated: 2025-05-22T15:14:00.768080Z
2+
released: true
3+
generated: 2025-06-03T14:58:36.937148609Z
44
changelogs:
55
- pr: 126992
66
summary: Add missing `outbound_network` entitlement to x-pack-core
@@ -36,6 +36,12 @@ changelogs:
3636
type: bug
3737
issues:
3838
- 127468
39+
- pr: 127564
40+
summary: Consider inlinestats when having `field_caps` check for field names
41+
area: ES|QL
42+
type: bug
43+
issues:
44+
- 127236
3945
- pr: 127658
4046
summary: Append all data to Chat Completion buffer
4147
area: Machine Learning
@@ -133,3 +139,31 @@ changelogs:
133139
area: Data streams
134140
type: bug
135141
issues: []
142+
- pr: 128259
143+
summary: Added geometry validation for GEO types to exit early on invalid latitudes
144+
area: Geo
145+
type: bug
146+
issues:
147+
- 128234
148+
- pr: 128260
149+
summary: Fix validation NPE in Enrich and add extra @Nullable annotations
150+
area: ES|QL
151+
type: bug
152+
issues:
153+
- 126297
154+
- 126253
155+
- pr: 128320
156+
summary: Use new source loader when lower `docId` is accessed
157+
area: Codec
158+
type: bug
159+
issues: []
160+
- pr: 128327
161+
summary: Use internal user for internal inference action
162+
area: Machine Learning
163+
type: bug
164+
issues: []
165+
- pr: 128338
166+
summary: Pass timeout to chat completion
167+
area: Machine Learning
168+
type: bug
169+
issues: []

docs/release-notes/changelog-bundles/9.0.3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 9.0.3
2-
released: false
3-
generated: 2025-06-21T00:06:16.346021604Z
2+
released: true
3+
generated: 2025-06-24T15:19:29.859630035Z
44
changelogs:
55
- pr: 120869
66
summary: Threadpool merge scheduler

docs/release-notes/deprecations.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,11 @@ To give you insight into what deprecated features you’re using, {{es}}:
1616

1717
% ## Next version [elasticsearch-nextversion-deprecations]
1818

19-
```{applies_to}
20-
stack: coming 9.0.3
21-
```
2219
## 9.0.3 [elasticsearch-9.0.3-deprecations]
2320

2421
Engine:
2522
* Deprecate `indices.merge.scheduler.use_thread_pool` setting [#129464](https://github.com/elastic/elasticsearch/pull/129464)
2623

27-
28-
29-
```{applies_to}
30-
stack: coming 9.0.2
31-
```
3224
## 9.0.2 [elasticsearch-9.0.2-deprecations]
3325

3426
No deprecations in this version.

docs/release-notes/index.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ To check for security updates, go to [Security announcements for the Elastic sta
2121
% *
2222

2323
## 9.0.3 [elasticsearch-9.0.3-release-notes]
24-
```{applies_to}
25-
stack: coming 9.0.3
26-
```
2724

2825
### Features and enhancements [elasticsearch-9.0.3-features-enhancements]
2926

@@ -92,11 +89,7 @@ Searchable Snapshots:
9289
Security:
9390
* Fix error message when changing the password for a user in the file realm [#127621](https://github.com/elastic/elasticsearch/pull/127621)
9491

95-
9692
## 9.0.2 [elasticsearch-9.0.2-release-notes]
97-
```{applies_to}
98-
stack: coming 9.0.2
99-
```
10093

10194
### Features and enhancements [elasticsearch-9.0.2-features-enhancements]
10295

@@ -114,19 +107,27 @@ Aggregations:
114107
Audit:
115108
* Handle streaming request body in audit log [#127798](https://github.com/elastic/elasticsearch/pull/127798)
116109

110+
Codec:
111+
* Use new source loader when lower `docId` is accessed [#128320](https://github.com/elastic/elasticsearch/pull/128320)
112+
117113
Data streams:
118114
* Fix system data streams incorrectly showing up in the list of template validation problems [#128161](https://github.com/elastic/elasticsearch/pull/128161)
119115

120116
Downsampling:
121117
* Downsampling does not consider passthrough fields as dimensions [#127752](https://github.com/elastic/elasticsearch/pull/127752) (issue: [#125156](https://github.com/elastic/elasticsearch/issues/125156))
122118

123119
ES|QL:
120+
* Consider inlinestats when having `field_caps` check for field names [#127564](https://github.com/elastic/elasticsearch/pull/127564) (issue: [#127236](https://github.com/elastic/elasticsearch/issues/127236))
124121
* Don't push down filters on the right hand side of an inlinejoin [#127383](https://github.com/elastic/elasticsearch/pull/127383)
125122
* ESQL: Avoid unintended attribute removal [#127563](https://github.com/elastic/elasticsearch/pull/127563) (issue: [#127468](https://github.com/elastic/elasticsearch/issues/127468))
126123
* ESQL: Fix alias removal in regex extraction with JOIN [#127687](https://github.com/elastic/elasticsearch/pull/127687) (issue: [#127467](https://github.com/elastic/elasticsearch/issues/127467))
127124
* ESQL: Keep `DROP` attributes when resolving field names [#127009](https://github.com/elastic/elasticsearch/pull/127009) (issue: [#126418](https://github.com/elastic/elasticsearch/issues/126418))
128125
* Ensure ordinal builder emit ordinal blocks [#127949](https://github.com/elastic/elasticsearch/pull/127949)
129126
* Fix union types in CCS [#128111](https://github.com/elastic/elasticsearch/pull/128111)
127+
* Fix validation NPE in Enrich and add extra @Nullable annotations [#128260](https://github.com/elastic/elasticsearch/pull/128260) (issues: [#126297](https://github.com/elastic/elasticsearch/issues/126297), [#126253](https://github.com/elastic/elasticsearch/issues/126253))
128+
129+
Geo:
130+
* Added geometry validation for GEO types to exit early on invalid latitudes [#128259](https://github.com/elastic/elasticsearch/pull/128259) (issue: [#128234](https://github.com/elastic/elasticsearch/issues/128234))
130131

131132
Infra/Core:
132133
* Add missing `outbound_network` entitlement to x-pack-core [#126992](https://github.com/elastic/elasticsearch/pull/126992) (issue: [#127003](https://github.com/elastic/elasticsearch/issues/127003))
@@ -138,6 +139,8 @@ Infra/Scripting:
138139
Machine Learning:
139140
* Append all data to Chat Completion buffer [#127658](https://github.com/elastic/elasticsearch/pull/127658)
140141
* Fix services API Google Vertex AI Rerank location field requirement [#127856](https://github.com/elastic/elasticsearch/pull/127856)
142+
* Pass timeout to chat completion [#128338](https://github.com/elastic/elasticsearch/pull/128338)
143+
* Use internal user for internal inference action [#128327](https://github.com/elastic/elasticsearch/pull/128327)
141144

142145
Relevance:
143146
* Fix: Add `NamedWriteable` for `RuleQueryRankDoc` [#128153](https://github.com/elastic/elasticsearch/pull/128153) (issue: [#126071](https://github.com/elastic/elasticsearch/issues/126071))
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
package org.elasticsearch.core;
11+
12+
import java.lang.annotation.ElementType;
13+
import java.lang.annotation.Retention;
14+
import java.lang.annotation.RetentionPolicy;
15+
import java.lang.annotation.Target;
16+
17+
/**
18+
* Annotation to identify a block of code (a whole class, a method, a field, or a local variable) that is intentionally not fully
19+
* project-aware because it's not intended to be used in a serverless environment. Some features are unavailable in serverless and are
20+
* thus not worth the investment to make fully project-aware. This annotation makes it easier to identify blocks of code that require
21+
* attention in case those features are revisited from a multi-project POV.
22+
*/
23+
@Retention(RetentionPolicy.SOURCE)
24+
@Target(
25+
{ ElementType.LOCAL_VARIABLE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.MODULE }
26+
)
27+
public @interface NotMultiProjectCapable {
28+
29+
/**
30+
* Some explanation on why the block of code would not work in a multi-project context and/or what would need to be done to make it
31+
* properly project-aware.
32+
*/
33+
String description() default "";
34+
}

modules/ingest-geoip/qa/multi-project/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ dependencies {
2222
tasks.withType(Test).configureEach {
2323
it.systemProperty "tests.multi_project.enabled", true
2424
}
25+
26+
// Exclude multi-project tests from release build
27+
tasks.named { it == "javaRestTest" || it == "yamlRestTest" }.configureEach {
28+
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
29+
}

muted-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,12 @@ tests:
564564
method: "builds distribution from branches via archives extractedAssemble [bwcDistVersion: 8.2.1, bwcProject: bugfix, expectedAssembleTaskName:
565565
extractedAssemble, #2]"
566566
issue: https://github.com/elastic/elasticsearch/issues/119871
567-
567+
- class: org.elasticsearch.xpack.inference.qa.mixed.CohereServiceMixedIT
568+
method: testRerank
569+
issue: https://github.com/elastic/elasticsearch/issues/130009
570+
- class: org.elasticsearch.xpack.inference.qa.mixed.CohereServiceMixedIT
571+
method: testCohereEmbeddings
572+
issue: https://github.com/elastic/elasticsearch/issues/130010
568573

569574
# Examples:
570575
#

0 commit comments

Comments
 (0)