Skip to content

Commit 1256558

Browse files
[ML] Adjust versions and unmute DFA bwc tests (elastic#69294)
... after backporting elastic#69183
1 parent 333e5cf commit 1256558

File tree

5 files changed

+4
-36
lines changed

5 files changed

+4
-36
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java

+4-17
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
package org.elasticsearch.xpack.core.ml.dataframe;
88

99
import org.elasticsearch.ElasticsearchException;
10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.common.Nullable;
1211
import org.elasticsearch.common.ParseField;
1312
import org.elasticsearch.common.Strings;
@@ -89,16 +88,8 @@ public DataFrameAnalyticsSource(String[] index, @Nullable QueryProvider queryPro
8988
public DataFrameAnalyticsSource(StreamInput in) throws IOException {
9089
index = in.readStringArray();
9190
queryProvider = QueryProvider.fromStream(in);
92-
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
93-
sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new);
94-
} else {
95-
sourceFiltering = null;
96-
}
97-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
98-
runtimeMappings = in.readMap();
99-
} else {
100-
runtimeMappings = Collections.emptyMap();
101-
}
91+
sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new);
92+
runtimeMappings = in.readMap();
10293
}
10394

10495
public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) {
@@ -113,12 +104,8 @@ public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) {
113104
public void writeTo(StreamOutput out) throws IOException {
114105
out.writeStringArray(index);
115106
queryProvider.writeTo(out);
116-
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
117-
out.writeOptionalWriteable(sourceFiltering);
118-
}
119-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
120-
out.writeMap(runtimeMappings);
121-
}
107+
out.writeOptionalWriteable(sourceFiltering);
108+
out.writeMap(runtimeMappings);
122109
}
123110

124111
@Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java

-6
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@ public static DataFrameAnalyticsSource createRandom() {
8484
}
8585

8686
public static DataFrameAnalyticsSource mutateForVersion(DataFrameAnalyticsSource instance, Version version) {
87-
if (version.before(Version.V_7_6_0)) {
88-
return new DataFrameAnalyticsSource(instance.getIndex(), instance.getQueryProvider(), null, null);
89-
}
90-
if (version.before(Version.V_8_0_0)) {
91-
return new DataFrameAnalyticsSource(instance.getIndex(), instance.getQueryProvider(), instance.getSourceFiltering(), null);
92-
}
9387
return instance;
9488
}
9589

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/pull/69183"
5-
61
---
72
"Get old outlier_detection job":
83

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/pull/69183"
52

63
- do:
74
index:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/pull/69183"
5-
61
---
72
"Get old cluster outlier_detection job":
83

0 commit comments

Comments
 (0)