Skip to content

Commit 9d502d1

Browse files
committed
Remove remaining logic and tests for subobjects:auto (elastic#137428)
* Remove remaining logic and tests for subobjects:auto * skip compat tests * skip compat tests (cherry picked from commit 8c110cb) # Conflicts: # qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java # qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java # server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java # server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java # server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java
1 parent d9dc935 commit 9d502d1

File tree

18 files changed

+20
-1051
lines changed

18 files changed

+20
-1051
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
import static java.util.Collections.unmodifiableList;
6262

63+
6364
/**
6465
* This runner executes test suits against two clusters (a "write" (the remote) cluster and a
6566
* "search" cluster) connected via CCS.
@@ -85,7 +86,6 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
8586
private static final AtomicReference<TestFeatureService> combinedTestFeatureServiceRef = new AtomicReference<>();
8687
private static final AtomicReference<Set<String>> combinedOsSetRef = new AtomicReference<>();
8788
private static final AtomicReference<Set<String>> combinedNodeVersionsRef = new AtomicReference<>();
88-
8989
private static LocalClusterConfigProvider commonClusterConfig = cluster -> cluster.module("x-pack-async-search")
9090
.module("aggregations")
9191
.module("analysis-common")
@@ -98,9 +98,7 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9898
// geohex_grid requires gold license
9999
.setting("xpack.license.self_generated.type", "trial")
100100
.feature(FeatureFlag.TIME_SERIES_MODE)
101-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
102101
.feature(FeatureFlag.IVF_FORMAT);
103-
104102
private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local()
105103
.name(REMOTE_CLUSTER_NAME)
106104
.nodes(2)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9191
.setting("xpack.security.remote_cluster_server.ssl.enabled", "false")
9292
.setting("xpack.security.remote_cluster_client.ssl.enabled", "false")
9393
.feature(FeatureFlag.TIME_SERIES_MODE)
94-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
9594
.feature(FeatureFlag.IVF_FORMAT)
9695
.user("test_admin", "x-pack-test-password");
9796

qa/mixed-cluster/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
8989
setting 'health.master_history.no_master_transitions_threshold', '10'
9090
}
9191
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
92-
requiresFeature 'sub_objects_auto', Version.fromString("8.16.0")
9392
if (bwcVersion.before(Version.fromString("8.18.0"))) {
9493
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
9594
jvmArgs '-da:org.elasticsearch.index.mapper.MapperService'

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe
3535
// The first node does not have the ingest role so we're sure ingest requests are forwarded:
3636
.node(0, n -> n.setting("node.roles", "[master,data,ml,remote_cluster_client,transform]"))
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
38-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
3938
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
4039
.feature(FeatureFlag.USE_LUCENE101_POSTINGS_FORMAT)
4140
.feature(FeatureFlag.IVF_FORMAT)

rest-api-spec/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
6161
task.replaceValueInMatch("profile.shards.0.dfs.knn.0.collector.0.name", "TopScoreDocCollector", "dfs knn vector profiling with vector_operations_count")
6262
task.skipTest("cat.aliases/10_basic/Deprecated local parameter", "CAT APIs not covered by compatibility policy")
6363
task.skipTest("cat.shards/10_basic/Help", "sync_id is removed in 9.0")
64+
task.skipTest("search/330_fetch_fields/Test with subobjects: auto", "subobjects auto removed")
6465
task.skipTest("search/500_date_range/from, to, include_lower, include_upper deprecated", "deprecated parameters are removed in 9.0")
6566
task.skipTest("search.highlight/30_max_analyzed_offset/Plain highlighter with max_analyzed_offset < 0 should FAIL", "semantics of test has changed")
6667
task.skipTest("search.vectors/70_dense_vector_telemetry/Field mapping stats with field details", "default dense vector field mapping has changed")
@@ -72,9 +73,15 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
7273
task.skipTest("range/20_synthetic_source/Date range Rounding Fixes", "_source.mode mapping attribute is no-op since 9.0.0")
7374
task.skipTest("index/92_metrics_auto_subobjects/Metrics object indexing with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
7475
task.skipTest("index/92_metrics_auto_subobjects/Root without subobjects with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
76+
task.skipTest("index/92_metrics_auto_subobjects/Root with metrics", "subobjects auto removed")
77+
task.skipTest("index/92_metrics_auto_subobjects/Metrics object indexing", "subobjects auto removed")
7578
task.skipTest("index/91_metrics_no_subobjects/Metrics object indexing with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
7679
task.skipTest("index/91_metrics_no_subobjects/Root without subobjects with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
80+
task.skipTest("indices.create/20_synthetic_source/subobjects auto", "subobjects auto removed")
7781
task.skipTest("indices.create/20_synthetic_source/synthetic_source with copy_to inside nested object", "temporary until backported")
82+
task.skipTest("indices.create/20_synthetic_source/synthetic_source with copy_to pointing to ambiguous field and subobjects auto", "subobjects auto removed")
83+
task.skipTest("indices.put_index_template/15_composition/Composable index templates that include subobjects: auto on arbitrary field", "subobjects auto removed")
84+
task.skipTest("indices.put_index_template/15_composition/Composable index templates that include subobjects: auto at root", "subobjects auto removed")
7885
task.skipTest(
7986
"cluster.desired_nodes/10_basic/Test delete desired nodes with node_version generates a warning",
8087
"node_version warning is removed in 9.0"

rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3535
.module("health-shards-availability")
3636
.module("data-streams")
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
38-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
3938
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
4039
.feature(FeatureFlag.USE_LUCENE101_POSTINGS_FORMAT)
4140
.feature(FeatureFlag.IVF_FORMAT)

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/92_metrics_auto_subobjects.yml

Lines changed: 0 additions & 258 deletions
This file was deleted.

0 commit comments

Comments
 (0)