honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust SearchRequest version checks (#38181)

Browse Source 
The finalReduce flag is now supported on 6.x too, hence we need to update the version checks in master.
This commit is contained in:
Luca Cavanna 2019-02-01 19:23:13 +01:00 committed by GitHub
parent 70235838d1
commit ee57420de6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,17 +205,14 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
localClusterAlias = in.readOptionalString(); localClusterAlias = in.readOptionalString();
if (localClusterAlias != null) { if (localClusterAlias != null) {
absoluteStartMillis = in.readVLong(); absoluteStartMillis = in.readVLong();
finalReduce = in.readBoolean();
} else { } else {
absoluteStartMillis = DEFAULT_ABSOLUTE_START_MILLIS; absoluteStartMillis = DEFAULT_ABSOLUTE_START_MILLIS;
finalReduce = true;
} }
} else { } else {
localClusterAlias = null; localClusterAlias = null;
absoluteStartMillis = DEFAULT_ABSOLUTE_START_MILLIS; absoluteStartMillis = DEFAULT_ABSOLUTE_START_MILLIS;
}
//TODO move to the 6_7_0 branch once backported to 6.x
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
finalReduce = in.readBoolean();
} else {
finalReduce = true; finalReduce = true;
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0)) { if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
@ -245,12 +242,9 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
out.writeOptionalString(localClusterAlias); out.writeOptionalString(localClusterAlias);
if (localClusterAlias != null) { if (localClusterAlias != null) {
out.writeVLong(absoluteStartMillis); out.writeVLong(absoluteStartMillis);
}
}
//TODO move to the 6_7_0 branch once backported to 6.x
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeBoolean(finalReduce); out.writeBoolean(finalReduce);
} }
}
if (out.getVersion().onOrAfter(Version.V_7_0_0)) { if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeBoolean(ccsMinimizeRoundtrips); out.writeBoolean(ccsMinimizeRoundtrips);
} }

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

@ -91,14 +91,10 @@ public class SearchRequestTests extends AbstractSearchTestCase {
if (version.before(Version.V_6_7_0)) { if (version.before(Version.V_6_7_0)) {
assertNull(deserializedRequest.getLocalClusterAlias()); assertNull(deserializedRequest.getLocalClusterAlias());
assertAbsoluteStartMillisIsCurrentTime(deserializedRequest); assertAbsoluteStartMillisIsCurrentTime(deserializedRequest);
assertTrue(deserializedRequest.isFinalReduce());
} else { } else {
assertEquals(searchRequest.getLocalClusterAlias(), deserializedRequest.getLocalClusterAlias()); assertEquals(searchRequest.getLocalClusterAlias(), deserializedRequest.getLocalClusterAlias());
assertEquals(searchRequest.getOrCreateAbsoluteStartMillis(), deserializedRequest.getOrCreateAbsoluteStartMillis()); assertEquals(searchRequest.getOrCreateAbsoluteStartMillis(), deserializedRequest.getOrCreateAbsoluteStartMillis());
}
//TODO move to the 6_7_0 branch once backported to 6.x
if (version.before(Version.V_7_0_0)) {
assertTrue(deserializedRequest.isFinalReduce());
} else {
assertEquals(searchRequest.isFinalReduce(), deserializedRequest.isFinalReduce()); assertEquals(searchRequest.isFinalReduce(), deserializedRequest.isFinalReduce());
} }
} }

1
server/src/test/java/org/elasticsearch/action/search/TransportSearchActionSingleNodeTests.java
View File

@ -171,6 +171,7 @@ public class TransportSearchActionSingleNodeTests extends ESSingleNodeTestCase {
assertEquals(2, searchResponse.getHits().getTotalHits().value); assertEquals(2, searchResponse.getHits().getTotalHits().value);
Aggregations aggregations = searchResponse.getAggregations(); Aggregations aggregations = searchResponse.getAggregations();
LongTerms longTerms = aggregations.get("terms"); LongTerms longTerms = aggregations.get("terms");
assertEquals(2, longTerms.getBuckets().size());
} }
} }
} }