Skip to content

[ML][Inference] adjusting bwc after backport #49258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2019
Merged

[ML][Inference] adjusting bwc after backport #49258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...in/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ClassificationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/RegressionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object> map) {
if (map.isEmpty() == false) {
Expand Down
4 changes: 2 additions & 2 deletions ...test/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessorFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand All @@ -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());
}
Expand Down