Skip to content

Commit 22cf404

Browse files
kkrik-eskkrik-es
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 # qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java # rest-api-spec/build.gradle # rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/92_metrics_auto_subobjects.yml # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml # rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml # server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java # server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java # server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java # server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java # x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java # x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java
1 parent b564aa8 commit 22cf404

File tree

17 files changed

+40
-1013
lines changed

17 files changed

+40
-1013
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9090
// geohex_grid requires gold license
9191
.setting("xpack.license.self_generated.type", "trial")
9292
.feature(FeatureFlag.TIME_SERIES_MODE)
93-
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED);
9493

9594
private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local()
9695
.name(REMOTE_CLUSTER_NAME)

‎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
.user("test_admin", "x-pack-test-password");
9695

9796
private static ElasticsearchCluster fulfillingCluster = ElasticsearchCluster.local()

‎qa/mixed-cluster/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
8383
setting 'health.master_history.no_master_transitions_threshold', '10'
8484
}
8585
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
86-
requiresFeature 'sub_objects_auto', Version.fromString("8.16.0")
8786
if (bwcVersion.before(Version.fromString("8.18.0"))) {
8887
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
8988
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
.build();
4039

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

‎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
.build();
4039

4140
public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

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

Lines changed: 0 additions & 262 deletions
Original file line numberDiff line numberDiff line change
@@ -1,262 +0,0 @@
1-
---
2-
"Metrics object indexing":
3-
- requires:
4-
test_runner_features: [ "allowed_warnings", "allowed_warnings_regex" ]
5-
cluster_features: ["mapper.subobjects_auto"]
6-
reason: requires supporting subobjects auto setting
7-
8-
- do:
9-
allowed_warnings:
10-
- "index template [test] has index patterns [test-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [test] will take precedence during new index creation"
11-
indices.put_index_template:
12-
name: test
13-
body:
14-
index_patterns: test-*
15-
template:
16-
mappings:
17-
dynamic_templates:
18-
- no_subobjects:
19-
match: metrics
20-
mapping:
21-
type: object
22-
subobjects: auto
23-
properties:
24-
host.name:
25-
type: keyword
26-
27-
- do:
28-
allowed_warnings_regex:
29-
- "index \\[test-1\\] matches multiple legacy templates \\[global, test\\], composable templates will only match a single template"
30-
index:
31-
index: test-1
32-
id: 1
33-
refresh: true
34-
body:
35-
{ metrics.host.name: localhost, metrics.host.id: 1, metrics.time: 10, metrics.time.max: 100, metrics.time.min: 1 }
36-
37-
- do:
38-
field_caps:
39-
index: test-1
40-
fields: metrics*
41-
- match: {fields.metrics\.host\.id.long.searchable: true}
42-
- match: {fields.metrics\.host\.id.long.aggregatable: true}
43-
- match: {fields.metrics\.host\.name.keyword.searchable: true}
44-
- match: {fields.metrics\.host\.name.keyword.aggregatable: true}
45-
- match: {fields.metrics\.time.long.searchable: true}
46-
- match: {fields.metrics\.time.long.aggregatable: true}
47-
- match: {fields.metrics\.time\.max.long.searchable: true}
48-
- match: {fields.metrics\.time\.max.long.aggregatable: true}
49-
- match: {fields.metrics\.time\.min.long.searchable: true}
50-
- match: {fields.metrics\.time\.min.long.aggregatable: true}
51-
52-
- do:
53-
get:
54-
index: test-1
55-
id: 1
56-
- match: {_index: "test-1"}
57-
- match: {_id: "1"}
58-
- match: {_version: 1}
59-
- match: {found: true}
60-
- match:
61-
_source:
62-
metrics.host.name: localhost
63-
metrics.host.id: 1
64-
metrics.time: 10
65-
metrics.time.max: 100
66-
metrics.time.min: 1
67-
68-
---
69-
"Root with metrics":
70-
- requires:
71-
test_runner_features: [ "allowed_warnings", "allowed_warnings_regex" ]
72-
cluster_features: ["mapper.subobjects_auto"]
73-
reason: requires supporting subobjects auto setting
74-
75-
- do:
76-
allowed_warnings:
77-
- "index template [test] has index patterns [test-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [test] will take precedence during new index creation"
78-
indices.put_index_template:
79-
name: test
80-
body:
81-
index_patterns: test-*
82-
template:
83-
mappings:
84-
subobjects: auto
85-
properties:
86-
host.name:
87-
type: keyword
88-
89-
- do:
90-
allowed_warnings_regex:
91-
- "index \\[test-1\\] matches multiple legacy templates \\[global, test\\], composable templates will only match a single template"
92-
index:
93-
index: test-1
94-
id: 1
95-
refresh: true
96-
body:
97-
{ host.name: localhost, host.id: 1, time: 10, time.max: 100, time.min: 1 }
98-
99-
- do:
100-
field_caps:
101-
index: test-1
102-
fields: [host*, time*]
103-
- match: {fields.host\.name.keyword.searchable: true}
104-
- match: {fields.host\.name.keyword.aggregatable: true}
105-
- match: {fields.host\.id.long.searchable: true}
106-
- match: {fields.host\.id.long.aggregatable: true}
107-
- match: {fields.time.long.searchable: true}
108-
- match: {fields.time.long.aggregatable: true}
109-
- match: {fields.time\.max.long.searchable: true}
110-
- match: {fields.time\.max.long.aggregatable: true}
111-
- match: {fields.time\.min.long.searchable: true}
112-
- match: {fields.time\.min.long.aggregatable: true}
113-
114-
- do:
115-
get:
116-
index: test-1
117-
id: 1
118-
- match: {_index: "test-1"}
119-
- match: {_id: "1"}
120-
- match: {_version: 1}
121-
- match: {found: true}
122-
- match:
123-
_source:
124-
host.name: localhost
125-
host.id: 1
126-
time: 10
127-
time.max: 100
128-
time.min: 1
129-
130-
---
131-
"Metrics object indexing with synthetic source":
132-
- requires:
133-
test_runner_features: [ "allowed_warnings", "allowed_warnings_regex" ]
134-
cluster_features: ["mapper.subobjects_auto"]
135-
reason: added in 8.4.0
136-
137-
- do:
138-
allowed_warnings:
139-
- "index template [test] has index patterns [test-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [test] will take precedence during new index creation"
140-
indices.put_index_template:
141-
name: test
142-
body:
143-
index_patterns: test-*
144-
template:
145-
mappings:
146-
_source:
147-
mode: synthetic
148-
dynamic_templates:
149-
- no_subobjects:
150-
match: metrics
151-
mapping:
152-
type: object
153-
subobjects: auto
154-
properties:
155-
host.name:
156-
type: keyword
157-
158-
- do:
159-
allowed_warnings_regex:
160-
- "index \\[test-1\\] matches multiple legacy templates \\[global, test\\], composable templates will only match a single template"
161-
index:
162-
index: test-1
163-
id: 1
164-
refresh: true
165-
body:
166-
{ metrics.host.name: localhost, metrics.host.id: 1, metrics.time: 10, metrics.time.max: 100, metrics.time.min: 1 }
167-
168-
- do:
169-
field_caps:
170-
index: test-1
171-
fields: metrics*
172-
- match: {fields.metrics\.host\.id.long.searchable: true}
173-
- match: {fields.metrics\.host\.id.long.aggregatable: true}
174-
- match: {fields.metrics\.host\.name.keyword.searchable: true}
175-
- match: {fields.metrics\.host\.name.keyword.aggregatable: true}
176-
- match: {fields.metrics\.time.long.searchable: true}
177-
- match: {fields.metrics\.time.long.aggregatable: true}
178-
- match: {fields.metrics\.time\.max.long.searchable: true}
179-
- match: {fields.metrics\.time\.max.long.aggregatable: true}
180-
- match: {fields.metrics\.time\.min.long.searchable: true}
181-
- match: {fields.metrics\.time\.min.long.aggregatable: true}
182-
183-
- do:
184-
get:
185-
index: test-1
186-
id: 1
187-
- match: {_index: "test-1"}
188-
- match: {_id: "1"}
189-
- match: {_version: 1}
190-
- match: {found: true}
191-
- match:
192-
_source:
193-
metrics:
194-
host.name: localhost
195-
host.id: 1
196-
time: 10
197-
time.max: 100
198-
time.min: 1
199-
200-
---
201-
"Root without subobjects with synthetic source":
202-
- requires:
203-
test_runner_features: [ "allowed_warnings", "allowed_warnings_regex" ]
204-
cluster_features: ["mapper.subobjects_auto"]
205-
reason: added in 8.4.0
206-
207-
- do:
208-
allowed_warnings:
209-
- "index template [test] has index patterns [test-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [test] will take precedence during new index creation"
210-
indices.put_index_template:
211-
name: test
212-
body:
213-
index_patterns: test-*
214-
template:
215-
mappings:
216-
_source:
217-
mode: synthetic
218-
subobjects: auto
219-
properties:
220-
host.name:
221-
type: keyword
222-
223-
- do:
224-
allowed_warnings_regex:
225-
- "index \\[test-1\\] matches multiple legacy templates \\[global, test\\], composable templates will only match a single template"
226-
index:
227-
index: test-1
228-
id: 1
229-
refresh: true
230-
body:
231-
{ host.name: localhost, host.id: 1, time: 10, time.max: 100, time.min: 1 }
232-
233-
- do:
234-
field_caps:
235-
index: test-1
236-
fields: [host*, time*]
237-
- match: {fields.host\.name.keyword.searchable: true}
238-
- match: {fields.host\.name.keyword.aggregatable: true}
239-
- match: {fields.host\.id.long.searchable: true}
240-
- match: {fields.host\.id.long.aggregatable: true}
241-
- match: {fields.time.long.searchable: true}
242-
- match: {fields.time.long.aggregatable: true}
243-
- match: {fields.time\.max.long.searchable: true}
244-
- match: {fields.time\.max.long.aggregatable: true}
245-
- match: {fields.time\.min.long.searchable: true}
246-
- match: {fields.time\.min.long.aggregatable: true}
247-
248-
- do:
249-
get:
250-
index: test-1
251-
id: 1
252-
- match: {_index: "test-1"}
253-
- match: {_id: "1"}
254-
- match: {_version: 1}
255-
- match: {found: true}
256-
- match:
257-
_source:
258-
host.name: localhost
259-
host.id: 1
260-
time: 10
261-
time.max: 100
262-
time.min: 1

0 commit comments

Comments
 (0)