Skip to content

Commit 9ca10fb

Browse files
committed
Merge branch 'main' into cps-spi-poc
2 parents 54612a7 + 6f0b262 commit 9ca10fb

File tree

53 files changed

+2124
-257
lines changed

Some content is hidden

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

53 files changed

+2124
-257
lines changed

docs/changelog/130382.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130382
2+
summary: Remove vectors from `_source` transparently
3+
area: "Vector Search"
4+
type: enhancement
5+
issues: []

docs/changelog/130448.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 130448
2+
summary: Fix wildcard drop after lookup join
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 129561

docs/reference/elasticsearch/mapping-reference/mapping-source-field.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,13 +308,12 @@ PUT my-index-000001
308308
}
309309
```
310310

311-
::::{admonition} Think before disabling the _source field
312-
:class: warning
311+
::::{warning}
313312

314-
Users often disable the `_source` field without thinking about the consequences, and then live to regret it. If the `_source` field isn’t available then a number of features are not supported:
313+
Do not disable the `_source` field, unless absolutely necessary. If you disable it, the following critical features will not be supported:
315314

316315
* The [`update`](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-update), [`update_by_query`](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-update-by-query), and [`reindex`](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-reindex) APIs.
317-
* In the {{kib}} [Discover](docs-content://explore-analyze/discover.md) application, field data will not be displayed.
316+
* Display of field data in the {{kib}} [Discover](docs-content://explore-analyze/discover.md) application.
318317
* On the fly [highlighting](/reference/elasticsearch/rest-apis/highlighting.md).
319318
* The ability to reindex from one Elasticsearch index to another, either to change mappings or analysis, or to upgrade an index to a new major version.
320319
* The ability to debug queries or aggregations by viewing the original document used at index time.

muted-tests.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -539,18 +539,12 @@ tests:
539539
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
540540
method: test {yaml=indices.resolve_index/10_basic_resolve_index/Resolve index with hidden and closed indices}
541541
issue: https://github.com/elastic/elasticsearch/issues/130568
542-
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
543-
method: test
544-
issue: https://github.com/elastic/elasticsearch/issues/130067
545542
- class: org.elasticsearch.xpack.monitoring.exporter.http.HttpExporterTests
546543
method: testExporterWithHostOnly
547544
issue: https://github.com/elastic/elasticsearch/issues/130599
548545
- class: org.elasticsearch.xpack.monitoring.exporter.http.HttpExporterTests
549546
method: testCreateRestClient
550547
issue: https://github.com/elastic/elasticsearch/issues/130600
551-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
552-
method: test
553-
issue: https://github.com/elastic/elasticsearch/issues/130067
554548
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
555549
method: test {p0=search.vectors/40_knn_search/Dimensions are dynamically set}
556550
issue: https://github.com/elastic/elasticsearch/issues/130626
@@ -587,6 +581,9 @@ tests:
587581
- class: org.elasticsearch.multiproject.test.XpackWithMultipleProjectsClientYamlTestSuiteIT
588582
method: test {yaml=dlm/10_usage/Test data stream lifecycle usage stats}
589583
issue: https://github.com/elastic/elasticsearch/issues/130677
584+
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
585+
method: testStopQueryLocal
586+
issue: https://github.com/elastic/elasticsearch/issues/121672
590587

591588
# Examples:
592589
#

qa/ccs-common-rest/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'elasticsearch.internal-yaml-rest-test'
1111
restResources {
1212
restApi {
1313
include 'capabilities', 'cat.shards', '_common', 'bulk', 'count', 'cluster', 'field_caps', 'get', 'knn_search', 'index', 'indices', 'msearch',
14-
"nodes.stats", 'search', 'async_search', 'graph', '*_point_in_time', 'info', 'scroll', 'clear_scroll', 'search_mvt', 'eql', 'sql'
14+
"nodes.stats", 'search', 'async_search', 'graph', '*_point_in_time', 'info', 'scroll', 'clear_scroll', 'search_mvt', 'eql', 'sql', 'update'
1515
}
1616
restTests {
1717
includeCore 'field_caps', 'msearch', 'search', 'suggest', 'scroll', "indices.resolve_index"

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9191
.setting("xpack.license.self_generated.type", "trial")
9292
.feature(FeatureFlag.TIME_SERIES_MODE)
9393
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
94-
.feature(FeatureFlag.IVF_FORMAT);
94+
.feature(FeatureFlag.IVF_FORMAT)
95+
.feature(FeatureFlag.SYNTHETIC_VECTORS);
9596

9697
private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local()
9798
.name(REMOTE_CLUSTER_NAME)

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9393
.feature(FeatureFlag.TIME_SERIES_MODE)
9494
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
9595
.feature(FeatureFlag.IVF_FORMAT)
96+
.feature(FeatureFlag.SYNTHETIC_VECTORS)
9697
.user("test_admin", "x-pack-test-password");
9798

9899
private static ElasticsearchCluster fulfillingCluster = ElasticsearchCluster.local()

qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe
3939
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
4040
.feature(FeatureFlag.USE_LUCENE101_POSTINGS_FORMAT)
4141
.feature(FeatureFlag.IVF_FORMAT)
42+
.feature(FeatureFlag.SYNTHETIC_VECTORS)
4243
.build();
4344

4445
public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_component_template.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@
4444
"include_defaults":{
4545
"type":"boolean",
4646
"description":"Return all default configurations for the component template (default: false)"
47+
},
48+
"flat_settings":{
49+
"type":"boolean",
50+
"description":"Return settings in flat format (default: false)"
51+
},
52+
"settings_filter":{
53+
"type":"string",
54+
"description":"Filter out results, for example to filter out sensitive information. Supports wildcards or full settings keys"
4755
}
4856
}
4957
}

rest-api-spec/src/main/resources/rest-api-spec/api/get.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
"type":"list",
6969
"description":"A list of fields to extract and return from the _source field"
7070
},
71+
"_source_exclude_vectors":{
72+
"type":"boolean",
73+
"description":"Whether vectors should be excluded from _source"
74+
},
7175
"version":{
7276
"type":"number",
7377
"description":"Explicit version number for concurrency control"

0 commit comments

Comments
 (0)