Skip to content

Commit b92407e

Browse files
ivanceaivancea
authored
Merge branch 'main' into grouped-topn-benchmark
2 parents 9beae4d + 498aa28 commit b92407e

561 files changed

Lines changed: 3718 additions & 5965 deletions

File tree

Some content is hidden

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

‎docs/changelog/143030.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 143030
2+
summary: "ESQL: Fix incorrectly optimized fork with nullify unmapped_fields"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 142762

‎docs/changelog/144031.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
area: ES|QL
2+
issues:
3+
- 144024
4+
pr: 144031
5+
summary: Fix ESQL TS requests with LIMIT 0
6+
type: bug

‎docs/changelog/144040.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
area: Mapping
2+
issues:
3+
- 142544
4+
- 142964
5+
- 142410
6+
- 143884
7+
- 142477
8+
pr: 144040
9+
summary: Drop deprecation warnings when updating a mapping in the cluster state applier
10+
type: bug

‎docs/changelog/144050.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
area: ES|QL
2+
issues: []
3+
pr: 144050
4+
summary: CSV schema inference and parsing enhancements
5+
type: enhancement

‎docs/reference/query-languages/query-dsl/query-dsl-text-expansion-query.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GET _search
5656
`model_text`
5757
: (Required, string) The query text you want to use for search.
5858

59-
`pruning_config` {applies_to}`stack: preview` {applies_to}`serverless: preview`
59+
`pruning_config`
6060
: (Optional, object) Optional pruning configuration. If enabled, this will omit non-significant tokens from the query in order to improve query performance. Default: Disabled.
6161

6262
Parameters for `<pruning_config>` are:
@@ -194,10 +194,7 @@ GET my-index/_search
194194

195195

196196
## Example ELSER query with pruning configuration and rescore [text-expansion-query-with-pruning-config-and-rescore-example]
197-
```{applies_to}
198-
stack: preview
199-
serverless: preview
200-
```
197+
201198

202199
The following is an extension to the previous example that adds a pruning configuration to the `text_expansion` query. The pruning configuration identifies non-significant tokens to prune from the query in order to improve query performance.
203200

‎docs/reference/query-languages/querydsl.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mapped_pages:
33
- https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
44
---
55

6-
# QueryDSL [query-dsl]
6+
# Query DSL [query-dsl]
77

88
:::{note}
99
Refer to the [Query DSL overview](docs-content://explore-analyze/query-filter/languages/querydsl.md) in the **Explore and analyze** section for overview and conceptual information about Query DSL.

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public List<RestHandler> getRestHandlers(
5656
) {
5757
Settings settings = restHandlersServices.settings();
5858
return Arrays.asList(
59-
new RestSearchTemplateAction(clusterSupportsFeature, settings),
60-
new RestMultiSearchTemplateAction(settings),
59+
new RestSearchTemplateAction(clusterSupportsFeature, restHandlersServices.crossProjectModeDecider()),
60+
new RestMultiSearchTemplateAction(settings, restHandlersServices.crossProjectModeDecider()),
6161
new RestRenderSearchTemplateAction()
6262
);
6363
}

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public class RestMultiSearchTemplateAction extends BaseRestHandler {
4040
private final boolean allowExplicitIndex;
4141
private final CrossProjectModeDecider crossProjectModeDecider;
4242

43-
public RestMultiSearchTemplateAction(Settings settings) {
43+
public RestMultiSearchTemplateAction(Settings settings, CrossProjectModeDecider crossProjectModeDecider) {
4444
this.allowExplicitIndex = MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
45-
this.crossProjectModeDecider = new CrossProjectModeDecider(settings);
45+
this.crossProjectModeDecider = crossProjectModeDecider;
4646
}
4747

4848
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.elasticsearch.action.search.SearchRequest;
1313
import org.elasticsearch.client.internal.node.NodeClient;
14-
import org.elasticsearch.common.settings.Settings;
1514
import org.elasticsearch.features.NodeFeature;
1615
import org.elasticsearch.rest.BaseRestHandler;
1716
import org.elasticsearch.rest.RestRequest;
@@ -41,9 +40,9 @@ public class RestSearchTemplateAction extends BaseRestHandler {
4140
private final Predicate<NodeFeature> clusterSupportsFeature;
4241
private final CrossProjectModeDecider crossProjectModeDecider;
4342

44-
public RestSearchTemplateAction(Predicate<NodeFeature> clusterSupportsFeature, Settings settings) {
43+
public RestSearchTemplateAction(Predicate<NodeFeature> clusterSupportsFeature, CrossProjectModeDecider crossProjectModeDecider) {
4544
this.clusterSupportsFeature = clusterSupportsFeature;
46-
this.crossProjectModeDecider = new CrossProjectModeDecider(settings);
45+
this.crossProjectModeDecider = crossProjectModeDecider;
4746
}
4847

4948
@Override

‎modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequestTests.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.rest.RestRequest;
1616
import org.elasticsearch.script.ScriptType;
1717
import org.elasticsearch.search.builder.SearchSourceBuilder;
18+
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
1819
import org.elasticsearch.test.ESTestCase;
1920
import org.elasticsearch.test.StreamsUtils;
2021
import org.elasticsearch.test.rest.FakeRestRequest;
@@ -36,7 +37,10 @@ public void testParseRequest() throws Exception {
3637
RestRequest restRequest = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(data), XContentType.JSON)
3738
.build();
3839

39-
MultiSearchTemplateRequest request = new RestMultiSearchTemplateAction(Settings.EMPTY).parseRequest(restRequest, true);
40+
MultiSearchTemplateRequest request = new RestMultiSearchTemplateAction(Settings.EMPTY, CrossProjectModeDecider.NOOP).parseRequest(
41+
restRequest,
42+
true
43+
);
4044

4145
assertThat(request.requests().size(), equalTo(3));
4246
assertThat(request.requests().get(0).getRequest().indices()[0], equalTo("test0"));
@@ -74,7 +78,10 @@ public void testParseWithCarriageReturn() throws Exception {
7478
RestRequest restRequest = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(content), XContentType.JSON)
7579
.build();
7680

77-
MultiSearchTemplateRequest request = new RestMultiSearchTemplateAction(Settings.EMPTY).parseRequest(restRequest, true);
81+
MultiSearchTemplateRequest request = new RestMultiSearchTemplateAction(Settings.EMPTY, CrossProjectModeDecider.NOOP).parseRequest(
82+
restRequest,
83+
true
84+
);
7885

7986
assertThat(request.requests().size(), equalTo(1));
8087
assertThat(request.requests().get(0).getRequest().indices()[0], equalTo("test0"));
@@ -126,7 +133,10 @@ public void testMultiSearchTemplateToJson() throws Exception {
126133
// Deserialize the request
127134
RestRequest restRequest = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(serialized), XContentType.JSON)
128135
.build();
129-
MultiSearchTemplateRequest deser = new RestMultiSearchTemplateAction(Settings.EMPTY).parseRequest(restRequest, true);
136+
MultiSearchTemplateRequest deser = new RestMultiSearchTemplateAction(Settings.EMPTY, CrossProjectModeDecider.NOOP).parseRequest(
137+
restRequest,
138+
true
139+
);
130140

131141
// For object equality purposes need to set the search requests' source to non-null
132142
for (SearchTemplateRequest str : deser.requests()) {

0 commit comments

Comments
 (0)