[ML] Replace Version.CURRENT in streaming functions (#36118)

elastic · Dec 3, 2018 · fd1e6d4 · fd1e6d4
1 parent f048c52
commit fd1e6d4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java
@@ -174,7 +174,7 @@ public JobParams(String jobId) {
         public JobParams(StreamInput in) throws IOException {
             jobId = in.readString();
             timeout = TimeValue.timeValueMillis(in.readVLong());
-            if (in.getVersion().onOrAfter(Version.CURRENT)) {
+            if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
                 job = in.readOptionalWriteable(Job::new);
             }
         }
@@ -213,7 +213,7 @@ public String getWriteableName() {
         public void writeTo(StreamOutput out) throws IOException {
             out.writeString(jobId);
             out.writeVLong(timeout.millis());
-            if (out.getVersion().onOrAfter(Version.CURRENT)) {
+            if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
                 out.writeOptionalWriteable(job);
             }
         }

diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java
@@ -195,7 +195,7 @@ public DatafeedParams(StreamInput in) throws IOException {
             startTime = in.readVLong();
             endTime = in.readOptionalLong();
             timeout = TimeValue.timeValueMillis(in.readVLong());
-            if (in.getVersion().onOrAfter(Version.CURRENT)) {
+            if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
                 jobId = in.readOptionalString();
                 datafeedIndices = in.readList(StreamInput::readString);
             }
@@ -272,7 +272,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeVLong(startTime);
             out.writeOptionalLong(endTime);
             out.writeVLong(timeout.millis());
-            if (out.getVersion().onOrAfter(Version.CURRENT)) {
+            if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
                 out.writeOptionalString(jobId);
                 out.writeStringList(datafeedIndices);
             }

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java
@@ -97,8 +97,7 @@ public void readFrom(StreamInput in) throws IOException {
             } else {
                 isInternal = false;
             }
-            // TODO jindex change CURRENT to specific version when feature branch is merged
-            if (in.getVersion().onOrAfter(Version.V_6_3_0) && in.getVersion().before(Version.CURRENT)) {
+            if (in.getVersion().onOrAfter(Version.V_6_3_0) && in.getVersion().before(Version.V_7_0_0)) {
                 in.readBoolean(); // was waitForAck
             }
         }
@@ -111,8 +110,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getVersion().onOrAfter(Version.V_6_2_2)) {
                 out.writeBoolean(isInternal);
             }
-            // TODO jindex change CURRENT to specific version when feature branch is merged
-            if (out.getVersion().onOrAfter(Version.V_6_3_0) && out.getVersion().before(Version.CURRENT)) {
+            if (out.getVersion().onOrAfter(Version.V_6_3_0) && out.getVersion().before(Version.V_7_0_0)) {
                 out.writeBoolean(false); // was waitForAck
             }
         }

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java
@@ -809,7 +809,7 @@ public Builder setModelSnapshotMinVersion(Version modelSnapshotMinVersion) {
             return this;
         }
 
-        public Builder setModelSnapshotMinVersion(String modelSnapshotMinVersion) {
+        Builder setModelSnapshotMinVersion(String modelSnapshotMinVersion) {
             this.modelSnapshotMinVersion = Version.fromString(modelSnapshotMinVersion);
             return this;
         }

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java
@@ -140,16 +140,16 @@ public JobUpdate(StreamInput in) throws IOException {
         } else {
             jobVersion = null;
         }
+        if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
+            clearJobFinishTime = in.readOptionalBoolean();
+        } else {
+            clearJobFinishTime = null;
+        }
         if (in.getVersion().onOrAfter(Version.V_7_0_0) && in.readBoolean()) {
             modelSnapshotMinVersion = Version.readVersion(in);
         } else {
             modelSnapshotMinVersion = null;
         }
-        if (in.getVersion().onOrAfter(Version.CURRENT)) {  // NORELEASE change current to Jindex release version
-            clearJobFinishTime = in.readOptionalBoolean();
-        } else {
-            clearJobFinishTime = null;
-        }
     }
 
     @Override
@@ -188,6 +188,9 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeBoolean(false);
             }
         }
+        if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
+            out.writeOptionalBoolean(clearJobFinishTime);
+        }
         if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
             if (modelSnapshotMinVersion != null) {
                 out.writeBoolean(true);
@@ -196,9 +199,6 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeBoolean(false);
             }
         }
-        if (out.getVersion().onOrAfter(Version.CURRENT)) { // NORELEASE change current to Jindex release version
-            out.writeOptionalBoolean(clearJobFinishTime);
-        }
     }
 
     public String getJobId() {