From 4db91f4b56e3b91b84c9720713424caf4339ca87 Mon Sep 17 00:00:00 2001 From: Benjamin Trent <4357155+benwtrent@users.noreply.github.com> Date: Mon, 18 Nov 2019 12:23:59 -0500 Subject: [PATCH] [ML][Inference] adjusting bwc after backport --- .../xpack/core/ml/MachineLearningFeatureSetUsage.java | 4 ++-- .../core/ml/inference/trainedmodel/ClassificationConfig.java | 2 +- .../core/ml/inference/trainedmodel/RegressionConfig.java | 2 +- .../ml/inference/ingest/InferenceProcessorFactoryTests.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java index d57235f15609f..29ddbc76526e4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java @@ -61,7 +61,7 @@ public MachineLearningFeatureSetUsage(StreamInput in) throws IOException { } else { this.analyticsUsage = Collections.emptyMap(); } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getVersion().onOrAfter(Version.V_7_6_0)) { this.inferenceUsage = in.readMap(); } else { this.inferenceUsage = Collections.emptyMap(); @@ -77,7 +77,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_7_4_0)) { out.writeMap(analyticsUsage); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getVersion().onOrAfter(Version.V_7_6_0)) { out.writeMap(inferenceUsage); } out.writeInt(nodeCount); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ClassificationConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ClassificationConfig.java index 4c9fc4d89e93b..f7da41eda7bd6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ClassificationConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ClassificationConfig.java @@ -22,7 +22,7 @@ public class ClassificationConfig implements InferenceConfig { public static final String NAME = "classification"; public static final ParseField NUM_TOP_CLASSES = new ParseField("num_top_classes"); - private static final Version MIN_SUPPORTED_VERSION = Version.V_8_0_0; + private static final Version MIN_SUPPORTED_VERSION = Version.V_7_6_0; public static ClassificationConfig EMPTY_PARAMS = new ClassificationConfig(0); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/RegressionConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/RegressionConfig.java index 58bd7bbd3d558..6dd03e87747e7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/RegressionConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/RegressionConfig.java @@ -18,7 +18,7 @@ public class RegressionConfig implements InferenceConfig { public static final String NAME = "regression"; - private static final Version MIN_SUPPORTED_VERSION = Version.V_8_0_0; + private static final Version MIN_SUPPORTED_VERSION = Version.V_7_6_0; public static RegressionConfig fromMap(Map map) { if (map.isEmpty() == false) { diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessorFactoryTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessorFactoryTests.java index 3337ad7be53a1..db9f60d5b7764 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessorFactoryTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessorFactoryTests.java @@ -176,7 +176,7 @@ public void testCreateProcessorWithTooOldMinNodeVersion() throws IOException { fail("Should not have successfully created"); } catch (ElasticsearchException ex) { assertThat(ex.getMessage(), - equalTo("Configuration [regression] requires minimum node version [8.0.0] (current minimum node version [7.5.0]")); + equalTo("Configuration [regression] requires minimum node version [7.6.0] (current minimum node version [7.5.0]")); } catch (Exception ex) { fail(ex.getMessage()); } @@ -194,7 +194,7 @@ public void testCreateProcessorWithTooOldMinNodeVersion() throws IOException { fail("Should not have successfully created"); } catch (ElasticsearchException ex) { assertThat(ex.getMessage(), - equalTo("Configuration [classification] requires minimum node version [8.0.0] (current minimum node version [7.5.0]")); + equalTo("Configuration [classification] requires minimum node version [7.6.0] (current minimum node version [7.5.0]")); } catch (Exception ex) { fail(ex.getMessage()); }