diff --git a/docs/changelog/95514.yaml b/docs/changelog/95514.yaml new file mode 100644 index 0000000000000..8e87ce66c4835 --- /dev/null +++ b/docs/changelog/95514.yaml @@ -0,0 +1,5 @@ +pr: 95514 +summary: Fix versioning for tests cases using a randomly generated rank builder +area: Ranking +type: bug +issues: [] diff --git a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java index f6f92f2f63dcb..391029ecc63df 100644 --- a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java @@ -231,6 +231,9 @@ public void testChannelVersion() throws Exception { if (Optional.ofNullable(request.source()).map(SearchSourceBuilder::knnSearch).map(List::size).orElse(0) > 1) { version = TransportVersionUtils.randomVersionBetween(random(), TransportVersion.V_8_7_0, TransportVersion.CURRENT); } + if (request.source() != null && request.source().rankBuilder() != null) { + version = TransportVersionUtils.randomVersionBetween(random(), TransportVersion.V_8_8_0, TransportVersion.CURRENT); + } request = copyWriteable(request, namedWriteableRegistry, ShardSearchRequest::new, version); channelVersion = TransportVersion.min(channelVersion, version); assertThat(request.getChannelVersion(), equalTo(channelVersion)); @@ -253,6 +256,9 @@ public void testWillCallRequestCacheKeyDifferentiators() throws IOException { public void testForceSyntheticUnsupported() throws IOException { SearchRequest request = createSearchRequest(); + if (request.source() != null) { + request.source().rankBuilder(null); + } request.setForceSyntheticSource(true); ShardSearchRequest shardRequest = createShardSearchReqest(request); StreamOutput out = new BytesStreamOutput();