[ML] Adjust versions and unmute DFA bwc tests (#69294)

... after backporting #69183
elastic · Feb 20, 2021 · 1256558 · 1256558
1 parent 333e5cf
commit 1256558
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 36 deletions.
diff --git a/...ore/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java b/...ore/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java
@@ -7,7 +7,6 @@
 package org.elasticsearch.xpack.core.ml.dataframe;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;
@@ -89,16 +88,8 @@ public DataFrameAnalyticsSource(String[] index, @Nullable QueryProvider queryPro
     public DataFrameAnalyticsSource(StreamInput in) throws IOException {
         index = in.readStringArray();
         queryProvider = QueryProvider.fromStream(in);
-        if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
-            sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new);
-        } else {
-            sourceFiltering = null;
-        }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
-            runtimeMappings = in.readMap();
-        } else {
-            runtimeMappings = Collections.emptyMap();
-        }
+        sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new);
+        runtimeMappings = in.readMap();
     }
 
     public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) {
@@ -113,12 +104,8 @@ public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArray(index);
         queryProvider.writeTo(out);
-        if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
-            out.writeOptionalWriteable(sourceFiltering);
-        }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
-            out.writeMap(runtimeMappings);
-        }
+        out.writeOptionalWriteable(sourceFiltering);
+        out.writeMap(runtimeMappings);
     }
 
     @Override

diff --git a/...rc/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java b/...rc/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java
@@ -84,12 +84,6 @@ public static DataFrameAnalyticsSource createRandom() {
     }
 
     public static DataFrameAnalyticsSource mutateForVersion(DataFrameAnalyticsSource instance, Version version) {
-        if (version.before(Version.V_7_6_0)) {
-            return new DataFrameAnalyticsSource(instance.getIndex(), instance.getQueryProvider(), null, null);
-        }
-        if (version.before(Version.V_8_0_0)) {
-            return new DataFrameAnalyticsSource(instance.getIndex(), instance.getQueryProvider(), instance.getSourceFiltering(), null);
-        }
         return instance;
     }
 

diff --git a/...e/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml b/...e/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml
@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      version: "all"
-      reason:  "Until backport of https://github.com/elastic/elasticsearch/pull/69183"
-
 ---
 "Get old outlier_detection job":
 

diff --git a/...ade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml b/...ade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: "all"
-      reason:  "Until backport of https://github.com/elastic/elasticsearch/pull/69183"
 
   - do:
       index:

diff --git a/...rc/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml b/...rc/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml
@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      version: "all"
-      reason:  "Until backport of https://github.com/elastic/elasticsearch/pull/69183"
-
 ---
 "Get old cluster outlier_detection job":