Skip to content

Commit e257ab5

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents 6d39894 + cc2f08c commit e257ab5

File tree

64 files changed

+2022
-341
lines changed

Some content is hidden

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

64 files changed

+2022
-341
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.

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/LogsStreamsActivationToggleAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public boolean shouldEnable() {
5656
}
5757

5858
@Override
59-
public Task createTask(String localNodeId, long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
60-
return new CancellableTask(id, type, action, "Logs streams activation toggle request", parentTaskId, headers);
59+
public Task createTask(TaskId taskId, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
60+
return new CancellableTask(taskId.getId(), type, action, "Logs streams activation toggle request", parentTaskId, headers);
6161
}
6262
}
6363
}

muted-tests.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,18 +536,12 @@ tests:
536536
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
537537
method: test {yaml=indices.resolve_index/10_basic_resolve_index/Resolve index with hidden and closed indices}
538538
issue: https://github.com/elastic/elasticsearch/issues/130568
539-
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
540-
method: test
541-
issue: https://github.com/elastic/elasticsearch/issues/130067
542539
- class: org.elasticsearch.xpack.monitoring.exporter.http.HttpExporterTests
543540
method: testExporterWithHostOnly
544541
issue: https://github.com/elastic/elasticsearch/issues/130599
545542
- class: org.elasticsearch.xpack.monitoring.exporter.http.HttpExporterTests
546543
method: testCreateRestClient
547544
issue: https://github.com/elastic/elasticsearch/issues/130600
548-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
549-
method: test
550-
issue: https://github.com/elastic/elasticsearch/issues/130067
551545
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
552546
method: test {p0=search.vectors/40_knn_search/Dimensions are dynamically set}
553547
issue: https://github.com/elastic/elasticsearch/issues/130626
@@ -575,6 +569,18 @@ tests:
575569
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
576570
method: test {yaml=search.vectors/70_dense_vector_telemetry/Field mapping stats}
577571
issue: https://github.com/elastic/elasticsearch/issues/130672
572+
- class: org.elasticsearch.indices.stats.IndexStatsIT
573+
method: testFilterCacheStats
574+
issue: https://github.com/elastic/elasticsearch/issues/124447
575+
- class: org.elasticsearch.search.sort.FieldSortIT
576+
method: testSortMixedFieldTypes
577+
issue: https://github.com/elastic/elasticsearch/issues/129445
578+
- class: org.elasticsearch.multiproject.test.XpackWithMultipleProjectsClientYamlTestSuiteIT
579+
method: test {yaml=dlm/10_usage/Test data stream lifecycle usage stats}
580+
issue: https://github.com/elastic/elasticsearch/issues/130677
581+
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
582+
method: testStopQueryLocal
583+
issue: https://github.com/elastic/elasticsearch/issues/121672
578584

579585
# Examples:
580586
#

plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/EC2RetriesTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.elasticsearch.discovery.SeedHostsResolver;
2626
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
2727
import org.elasticsearch.test.transport.MockTransportService;
28-
import org.elasticsearch.transport.TransportService;
2928
import org.elasticsearch.transport.netty4.Netty4Transport;
3029
import org.elasticsearch.transport.netty4.SharedGroupFactory;
3130
import org.hamcrest.Matchers;
@@ -47,8 +46,7 @@ public class EC2RetriesTests extends AbstractEC2MockAPITestCase {
4746

4847
@Override
4948
protected MockTransportService createTransportService() {
50-
return new MockTransportService(
51-
Settings.EMPTY,
49+
return MockTransportService.createMockTransportService(
5250
new Netty4Transport(
5351
Settings.EMPTY,
5452
TransportVersion.current(),
@@ -59,9 +57,7 @@ protected MockTransportService createTransportService() {
5957
new NoneCircuitBreakerService(),
6058
new SharedGroupFactory(Settings.EMPTY)
6159
),
62-
threadPool,
63-
TransportService.NOOP_TRANSPORT_INTERCEPTOR,
64-
null
60+
threadPool
6561
);
6662
}
6763

plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public TransportAddress[] addressesFromString(String address) {
7878
return new TransportAddress[] { poorMansDNS.getOrDefault(address, buildNewFakeTransportAddress()) };
7979
}
8080
};
81-
return new MockTransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, null);
81+
return MockTransportService.createMockTransportService(transport, threadPool);
8282
}
8383

8484
protected List<TransportAddress> buildDynamicHosts(Settings nodeSettings, int nodes) {

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()

0 commit comments

Comments
 (0)