[ML] Remove unnecessary version constraints (#60314)

[ML] Remove unnecessary version constraints Remove checks on version numbers from the serialisation code that are no longer necessary in the 8.0.0 branch
elastic · Jul 31, 2020 · 6bc1975 · 6bc1975
1 parent d6dd6bc
commit 6bc1975
Show file tree

Hide file tree

Showing 38 changed files with 161 additions and 525 deletions.
diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java
@@ -13,7 +13,6 @@
 import org.elasticsearch.xpack.core.XPackField;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 
@@ -56,16 +55,8 @@ public MachineLearningFeatureSetUsage(StreamInput in) throws IOException {
         super(in);
         this.jobsUsage = in.readMap();
         this.datafeedsUsage = in.readMap();
-        if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
-            this.analyticsUsage = in.readMap();
-        } else {
-            this.analyticsUsage = Collections.emptyMap();
-        }
-        if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
-            this.inferenceUsage = in.readMap();
-        } else {
-            this.inferenceUsage = Collections.emptyMap();
-        }
+        this.analyticsUsage = in.readMap();
+        this.inferenceUsage = in.readMap();
         this.nodeCount = in.readInt();
     }
 
@@ -79,12 +70,8 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeMap(jobsUsage);
         out.writeMap(datafeedsUsage);
-        if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
-            out.writeMap(analyticsUsage);
-        }
-        if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
-            out.writeMap(inferenceUsage);
-        }
+        out.writeMap(analyticsUsage);
+        out.writeMap(inferenceUsage);
         out.writeInt(nodeCount);
     }
 

diff --git a/.../src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDataFrameAnalyticsAction.java b/.../src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDataFrameAnalyticsAction.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -45,11 +44,7 @@ public static class Request extends AcknowledgedRequest<Request> {
         public Request(StreamInput in) throws IOException {
             super(in);
             id = in.readString();
-            if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
-                force = in.readBoolean();
-            } else {
-                force = false;
-            }
+            force = in.readBoolean();
         }
 
         public Request() {
@@ -97,9 +92,7 @@ public boolean equals(Object o) {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(id);
-            if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
-                out.writeBoolean(force);
-            }
+            out.writeBoolean(force);
         }
 
         @Override

diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
@@ -70,16 +69,9 @@ public Request(Float requestsPerSecond, TimeValue timeValue) {
 
         public Request(StreamInput in) throws IOException {
             super(in);
-            if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
-                this.requestsPerSecond = in.readOptionalFloat();
-                this.timeout = in.readOptionalTimeValue();
-            } else {
-                this.requestsPerSecond = null;
-                this.timeout = null;
-            }
-            if (in.getVersion().onOrAfter(Version.V_7_9_0)) {
-                jobId = in.readOptionalString();
-            }
+            this.requestsPerSecond = in.readOptionalFloat();
+            this.timeout = in.readOptionalTimeValue();
+            this.jobId = in.readOptionalString();
         }
 
         public Float getRequestsPerSecond() {
@@ -137,13 +129,9 @@ public int hashCode() {
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
-            if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
-                out.writeOptionalFloat(requestsPerSecond);
-                out.writeOptionalTimeValue(timeout);
-            }
-            if (out.getVersion().onOrAfter(Version.V_7_9_0)) {
-                out.writeOptionalString(jobId);
-            }
+            out.writeOptionalFloat(requestsPerSecond);
+            out.writeOptionalTimeValue(timeout);
+            out.writeOptionalString(jobId);
         }
     }
 

diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
@@ -91,10 +90,8 @@ public Request() {}
         public Request(StreamInput in) throws IOException {
             super(in);
             indices = in.readStringArray();
-            if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
-                if (in.readBoolean()) {
-                    queryProvider = QueryProvider.fromStream(in);
-                }
+            if (in.readBoolean()) {
+                queryProvider = QueryProvider.fromStream(in);
             }
             evaluation = in.readNamedWriteable(Evaluation.class);
         }
