Skip to content

Commit a0481a6

Browse files
committed
Merge branch 'refs/heads/main' into carlosdelest/fix-synonyms-ci-tests-timeout
2 parents fc802ea + ddd576e commit a0481a6

File tree

91 files changed

+4227
-487
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

+4227
-487
lines changed

docs/changelog/112929.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112929
2+
summary: "ES|QL: Add support for cached strings in plan serialization"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/112938.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
pr: 112938
2+
summary: Enhance SORT push-down to Lucene to cover references to fields and ST_DISTANCE function
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 109973
7+
highlight:
8+
title: Enhance SORT push-down to Lucene to cover references to fields and ST_DISTANCE function
9+
body: |-
10+
The most used and likely most valuable geospatial search query in Elasticsearch is the sorted proximity search,
11+
finding items within a certain distance of a point of interest and sorting the results by distance.
12+
This has been possible in ES|QL since 8.15.0, but the sorting was done in-memory, not pushed down to Lucene.
13+
Now the sorting is pushed down to Lucene, which results in a significant performance improvement.
14+
15+
Queries that perform both filtering and sorting on distance are supported. For example:
16+
17+
[source,esql]
18+
----
19+
FROM test
20+
| EVAL distance = ST_DISTANCE(location, TO_GEOPOINT("POINT(37.7749, -122.4194)"))
21+
| WHERE distance < 1000000
22+
| SORT distance ASC, name DESC
23+
| LIMIT 10
24+
----
25+
26+
In addition, the support for sorting on EVAL expressions has been extended to cover references to fields:
27+
28+
[source,esql]
29+
----
30+
FROM test
31+
| EVAL ref = field
32+
| SORT ref ASC
33+
| LIMIT 10
34+
----
35+
notable: false

docs/changelog/114411.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114411
2+
summary: "ESQL: Push down filters even in case of renames in Evals"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/114533.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114533
2+
summary: Fix dim validation for bit `element_type`
3+
area: Vector Search
4+
type: bug
5+
issues: []

docs/changelog/114552.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114552
2+
summary: Improve exception message for bad environment variable placeholders in settings
3+
area: Infra/Settings
4+
type: enhancement
5+
issues: [110858]

modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/DeleteDataStreamLifecycleAction.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,26 @@ private DeleteDataStreamLifecycleAction() {/* no instances */}
3434
public static final class Request extends AcknowledgedRequest<Request> implements IndicesRequest.Replaceable {
3535

3636
private String[] names;
37-
private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, true, true, true, false, false, true, false);
37+
private IndicesOptions indicesOptions = IndicesOptions.builder()
38+
.concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
39+
.wildcardOptions(
40+
IndicesOptions.WildcardOptions.builder()
41+
.matchOpen(true)
42+
.matchClosed(true)
43+
.includeHidden(false)
44+
.resolveAliases(false)
45+
.allowEmptyExpressions(true)
46+
.build()
47+
)
48+
.gatekeeperOptions(
49+
IndicesOptions.GatekeeperOptions.builder()
50+
.allowAliasToMultipleIndices(false)
51+
.allowClosedIndices(true)
52+
.ignoreThrottled(false)
53+
.allowFailureIndices(false)
54+
.build()
55+
)
56+
.build();
3857

3958
public Request(StreamInput in) throws IOException {
4059
super(in);

muted-tests.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ tests:
7171
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
7272
method: test {p0=rollup/security_tests/Index-based access}
7373
issue: https://github.com/elastic/elasticsearch/issues/111631
74-
- class: org.elasticsearch.tdigest.ComparisonTests
75-
method: testSparseGaussianDistribution
76-
issue: https://github.com/elastic/elasticsearch/issues/111721
7774
- class: org.elasticsearch.upgrades.FullClusterRestartIT
7875
method: testSnapshotRestore {cluster=OLD}
7976
issue: https://github.com/elastic/elasticsearch/issues/111777
@@ -343,9 +340,6 @@ tests:
343340
- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
344341
method: test {yaml=cluster.stats/30_ccs_stats/cross-cluster search stats search}
345342
issue: https://github.com/elastic/elasticsearch/issues/114371
346-
- class: org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT
347-
method: testProfileOrdinalsGroupingOperator {SYNC}
348-
issue: https://github.com/elastic/elasticsearch/issues/114380
349343
- class: org.elasticsearch.xpack.inference.services.cohere.CohereServiceTests
350344
method: testInfer_StreamRequest
351345
issue: https://github.com/elastic/elasticsearch/issues/114385
@@ -384,6 +378,15 @@ tests:
384378
- class: org.elasticsearch.datastreams.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
385379
method: testTermsQuery
386380
issue: https://github.com/elastic/elasticsearch/issues/114563
381+
- class: org.elasticsearch.datastreams.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
382+
method: testMatchAllQuery
383+
issue: https://github.com/elastic/elasticsearch/issues/114607
384+
- class: org.elasticsearch.xpack.esql.optimizer.PhysicalPlanOptimizerTests
385+
method: testPushSpatialIntersectsEvalToSource {default}
386+
issue: https://github.com/elastic/elasticsearch/issues/114627
387+
- class: org.elasticsearch.xpack.esql.optimizer.PhysicalPlanOptimizerTests
388+
method: testPushWhereEvalToSource {default}
389+
issue: https://github.com/elastic/elasticsearch/issues/114628
387390

388391
# Examples:
389392
#

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ setup:
2121
element_type: byte
2222
index_options:
2323
type: hnsw
24+
m: 16
25+
ef_construction: 100
2426
vector2:
2527
type: dense_vector
2628
dims: 1024
2729
index: true
2830
similarity: dot_product
29-
index_options:
30-
type: int8_hnsw
3131
vector3:
3232
type: dense_vector
3333
dims: 100

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ static TransportVersion def(int id) {
239239
public static final TransportVersion TEXT_SIMILARITY_RERANKER_QUERY_REWRITE = def(8_763_00_0);
240240
public static final TransportVersion SIMULATE_INDEX_TEMPLATES_SUBSTITUTIONS = def(8_764_00_0);
241241
public static final TransportVersion RETRIEVERS_TELEMETRY_ADDED = def(8_765_00_0);
242+
public static final TransportVersion ESQL_CACHED_STRING_SERIALIZATION = def(8_766_00_0);
243+
public static final TransportVersion CHUNK_SENTENCE_OVERLAP_SETTING_ADDED = def(8_767_00_0);
242244

243245
/*
244246
* STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,26 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
5858
// indices options that require every specified index to exist, expand wildcards only to open
5959
// indices, don't allow that no indices are resolved from wildcard expressions and resolve the
6060
// expressions only against indices
61-
private static final IndicesOptions INDICES_OPTIONS = IndicesOptions.fromOptions(false, false, true, false, true, false, true, false);
61+
private static final IndicesOptions INDICES_OPTIONS = IndicesOptions.builder()
62+
.concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
63+
.wildcardOptions(
64+
IndicesOptions.WildcardOptions.builder()
65+
.matchOpen(true)
66+
.matchClosed(false)
67+
.includeHidden(false)
68+
.resolveAliases(false)
69+
.allowEmptyExpressions(false)
70+
.build()
71+
)
72+
.gatekeeperOptions(
73+
IndicesOptions.GatekeeperOptions.builder()
74+
.allowAliasToMultipleIndices(true)
75+
.allowClosedIndices(true)
76+
.ignoreThrottled(false)
77+
.allowFailureIndices(true)
78+
.build()
79+
)
80+
.build();
6281

6382
public IndicesAliasesRequest(StreamInput in) throws IOException {
6483
super(in);

0 commit comments

Comments
 (0)