Skip to content

Commit 6790cc2

Browse files
[ml] Fix randomize_seed versions and unmute BWC tests (elastic#50027)
... now that elastic#49990 has been backported. Relates elastic#49990
1 parent 022e5f5 commit 6790cc2

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/Classification.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public Classification(StreamInput in) throws IOException {
119119
predictionFieldName = in.readOptionalString();
120120
numTopClasses = in.readOptionalVInt();
121121
trainingPercent = in.readDouble();
122-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
122+
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
123123
randomizeSeed = in.readOptionalLong();
124124
} else {
125125
randomizeSeed = Randomness.get().nextLong();
@@ -163,7 +163,7 @@ public void writeTo(StreamOutput out) throws IOException {
163163
out.writeOptionalString(predictionFieldName);
164164
out.writeOptionalVInt(numTopClasses);
165165
out.writeDouble(trainingPercent);
166-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
166+
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
167167
out.writeOptionalLong(randomizeSeed);
168168
}
169169
}
@@ -180,7 +180,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
180180
builder.field(PREDICTION_FIELD_NAME.getPreferredName(), predictionFieldName);
181181
}
182182
builder.field(TRAINING_PERCENT.getPreferredName(), trainingPercent);
183-
if (version.onOrAfter(Version.CURRENT)) {
183+
if (version.onOrAfter(Version.V_7_6_0)) {
184184
builder.field(RANDOMIZE_SEED.getPreferredName(), randomizeSeed);
185185
}
186186
builder.endObject();

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/Regression.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public Regression(StreamInput in) throws IOException {
9191
boostedTreeParams = new BoostedTreeParams(in);
9292
predictionFieldName = in.readOptionalString();
9393
trainingPercent = in.readDouble();
94-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
94+
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
9595
randomizeSeed = in.readOptionalLong();
9696
} else {
9797
randomizeSeed = Randomness.get().nextLong();
@@ -130,7 +130,7 @@ public void writeTo(StreamOutput out) throws IOException {
130130
boostedTreeParams.writeTo(out);
131131
out.writeOptionalString(predictionFieldName);
132132
out.writeDouble(trainingPercent);
133-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
133+
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
134134
out.writeOptionalLong(randomizeSeed);
135135
}
136136
}
@@ -146,7 +146,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
146146
builder.field(PREDICTION_FIELD_NAME.getPreferredName(), predictionFieldName);
147147
}
148148
builder.field(TRAINING_PERCENT.getPreferredName(), trainingPercent);
149-
if (version.onOrAfter(Version.CURRENT)) {
149+
if (version.onOrAfter(Version.V_7_6_0)) {
150150
builder.field(RANDOMIZE_SEED.getPreferredName(), randomizeSeed);
151151
}
152152
builder.endObject();

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/49690"
5-
61
---
72
"Get old outlier_detection job":
83

@@ -65,6 +60,7 @@ setup:
6560
- match: { data_frame_analytics.0.dest.index: "old_cluster_regression_job_results" }
6661
- match: { data_frame_analytics.0.analysis.regression.dependent_variable: "foo" }
6762
- match: { data_frame_analytics.0.analysis.regression.training_percent: 100.0 }
63+
- is_true: data_frame_analytics.0.analysis.regression.randomize_seed
6864

6965
---
7066
"Get old regression job stats":

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/49690"
52

63
- do:
74
index:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/49690"
5-
61
---
72
"Get old cluster outlier_detection job":
83

@@ -45,6 +40,7 @@ setup:
4540
- match: { data_frame_analytics.0.dest.index: "old_cluster_regression_job_results" }
4641
- match: { data_frame_analytics.0.analysis.regression.dependent_variable: "foo" }
4742
- match: { data_frame_analytics.0.analysis.regression.training_percent: 100.0 }
43+
- is_true: data_frame_analytics.0.analysis.regression.randomize_seed
4844

4945
---
5046
"Get old cluster regression job stats":

0 commit comments

Comments
 (0)