@@ -139,13 +136,11 @@ public ActionRequestValidationException validate() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeStringArray(indices);
-            if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
-                if (queryProvider != null) {
-                    out.writeBoolean(true);
-                    queryProvider.writeTo(out);
-                } else {
-                    out.writeBoolean(false);
-                }
+            if (queryProvider != null) {
+                out.writeBoolean(true);
+                queryProvider.writeTo(out);
+            } else {
+                out.writeBoolean(false);
             }
             out.writeNamedWriteable(evaluation);
         }

diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
@@ -129,9 +128,7 @@ public Request() {
         public Request(StreamInput in) throws IOException {
             super(in);
             linesToSample = in.readOptionalVInt();
-            if (in.getVersion().onOrAfter(Version.V_7_3_0)) {
-                lineMergeSizeLimit = in.readOptionalVInt();
-            }
+            lineMergeSizeLimit = in.readOptionalVInt();
             timeout = in.readOptionalTimeValue();
             charset = in.readOptionalString();
             format = in.readBoolean() ? in.readEnum(FileStructure.Format.class) : null;
@@ -337,9 +334,7 @@ public ActionRequestValidationException validate() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeOptionalVInt(linesToSample);
-            if (out.getVersion().onOrAfter(Version.V_7_3_0)) {
-                out.writeOptionalVInt(lineMergeSizeLimit);
-            }
+            out.writeOptionalVInt(lineMergeSizeLimit);
             out.writeOptionalTimeValue(timeout);
             out.writeOptionalString(charset);
             if (format == null) {

diff --git a/...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ForecastJobAction.java b/...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ForecastJobAction.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.tasks.BaseTasksResponse;
 import org.elasticsearch.common.ParseField;
@@ -83,19 +82,15 @@ public Request(StreamInput in) throws IOException {
             super(in);
             this.duration = in.readOptionalTimeValue();
             this.expiresIn = in.readOptionalTimeValue();
-            if (in.getVersion().onOrAfter(Version.V_7_9_0)) {
-                this.maxModelMemory = in.readOptionalVLong();
-            }
+            this.maxModelMemory = in.readOptionalVLong();
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeOptionalTimeValue(duration);
             out.writeOptionalTimeValue(expiresIn);
-            if (out.getVersion().onOrAfter(Version.V_7_9_0)) {
-                out.writeOptionalVLong(maxModelMemory);
-            }
+            out.writeOptionalVLong(maxModelMemory);
         }
 
         public Request(String jobId) {

diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java
@@ -29,8 +29,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static org.elasticsearch.Version.V_7_4_0;
-
 public class GetDatafeedsStatsAction extends ActionType<GetDatafeedsStatsAction.Response> {
 
     public static final GetDatafeedsStatsAction INSTANCE = new GetDatafeedsStatsAction();
@@ -132,11 +130,7 @@ public DatafeedStats(String datafeedId, DatafeedState datafeedState, @Nullable D
                 datafeedState = DatafeedState.fromStream(in);
                 node = in.readOptionalWriteable(DiscoveryNode::new);
                 assignmentExplanation = in.readOptionalString();
-                if (in.getVersion().onOrAfter(V_7_4_0)) {
-                    timingStats = in.readOptionalWriteable(DatafeedTimingStats::new);
-                } else {
-                    timingStats = null;
-                }
+                timingStats = in.readOptionalWriteable(DatafeedTimingStats::new);
             }
 
             public String getDatafeedId() {
@@ -199,9 +193,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 datafeedState.writeTo(out);
                 out.writeOptionalWriteable(node);
                 out.writeOptionalString(assignmentExplanation);
-                if (out.getVersion().onOrAfter(V_7_4_0)) {
-                    out.writeOptionalWriteable(timingStats);
-                }
+                out.writeOptionalWriteable(timingStats);
             }
 
             @Override

diff --git a/.../plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsStatsAction.java b/.../plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsStatsAction.java
@@ -38,8 +38,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static org.elasticsearch.Version.V_7_3_0;
-
 public class GetJobsStatsAction extends ActionType<GetJobsStatsAction.Response> {
 
     public static final GetJobsStatsAction INSTANCE = new GetJobsStatsAction();
@@ -174,11 +172,7 @@ public JobStats(StreamInput in) throws IOException {
                 assignmentExplanation = in.readOptionalString();
                 openTime = in.readOptionalTimeValue();
                 forecastStats = in.readOptionalWriteable(ForecastStats::new);
-                if (in.getVersion().onOrAfter(V_7_3_0)) {
-                    timingStats = in.readOptionalWriteable(TimingStats::new);
-                } else {
-                    timingStats = null;
-                }
+                timingStats = in.readOptionalWriteable(TimingStats::new);
             }
 
             public String getJobId() {
@@ -277,9 +271,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeOptionalString(assignmentExplanation);
                 out.writeOptionalTimeValue(openTime);
                 out.writeOptionalWriteable(forecastStats);
-                if (out.getVersion().onOrAfter(V_7_3_0)) {
-                    out.writeOptionalWriteable(timingStats);
-                }
+                out.writeOptionalWriteable(timingStats);
             }
 
             @Override

diff --git a/...gin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsAction.java b/...gin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsAction.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -49,11 +48,7 @@ public Request(String id, boolean includeModelDefinition, List<String> tags) {
         public Request(StreamInput in) throws IOException {
             super(in);
             this.includeModelDefinition = in.readBoolean();
-            if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
-                this.tags = in.readStringList();
-            } else {
-                this.tags = Collections.emptyList();
-            }
+            this.tags = in.readStringList();
         }
 
         @Override
@@ -73,9 +68,7 @@ public List<String> getTags() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeBoolean(includeModelDefinition);
-            if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
-                out.writeStringCollection(tags);
-            }
+            out.writeStringCollection(tags);
         }
 
         @Override

diff --git a/...ore/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java b/...ore/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java
@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.core.ml.action;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -93,11 +92,7 @@ public TrainedModelStats(StreamInput in) throws IOException {
                 modelId = in.readString();
                 ingestStats = new IngestStats(in);
                 pipelineCount = in.readVInt();
-                if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
-                    this.inferenceStats = in.readOptionalWriteable(InferenceStats::new);
-                } else {
-                    this.inferenceStats = null;
-                }
+                this.inferenceStats = in.readOptionalWriteable(InferenceStats::new);
             }
 
             public String getModelId() {
@@ -133,9 +128,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeString(modelId);
                 ingestStats.writeTo(out);
                 out.writeVInt(pipelineCount);
-                if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
-                    out.writeOptionalWriteable(this.inferenceStats);
-                }
+                out.writeOptionalWriteable(this.inferenceStats);
             }
 
             @Override

diff --git a/...e/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDataFrameAnalyticsAction.java b/...e/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDataFrameAnalyticsAction.java
@@ -184,16 +184,8 @@ private TaskParams(String id, String version, @Nullable List<PhaseProgress> prog
         public TaskParams(StreamInput in) throws IOException {
             this.id = in.readString();
             this.version = Version.readVersion(in);
-            if (in.getVersion().onOrAfter(Version.V_7_5_0)) {
-                progressOnStart = in.readList(PhaseProgress::new);
-            } else {
-                progressOnStart = Collections.emptyList();
-            }
-            if (in.getVersion().onOrAfter(Version.V_7_5_0)) {
-                allowLazyStart = in.readBoolean();
-            } else {
-                allowLazyStart = false;
-            }
+            progressOnStart = in.readList(PhaseProgress::new);
+            allowLazyStart = in.readBoolean();
         }
 
         public String getId() {
@@ -222,12 +214,8 @@ public Version getMinimalSupportedVersion() {
         public void writeTo(StreamOutput out) throws IOException {
             out.writeString(id);
             Version.writeVersion(version, out);
-            if (out.getVersion().onOrAfter(Version.V_7_5_0)) {
-                out.writeList(progressOnStart);
-            }
-            if (out.getVersion().onOrAfter(Version.V_7_5_0)) {
-                out.writeBoolean(allowLazyStart);
-            }
+            out.writeList(progressOnStart);
+            out.writeBoolean(allowLazyStart);
         }
 
         @Override