Skip to content

Commit 2cf2266

Browse files
committed
Merge branch 'master' into fix_Add_XContentFieldFilter
2 parents 3789d76 + 878a445 commit 2cf2266

File tree

230 files changed

+7994
-653
lines changed

Some content is hidden

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

230 files changed

+7994
-653
lines changed

.github/ISSUE_TEMPLATE/test-failure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Test Failure
22
description: A test failure in CI
3-
labels: [">test-failure"]
3+
labels: [">test-failure","needs:triage"]
44
body:
55
- type: markdown
66
attributes:

benchmarks/src/main/java/org/elasticsearch/benchmark/search/fetch/subphase/FetchSourcePhaseBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void setup() throws IOException {
6666
);
6767
includesSet = Set.of(fetchContext.includes());
6868
excludesSet = Set.of(fetchContext.excludes());
69-
parserConfig = XContentParserConfiguration.EMPTY.withFiltering(includesSet, excludesSet);
69+
parserConfig = XContentParserConfiguration.EMPTY.withFiltering(includesSet, excludesSet, false);
7070
}
7171

7272
private BytesReference read300BytesExample() throws IOException {

benchmarks/src/main/java/org/elasticsearch/benchmark/xcontent/FilterContentBenchmark.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public class FilterContentBenchmark {
6161
private BytesReference source;
6262
private XContentParserConfiguration parserConfig;
6363
private Set<String> filters;
64+
private XContentParserConfiguration parserConfigMatchDotsInFieldNames;
6465

6566
@Setup
6667
public void setup() throws IOException {
@@ -72,7 +73,8 @@ public void setup() throws IOException {
7273
};
7374
source = readSource(sourceFile);
7475
filters = buildFilters();
75-
parserConfig = buildParseConfig();
76+
parserConfig = buildParseConfig(false);
77+
parserConfigMatchDotsInFieldNames = buildParseConfig(true);
7678
}
7779

7880
private Set<String> buildFilters() {
@@ -105,9 +107,14 @@ public BytesReference filterWithParserConfigCreated() throws IOException {
105107
return filter(this.parserConfig);
106108
}
107109

110+
@Benchmark
111+
public BytesReference filterWithParserConfigCreatedMatchDotsInFieldNames() throws IOException {
112+
return filter(this.parserConfigMatchDotsInFieldNames);
113+
}
114+
108115
@Benchmark
109116
public BytesReference filterWithNewParserConfig() throws IOException {
110-
XContentParserConfiguration contentParserConfiguration = buildParseConfig();
117+
XContentParserConfiguration contentParserConfiguration = buildParseConfig(false);
111118
return filter(contentParserConfiguration);
112119
}
113120

@@ -152,7 +159,7 @@ public BytesReference filterWithBuilder() throws IOException {
152159
}
153160
}
154161

155-
private XContentParserConfiguration buildParseConfig() {
162+
private XContentParserConfiguration buildParseConfig(boolean matchDotsInFieldNames) {
156163
Set<String> includes;
157164
Set<String> excludes;
158165
if (inclusive) {
@@ -162,7 +169,7 @@ private XContentParserConfiguration buildParseConfig() {
162169
includes = null;
163170
excludes = filters;
164171
}
165-
return XContentParserConfiguration.EMPTY.withFiltering(includes, excludes);
172+
return XContentParserConfiguration.EMPTY.withFiltering(includes, excludes, matchDotsInFieldNames);
166173
}
167174

168175
private BytesReference filter(XContentParserConfiguration contentParserConfiguration) throws IOException {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
* This class defines gradle tasks for testing our various distribution artifacts.
7070
*/
7171
public class DistroTestPlugin implements Plugin<Project> {
72-
private static final String SYSTEM_JDK_VERSION = "17.0.1+12";
72+
private static final String SYSTEM_JDK_VERSION = "17.0.2+8";
7373
private static final String SYSTEM_JDK_VENDOR = "adoptium";
7474
private static final String GRADLE_JDK_VERSION = "16.0.2+7";
7575
private static final String GRADLE_JDK_VENDOR = "adoptium";

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ elasticsearch = 8.1.0
22
lucene = 9.0.0
33

44
bundled_jdk_vendor = adoptium
5-
bundled_jdk = 17.0.1+12
5+
bundled_jdk = 17.0.2+8
66

77
checkstyle = 8.45.1
88

docs/changelog/82316.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 82316
2+
summary: Add an index->step cache to the `PolicyStepsRegistry`
3+
area: ILM+SLM
4+
type: enhancement
5+
issues: []

docs/changelog/82410.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 82410
2+
summary: Add an aggregator for IPv4 and IPv6 subnets
3+
area: Aggregations
4+
type: enhancement
5+
issues: []

docs/changelog/82705.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 82705
2+
summary: Add error counts to trained model stats
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

docs/changelog/83083.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 83083
2+
summary: Expose 'features' option in Get Index API
3+
area: Indices APIs
4+
type: enhancement
5+
issues:
6+
- 82948

docs/changelog/83099.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 83099
2+
summary: Improve support for joda datetime to java datetime in Painless
3+
area: Infra/Scripting
4+
type: enhancement
5+
issues: []

docs/changelog/83222.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 83222
2+
summary: Make `PeerFinder` log messages happier
3+
area: Cluster Coordination
4+
type: enhancement
5+
issues: []

docs/changelog/83243.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 83243
2+
summary: Bump bundled JDK to 17.0.2+8
3+
area: Packaging
4+
type: upgrade
5+
issues:
6+
- 83242

docs/reference/aggregations/bucket.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ include::bucket/global-aggregation.asciidoc[]
4848

4949
include::bucket/histogram-aggregation.asciidoc[]
5050

51+
include::bucket/ipprefix-aggregation.asciidoc[]
52+
5153
include::bucket/iprange-aggregation.asciidoc[]
5254

5355
include::bucket/missing-aggregation.asciidoc[]

0 commit comments

Comments
 (0)