Skip to content

Commit e225023

Browse files
Remote reindex stored fields since 5.0.0 (#74914)
Test would assume stored fields were available since 5.0.0.alpha4, while production code only enables them after 5.0.0 (final, aka 99). Closes #74131
1 parent 31bfff2 commit e225023

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuildersTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,16 @@ public void testInitialSearchParamsFields() {
136136
// Test stored_fields for versions that support it
137137
searchRequest = new SearchRequest().source(new SearchSourceBuilder());
138138
searchRequest.source().storedField("_source").storedField("_id");
139-
// V_5_0_0_alpha4 => current
140-
remoteVersion = Version.fromId(between(5000004, Version.CURRENT.id));
139+
// V_5_0_0 (final) => current
140+
int minStoredFieldsVersion = 5000099;
141+
remoteVersion = Version.fromId(randomBoolean() ? minStoredFieldsVersion : between(minStoredFieldsVersion, Version.CURRENT.id));
141142
assertThat(initialSearch(searchRequest, query, remoteVersion).getParameters(), hasEntry("stored_fields", "_source,_id"));
142143

143144
// Test fields for versions that support it
144145
searchRequest = new SearchRequest().source(new SearchSourceBuilder());
145146
searchRequest.source().storedField("_source").storedField("_id");
146147
// V_2_0_0 => V_5_0_0_alpha3
147-
remoteVersion = Version.fromId(between(2000099, 5000003));
148+
remoteVersion = Version.fromId(randomBoolean() ? minStoredFieldsVersion - 1 : between(2000099, minStoredFieldsVersion - 1));
148149
assertThat(initialSearch(searchRequest, query, remoteVersion).getParameters(), hasEntry("fields", "_source,_id"));
149150

150151
// Test extra fields for versions that need it

0 commit comments

Comments
 (0)