Skip to content

[ML] JIndex: Replace Version.CURRENT in streaming functions #36118

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
Dec 3, 2018
Merged

[ML] JIndex: Replace Version.CURRENT in streaming functions #36118

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 x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/OpenJobAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDatafeedAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
6 changes: 2 additions & 4 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand All @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
16 changes: 8 additions & 8 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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() {
Expand Down