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

Test fix - reenable BWC tests and lower version checks now that PR 28440 for allowPartialSearchResults flag backported to 6.x (#28482)

Browse Source 
Support for allowPartialSearchResults is now in 6.3 so changing master BWC checks accordingly
This commit is contained in:
markharwood 2018-02-01 19:20:21 +00:00 committed by GitHub
parent 1970e01782
commit 998461c737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -145,7 +145,7 @@ task verifyVersions {
* after the backport of the backcompat code is complete. * after the backport of the backcompat code is complete.
*/ */
allprojects { allprojects {
ext.bwc_tests_enabled = false ext.bwc_tests_enabled = true
} }
task verifyBwcTestsEnabled { task verifyBwcTestsEnabled {

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

@ -138,7 +138,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
maxConcurrentShardRequests = in.readVInt(); maxConcurrentShardRequests = in.readVInt();
preFilterShardSize = in.readVInt(); preFilterShardSize = in.readVInt();
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
allowPartialSearchResults = in.readOptionalBoolean(); allowPartialSearchResults = in.readOptionalBoolean();
} }
} }
@ -163,7 +163,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
out.writeVInt(maxConcurrentShardRequests); out.writeVInt(maxConcurrentShardRequests);
out.writeVInt(preFilterShardSize); out.writeVInt(preFilterShardSize);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
out.writeOptionalBoolean(allowPartialSearchResults); out.writeOptionalBoolean(allowPartialSearchResults);
} }
} }

4
server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
View File

@ -222,7 +222,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest {
if (in.getVersion().onOrAfter(Version.V_5_6_0)) { if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
clusterAlias = in.readOptionalString(); clusterAlias = in.readOptionalString();
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
allowPartialSearchResults = in.readOptionalBoolean(); allowPartialSearchResults = in.readOptionalBoolean();
} }
} }
@ -247,7 +247,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest {
if (out.getVersion().onOrAfter(Version.V_5_6_0)) { if (out.getVersion().onOrAfter(Version.V_5_6_0)) {
out.writeOptionalString(clusterAlias); out.writeOptionalString(clusterAlias);
} }
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
out.writeOptionalBoolean(allowPartialSearchResults); out.writeOptionalBoolean(allowPartialSearchResults);
} }