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

Changing version semantics to be more readable 

The Version class had hard to understand semantics when two versions were
compared against each other.

Sample of the new logic:
* V_0_20_0.before(V_0_90_0) => true
* V_0_90_0.after(V_0_20_0)  => true

Closes #3124
This commit is contained in:
Alexander Reelsen 2013-05-31 17:01:21 +02:00
parent 3417b945dd
commit 609ad0e572
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/elasticsearch/Version.java
View File

@ -261,21 +261,21 @@ public class Version implements Serializable {
}
public boolean after(Version version) {
return version.id > id;
}
public boolean onOrAfter(Version version) {
return version.id >= id;
}
public boolean before(Version version) {
return version.id < id;
}
public boolean onOrBefore(Version version) {
public boolean onOrAfter(Version version) {
return version.id <= id;
}
public boolean before(Version version) {
return version.id > id;
}
public boolean onOrBefore(Version version) {
return version.id >= id;
}
/**
* Just the version number (without -SNAPSHOT if snapshot).
*/

4
src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java
View File

@ -595,7 +595,7 @@ public class MoreLikeThisRequest extends ActionRequest<MoreLikeThisRequest> {
searchSize = in.readVInt();
searchFrom = in.readVInt();
if (Version.V_0_90_1.onOrAfter(in.getVersion())) {
if (in.getVersion().onOrAfter(Version.V_0_90_1)) {
routing = in.readOptionalString();
}
}
@ -665,7 +665,7 @@ public class MoreLikeThisRequest extends ActionRequest<MoreLikeThisRequest> {
out.writeVInt(searchSize);
out.writeVInt(searchFrom);
if (Version.V_0_90_1.onOrAfter(out.getVersion())) {
if (out.getVersion().onOrAfter(Version.V_0_90_1)) {
out.writeOptionalString(routing);
}
}

26
src/test/java/org/elasticsearch/test/unit/VersionTests.java
View File

@ -19,6 +19,32 @@
package org.elasticsearch.test.unit;
import org.testng.annotations.Test;
import static org.elasticsearch.Version.V_0_20_0;
import static org.elasticsearch.Version.V_0_90_0;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
public class VersionTests {
@Test
public void testVersions() throws Exception {
assertThat(V_0_20_0.before(V_0_90_0), is(true));
assertThat(V_0_20_0.before(V_0_20_0), is(false));
assertThat(V_0_90_0.before(V_0_20_0), is(false));
assertThat(V_0_20_0.onOrBefore(V_0_90_0), is(true));
assertThat(V_0_20_0.onOrBefore(V_0_20_0), is(true));
assertThat(V_0_90_0.onOrBefore(V_0_20_0), is(false));
assertThat(V_0_20_0.after(V_0_90_0), is(false));
assertThat(V_0_20_0.after(V_0_20_0), is(false));
assertThat(V_0_90_0.after(V_0_20_0), is(true));
assertThat(V_0_20_0.onOrAfter(V_0_90_0), is(false));
assertThat(V_0_20_0.onOrAfter(V_0_20_0), is(true));
assertThat(V_0_90_0.onOrAfter(V_0_20_0), is(true));
}
}