Skip to content

Commit dd7be00

Browse files
Remote reindex stored fields since 5.0.0
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 elastic#74131
1 parent 963d9aa commit dd7be00

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
@@ -108,15 +108,16 @@ public void testInitialSearchParamsFields() {
108108
// Test stored_fields for versions that support it
109109
searchRequest = new SearchRequest().source(new SearchSourceBuilder());
110110
searchRequest.source().storedField("_source").storedField("_id");
111-
// V_5_0_0_alpha4 => current
112-
remoteVersion = Version.fromId(between(5000004, Version.CURRENT.id));
111+
// V_5_0_0 (final) => current
112+
int minStoredFieldsVersion = 5000099;
113+
remoteVersion = Version.fromId(randomBoolean() ? minStoredFieldsVersion : between(minStoredFieldsVersion, Version.CURRENT.id));
113114
assertThat(initialSearch(searchRequest, query, remoteVersion).getParameters(), hasEntry("stored_fields", "_source,_id"));
114115

115116
// Test fields for versions that support it
116117
searchRequest = new SearchRequest().source(new SearchSourceBuilder());
117118
searchRequest.source().storedField("_source").storedField("_id");
118119
// V_2_0_0 => V_5_0_0_alpha3
119-
remoteVersion = Version.fromId(between(2000099, 5000003));
120+
remoteVersion = Version.fromId(randomBoolean() ? minStoredFieldsVersion - 1 : between(2000099, minStoredFieldsVersion - 1));
120121
assertThat(initialSearch(searchRequest, query, remoteVersion).getParameters(), hasEntry("fields", "_source,_id"));
121122

122123
// Test extra fields for versions that need it

0 commit comments

Comments
 (0)