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

Update version in SearchRequest and related test 

Version needs to be updated after backporting #36997 & #37142
where we added support for providing and serializing localClusterAlias
as well ass absoluteStartMillis.

Relates to #36997 & #37142
This commit is contained in:
Luca Cavanna 2019-01-07 11:38:57 +01:00
parent f307847f29
commit e34658edba
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/action/search/SearchRequest.java
View File

@ -179,8 +179,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
if (in.getVersion().onOrAfter(Version.V_6_3_0)) { if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
allowPartialSearchResults = in.readOptionalBoolean(); allowPartialSearchResults = in.readOptionalBoolean();
} }
//TODO update version after backport if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
localClusterAlias = in.readOptionalString(); localClusterAlias = in.readOptionalString();
if (localClusterAlias != null) { if (localClusterAlias != null) {
absoluteStartMillis = in.readVLong(); absoluteStartMillis = in.readVLong();
@ -211,8 +210,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
if (out.getVersion().onOrAfter(Version.V_6_3_0)) { if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
out.writeOptionalBoolean(allowPartialSearchResults); out.writeOptionalBoolean(allowPartialSearchResults);
} }
//TODO update version after backport if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeOptionalString(localClusterAlias); out.writeOptionalString(localClusterAlias);
if (localClusterAlias != null) { if (localClusterAlias != null) {
out.writeVLong(absoluteStartMillis); out.writeVLong(absoluteStartMillis);

8
server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java
View File

@ -76,8 +76,7 @@ public class SearchRequestTests extends AbstractSearchTestCase {
SearchRequest searchRequest = createSearchRequest(); SearchRequest searchRequest = createSearchRequest();
Version version = VersionUtils.randomVersion(random()); Version version = VersionUtils.randomVersion(random());
SearchRequest deserializedRequest = copyWriteable(searchRequest, namedWriteableRegistry, SearchRequest::new, version); SearchRequest deserializedRequest = copyWriteable(searchRequest, namedWriteableRegistry, SearchRequest::new, version);
//TODO update version after backport if (version.before(Version.V_6_7_0)) {
if (version.before(Version.V_7_0_0)) {
assertNull(deserializedRequest.getLocalClusterAlias()); assertNull(deserializedRequest.getLocalClusterAlias());
assertAbsoluteStartMillisIsCurrentTime(deserializedRequest); assertAbsoluteStartMillisIsCurrentTime(deserializedRequest);
} else { } else {
@ -86,11 +85,10 @@ public class SearchRequestTests extends AbstractSearchTestCase {
} }
} }
//TODO rename and update version after backport public void testReadFromPre6_7_0() throws IOException {
public void testReadFromPre7_0_0() throws IOException {
String msg = "AAEBBWluZGV4AAAAAQACAAAA/////w8AAAAAAAAA/////w8AAAAAAAACAAAAAAABAAMCBAUBAAKABACAAQIAAA=="; String msg = "AAEBBWluZGV4AAAAAQACAAAA/////w8AAAAAAAAA/////w8AAAAAAAACAAAAAAABAAMCBAUBAAKABACAAQIAAA==";
try (StreamInput in = StreamInput.wrap(Base64.getDecoder().decode(msg))) { try (StreamInput in = StreamInput.wrap(Base64.getDecoder().decode(msg))) {
in.setVersion(VersionUtils.randomVersionBetween(random(), Version.V_6_4_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))); in.setVersion(VersionUtils.randomVersionBetween(random(), Version.V_6_4_0, VersionUtils.getPreviousVersion(Version.V_6_7_0)));
SearchRequest searchRequest = new SearchRequest(in); SearchRequest searchRequest = new SearchRequest(in);
assertArrayEquals(new String[]{"index"}, searchRequest.indices()); assertArrayEquals(new String[]{"index"}, searchRequest.indices());
assertNull(searchRequest.getLocalClusterAlias()); assertNull(searchRequest.getLocalClusterAlias());