From 998461c7376c82732bbef5097fb69ee552cded24 Mon Sep 17 00:00:00 2001 From: markharwood Date: Thu, 1 Feb 2018 19:20:21 +0000 Subject: [PATCH] Test fix - reenable BWC tests and lower version checks now that PR 28440 for allowPartialSearchResults flag backported to 6.x (#28482) Support for allowPartialSearchResults is now in 6.3 so changing master BWC checks accordingly --- build.gradle | 2 +- .../java/org/elasticsearch/action/search/SearchRequest.java | 4 ++-- .../search/internal/ShardSearchLocalRequest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2343050004ece..42d6f7e278709 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ task verifyVersions { * after the backport of the backcompat code is complete. */ allprojects { - ext.bwc_tests_enabled = false + ext.bwc_tests_enabled = true } task verifyBwcTestsEnabled { diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 391b99ca71655..8df82279cb2f9 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -138,7 +138,7 @@ public SearchRequest(StreamInput in) throws IOException { maxConcurrentShardRequests = 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(); } } @@ -163,7 +163,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(maxConcurrentShardRequests); 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); } } diff --git a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java index 25a23a06973ca..af52924a2de2c 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java @@ -222,7 +222,7 @@ protected void innerReadFrom(StreamInput in) throws IOException { if (in.getVersion().onOrAfter(Version.V_5_6_0)) { 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(); } } @@ -247,7 +247,7 @@ protected void innerWriteTo(StreamOutput out, boolean asKey) throws IOException if (out.getVersion().onOrAfter(Version.V_5_6_0)) { 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); }