diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java index 496398275bf..c697ebb02a3 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java @@ -222,8 +222,7 @@ public class Job extends AbstractDiffable implements Writeable, ToXContentO createTime = new Date(in.readVLong()); finishedTime = in.readBoolean() ? new Date(in.readVLong()) : null; lastDataTime = in.readBoolean() ? new Date(in.readVLong()) : null; - // TODO: set to V_6_1_0 after backporting - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_1_0)) { establishedModelMemory = in.readOptionalLong(); } else { establishedModelMemory = null; @@ -484,8 +483,7 @@ public class Job extends AbstractDiffable implements Writeable, ToXContentO } else { out.writeBoolean(false); } - // TODO: set to V_6_1_0 after backporting - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_1_0)) { out.writeOptionalLong(establishedModelMemory); } analysisConfig.writeTo(out); @@ -707,8 +705,7 @@ public class Job extends AbstractDiffable implements Writeable, ToXContentO createTime = in.readBoolean() ? new Date(in.readVLong()) : null; finishedTime = in.readBoolean() ? new Date(in.readVLong()) : null; lastDataTime = in.readBoolean() ? new Date(in.readVLong()) : null; - // TODO: set to V_6_1_0 after backporting - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_1_0)) { establishedModelMemory = in.readOptionalLong(); } analysisConfig = in.readOptionalWriteable(AnalysisConfig::new); @@ -896,8 +893,7 @@ public class Job extends AbstractDiffable implements Writeable, ToXContentO } else { out.writeBoolean(false); } - // TODO: set to V_6_1_0 after backporting - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_1_0)) { out.writeOptionalLong(establishedModelMemory); } out.writeOptionalWriteable(analysisConfig); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobUpdate.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobUpdate.java index 7c41af6bf4f..b78b7afa042 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobUpdate.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobUpdate.java @@ -124,8 +124,7 @@ public class JobUpdate implements Writeable, ToXContentObject { } customSettings = in.readMap(); modelSnapshotId = in.readOptionalString(); - // TODO: set to V_6_1_0 after backporting - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_1_0)) { establishedModelMemory = in.readOptionalLong(); } else { establishedModelMemory = null; @@ -156,8 +155,7 @@ public class JobUpdate implements Writeable, ToXContentObject { } out.writeMap(customSettings); out.writeOptionalString(modelSnapshotId); - // TODO: set to V_6_1_0 after backporting - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_1_0)) { out.writeOptionalLong(establishedModelMemory); } }