honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] New JobState enum values needs to be bwc with 5.4 (elastic/x-pack-elasticsearch#1444) 

Original commit: elastic/x-pack-elasticsearch@b44d167719
This commit is contained in:
David Kyle 2017-05-17 10:18:08 +01:00 committed by GitHub
parent 446a08b391
commit bbf397181e
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobState.java
View File

@ -5,6 +5,7 @@
*/
package org.elasticsearch.xpack.ml.job.config;
import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
@ -22,7 +23,7 @@ import java.util.Locale;
*/
public enum JobState implements ToXContent, Writeable {
CLOSING, CLOSED, OPENING, OPENED, FAILED;
CLOSING, CLOSED, OPENED, FAILED, OPENING;
public static JobState fromString(String name) {
return valueOf(name.trim().toUpperCase(Locale.ROOT));
@ -34,7 +35,12 @@ public enum JobState implements ToXContent, Writeable {
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeEnum(this);
JobState state = this;
// Pre v5.5 the OPENING state didn't exist
if (this == OPENING && out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
state = CLOSED;
}
out.writeEnum(state);
}
@Override

49
plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobStateTests.java
View File

@ -5,7 +5,19 @@
*/
package org.elasticsearch.xpack.ml.job.config;
import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.test.ESTestCase;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.IOException;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class JobStateTests extends ESTestCase {
@ -30,9 +42,9 @@ public class JobStateTests extends ESTestCase {
public void testValidOrdinals() {
assertEquals(0, JobState.CLOSING.ordinal());
assertEquals(1, JobState.CLOSED.ordinal());
assertEquals(2, JobState.OPENING.ordinal());
assertEquals(3, JobState.OPENED.ordinal());
assertEquals(4, JobState.FAILED.ordinal());
assertEquals(2, JobState.OPENED.ordinal());
assertEquals(3, JobState.FAILED.ordinal());
assertEquals(4, JobState.OPENING.ordinal());
}
public void testIsAnyOf() {
@ -48,4 +60,35 @@ public class JobStateTests extends ESTestCase {
assertTrue(JobState.CLOSED.isAnyOf(JobState.CLOSED));
assertTrue(JobState.CLOSING.isAnyOf(JobState.CLOSING));
}
@SuppressWarnings("unchecked")
public void testStreaming_v54BackwardsCompatibility() throws IOException {
StreamOutput out = mock(StreamOutput.class);
when(out.getVersion()).thenReturn(Version.V_5_4_0_UNRELEASED);
ArgumentCaptor<Enum> enumCaptor = ArgumentCaptor.forClass(Enum.class);
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocationOnMock) {
return null;
}
}).when(out).writeEnum(enumCaptor.capture());
// OPENING state was introduced in v5.5.
// Pre v5.5 its translated as CLOSED
JobState.OPENING.writeTo(out);
assertEquals(JobState.CLOSED, enumCaptor.getValue());
when(out.getVersion()).thenReturn(Version.V_5_5_0_UNRELEASED);
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocationOnMock) {
return null;
}
}).when(out).writeEnum(enumCaptor.capture());
JobState.OPENING.writeTo(out);
assertEquals(JobState.OPENING, enumCaptor.getValue());
}
}