Skip to content

Commit 4b28f5b

Browse files
talevytalevy
authored
remove backcompat handling of 6.1.x versions (#42032)
relates to refactoring initiative #41164.
1 parent ed3230b commit 4b28f5b

File tree

26 files changed

+74
-256
lines changed

26 files changed

+74
-256
lines changed

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -293,17 +293,9 @@ protected void doWriteTo(StreamOutput out) throws IOException {
293293
} else {
294294
out.writeBoolean(false);
295295
}
296-
if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
297-
out.writeVInt(documents.size());
298-
for (BytesReference document : documents) {
299-
out.writeBytesReference(document);
300-
}
301-
} else {
302-
if (documents.size() > 1) {
303-
throw new IllegalArgumentException("Nodes prior to 6.1.0 cannot accept multiple documents");
304-
}
305-
BytesReference doc = documents.isEmpty() ? null : documents.iterator().next();
306-
out.writeOptionalBytesReference(doc);
296+
out.writeVInt(documents.size());
297+
for (BytesReference document : documents) {
298+
out.writeBytesReference(document);
307299
}
308300
if (documents.isEmpty() == false) {
309301
out.writeEnum(documentXContentType);

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Tuple<BooleanQuery, Boolean> createCandidateQuery(IndexReader indexReader, Versi
285285
}
286286

287287
BooleanQuery.Builder candidateQuery = new BooleanQuery.Builder();
288-
if (canUseMinimumShouldMatchField && indexVersion.onOrAfter(Version.V_6_1_0)) {
288+
if (canUseMinimumShouldMatchField) {
289289
LongValuesSource valuesSource = LongValuesSource.fromIntField(minimumShouldMatchField.name());
290290
for (BytesRef extractedTerm : extractedTerms) {
291291
subQueries.add(new TermQuery(new Term(queryTermsField.name(), extractedTerm)));
@@ -471,9 +471,7 @@ void processQuery(Query query, ParseContext context) {
471471
for (IndexableField field : fields) {
472472
context.doc().add(field);
473473
}
474-
if (indexVersionCreated.onOrAfter(Version.V_6_1_0)) {
475-
doc.add(new NumericDocValuesField(minimumShouldMatchFieldMapper.name(), result.minimumShouldMatch));
476-
}
474+
doc.add(new NumericDocValuesField(minimumShouldMatchFieldMapper.name(), result.minimumShouldMatch));
477475
}
478476

479477
static Query parseQuery(QueryShardContext context, boolean mapUnmappedFieldsAsString, XContentParser parser) throws IOException {

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorMatchedSlotSubFetchPhase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static void innerHitsExecute(Query mainQuery,
7373
String fieldName = singlePercolateQuery ? FIELD_NAME_PREFIX : FIELD_NAME_PREFIX + "_" + percolateQuery.getName();
7474
IndexSearcher percolatorIndexSearcher = percolateQuery.getPercolatorIndexSearcher();
7575
Weight weight = percolatorIndexSearcher.createWeight(percolatorIndexSearcher.rewrite(Queries.newNonNestedFilter()),
76-
ScoreMode.COMPLETE_NO_SCORES, 1f);
76+
ScoreMode.COMPLETE_NO_SCORES, 1f);
7777
Scorer s = weight.scorer(percolatorIndexSearcher.getIndexReader().leaves().get(0));
7878
int memoryIndexMaxDoc = percolatorIndexSearcher.getIndexReader().maxDoc();
7979
BitSet rootDocs = BitSet.of(s.iterator(), memoryIndexMaxDoc);

‎modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
import org.elasticsearch.index.mapper.ParseContext;
9898
import org.elasticsearch.plugins.Plugin;
9999
import org.elasticsearch.test.ESSingleNodeTestCase;
100+
import org.elasticsearch.test.VersionUtils;
100101
import org.junit.After;
101102
import org.junit.Before;
102103

@@ -593,7 +594,7 @@ public void testRangeQueries() throws Exception {
593594
IndexSearcher shardSearcher = newSearcher(directoryReader);
594595
shardSearcher.setQueryCache(null);
595596

596-
Version v = Version.V_6_1_0;
597+
Version v = VersionUtils.randomIndexCompatibleVersion(random());
597598
MemoryIndex memoryIndex = MemoryIndex.fromDocument(Collections.singleton(new IntPoint("int_field", 3)), new WhitespaceAnalyzer());
598599
IndexSearcher percolateSearcher = memoryIndex.createSearcher();
599600
Query query = fieldType.percolateQuery("_name", queryStore, Collections.singletonList(new BytesArray("{}")),

‎server/src/main/java/org/elasticsearch/Version.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
4646
*/
4747
public static final int V_EMPTY_ID = 0;
4848
public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
49-
public static final int V_6_1_0_ID = 6010099;
50-
public static final Version V_6_1_0 = new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
51-
public static final int V_6_1_1_ID = 6010199;
52-
public static final Version V_6_1_1 = new Version(V_6_1_1_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
53-
public static final int V_6_1_2_ID = 6010299;
54-
public static final Version V_6_1_2 = new Version(V_6_1_2_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
55-
public static final int V_6_1_3_ID = 6010399;
56-
public static final Version V_6_1_3 = new Version(V_6_1_3_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
57-
public static final int V_6_1_4_ID = 6010499;
58-
public static final Version V_6_1_4 = new Version(V_6_1_4_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
5949
// The below version is missing from the 7.3 JAR
6050
private static final org.apache.lucene.util.Version LUCENE_7_2_1 = org.apache.lucene.util.Version.fromBits(7, 2, 1);
6151
public static final int V_6_2_0_ID = 6020099;
@@ -196,16 +186,6 @@ public static Version fromId(int id) {
196186
return V_6_2_1;
197187
case V_6_2_0_ID:
198188
return V_6_2_0;
199-
case V_6_1_4_ID:
200-
return V_6_1_4;
201-
case V_6_1_3_ID:
202-
return V_6_1_3;
203-
case V_6_1_2_ID:
204-
return V_6_1_2;
205-
case V_6_1_1_ID:
206-
return V_6_1_1;
207-
case V_6_1_0_ID:
208-
return V_6_1_0;
209189
case V_EMPTY_ID:
210190
return V_EMPTY;
211191
default:

‎server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.lucene.index.IndexOptions;
2525
import org.apache.lucene.index.IndexableField;
2626
import org.apache.lucene.search.Query;
27-
import org.elasticsearch.Version;
2827
import org.elasticsearch.common.logging.DeprecationLogger;
2928
import org.elasticsearch.common.lucene.Lucene;
3029
import org.elasticsearch.common.settings.Settings;
@@ -202,10 +201,7 @@ public void preParse(ParseContext context) {
202201
}
203202

204203
@Override
205-
public void postParse(ParseContext context) throws IOException {
206-
if (context.indexSettings().getIndexVersionCreated().before(Version.V_6_1_0)) {
207-
super.parse(context);
208-
}
204+
public void postParse(ParseContext context) {
209205
}
210206

211207
@Override

‎server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.lucene.search.MatchNoDocsQuery;
2929
import org.apache.lucene.search.Query;
3030
import org.apache.lucene.util.BytesRef;
31-
import org.elasticsearch.Version;
3231
import org.elasticsearch.common.Nullable;
3332
import org.elasticsearch.common.settings.Settings;
3433
import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -255,15 +254,9 @@ public void postParse(ParseContext context) throws IOException {
255254
// we share the parent docs fields to ensure good compression
256255
SequenceIDFields seqID = context.seqID();
257256
assert seqID != null;
258-
final Version versionCreated = context.mapperService().getIndexSettings().getIndexVersionCreated();
259-
final boolean includePrimaryTerm = versionCreated.before(Version.V_6_1_0);
260257
for (Document doc : context.nonRootDocuments()) {
261258
doc.add(seqID.seqNo);
262259
doc.add(seqID.seqNoDocValue);
263-
if (includePrimaryTerm) {
264-
// primary terms are used to distinguish between parent and nested docs since 6.1.0
265-
doc.add(seqID.primaryTerm);
266-
}
267260
}
268261
}
269262

‎server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@
1919

2020
package org.elasticsearch.index.query;
2121

22-
import org.apache.lucene.index.Term;
2322
import org.apache.lucene.search.BooleanClause;
2423
import org.apache.lucene.search.BooleanClause.Occur;
2524
import org.apache.lucene.search.BooleanQuery;
2625
import org.apache.lucene.search.ConstantScoreQuery;
2726
import org.apache.lucene.search.Query;
28-
import org.apache.lucene.search.TermQuery;
29-
import org.elasticsearch.Version;
3027
import org.elasticsearch.common.ParseField;
3128
import org.elasticsearch.common.ParsingException;
3229
import org.elasticsearch.common.Strings;
@@ -148,10 +145,6 @@ public static Query newFilter(QueryShardContext context, String fieldPattern) {
148145
fields = context.simpleMatchToIndexNames(fieldPattern);
149146
}
150147

151-
if (context.indexVersionCreated().before(Version.V_6_1_0)) {
152-
return newLegacyExistsQuery(context, fields);
153-
}
154-
155148
if (fields.size() == 1) {
156149
String field = fields.iterator().next();
157150
return newFieldExistsQuery(context, field);
@@ -164,28 +157,6 @@ public static Query newFilter(QueryShardContext context, String fieldPattern) {
164157
return new ConstantScoreQuery(boolFilterBuilder.build());
165158
}
166159

167-
private static Query newLegacyExistsQuery(QueryShardContext context, Collection<String> fields) {
168-
// We create TermsQuery directly here rather than using FieldNamesFieldType.termsQuery()
169-
// so we don't end up with deprecation warnings
170-
if (fields.size() == 1) {
171-
Query filter = newLegacyExistsQuery(context, fields.iterator().next());
172-
return new ConstantScoreQuery(filter);
173-
}
174-
175-
BooleanQuery.Builder boolFilterBuilder = new BooleanQuery.Builder();
176-
for (String field : fields) {
177-
Query filter = newLegacyExistsQuery(context, field);
178-
boolFilterBuilder.add(filter, BooleanClause.Occur.SHOULD);
179-
}
180-
return new ConstantScoreQuery(boolFilterBuilder.build());
181-
}
182-
183-
private static Query newLegacyExistsQuery(QueryShardContext context, String field) {
184-
MappedFieldType fieldType = context.fieldMapper(field);
185-
String fieldName = fieldType != null ? fieldType.name() : field;
186-
return new TermQuery(new Term(FieldNamesFieldMapper.NAME, fieldName));
187-
}
188-
189160
private static Query newFieldExistsQuery(QueryShardContext context, String field) {
190161
MappedFieldType fieldType = context.getMapperService().fullName(field);
191162
if (fieldType == null) {

‎server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.lucene.search.NormsFieldExistsQuery;
2828
import org.apache.lucene.search.Query;
2929
import org.apache.lucene.search.TermQuery;
30-
import org.elasticsearch.Version;
3130
import org.elasticsearch.search.internal.SearchContext;
3231
import org.elasticsearch.test.AbstractQueryTestCase;
3332

@@ -65,26 +64,7 @@ protected void doAssertLuceneQuery(ExistsQueryBuilder queryBuilder, Query query,
6564
Collection<String> fields = context.getQueryShardContext().simpleMatchToIndexNames(fieldPattern);
6665
Collection<String> mappedFields = fields.stream().filter((field) -> context.getQueryShardContext().getObjectMapper(field) != null
6766
|| context.getQueryShardContext().getMapperService().fullName(field) != null).collect(Collectors.toList());
68-
if (context.mapperService().getIndexSettings().getIndexVersionCreated().before(Version.V_6_1_0)) {
69-
if (fields.size() == 1) {
70-
assertThat(query, instanceOf(ConstantScoreQuery.class));
71-
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) query;
72-
String field = expectedFieldName(fields.iterator().next());
73-
assertThat(constantScoreQuery.getQuery(), instanceOf(TermQuery.class));
74-
TermQuery termQuery = (TermQuery) constantScoreQuery.getQuery();
75-
assertEquals(field, termQuery.getTerm().text());
76-
} else {
77-
assertThat(query, instanceOf(ConstantScoreQuery.class));
78-
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) query;
79-
assertThat(constantScoreQuery.getQuery(), instanceOf(BooleanQuery.class));
80-
BooleanQuery booleanQuery = (BooleanQuery) constantScoreQuery.getQuery();
81-
assertThat(booleanQuery.clauses().size(), equalTo(mappedFields.size()));
82-
for (int i = 0; i < mappedFields.size(); i++) {
83-
BooleanClause booleanClause = booleanQuery.clauses().get(i);
84-
assertThat(booleanClause.getOccur(), equalTo(BooleanClause.Occur.SHOULD));
85-
}
86-
}
87-
} else if (fields.size() == 1 && mappedFields.size() == 0) {
67+
if (fields.size() == 1 && mappedFields.size() == 0) {
8868
assertThat(query, instanceOf(MatchNoDocsQuery.class));
8969
MatchNoDocsQuery matchNoDocsQuery = (MatchNoDocsQuery) query;
9070
assertThat(matchNoDocsQuery.toString(null),

‎server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.apache.lucene.util.automaton.Automaton;
5151
import org.apache.lucene.util.automaton.Operations;
5252
import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
53-
import org.elasticsearch.Version;
5453
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
5554
import org.elasticsearch.cluster.metadata.IndexMetaData;
5655
import org.elasticsearch.common.Strings;
@@ -1033,8 +1032,7 @@ public void testExistsFieldQuery() throws Exception {
10331032
QueryShardContext context = createShardContext();
10341033
QueryStringQueryBuilder queryBuilder = new QueryStringQueryBuilder(STRING_FIELD_NAME + ":*");
10351034
Query query = queryBuilder.toQuery(context);
1036-
if (context.getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_1_0)
1037-
&& (context.fieldMapper(STRING_FIELD_NAME).omitNorms() == false)) {
1035+
if (context.fieldMapper(STRING_FIELD_NAME).omitNorms() == false) {
10381036
assertThat(query, equalTo(new ConstantScoreQuery(new NormsFieldExistsQuery(STRING_FIELD_NAME))));
10391037
} else {
10401038
assertThat(query, equalTo(new ConstantScoreQuery(new TermQuery(new Term("_field_names", STRING_FIELD_NAME)))));
@@ -1044,8 +1042,7 @@ public void testExistsFieldQuery() throws Exception {
10441042
String value = (quoted ? "\"" : "") + STRING_FIELD_NAME + (quoted ? "\"" : "");
10451043
queryBuilder = new QueryStringQueryBuilder("_exists_:" + value);
10461044
query = queryBuilder.toQuery(context);
1047-
if (context.getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_1_0)
1048-
&& (context.fieldMapper(STRING_FIELD_NAME).omitNorms() == false)) {
1045+
if (context.fieldMapper(STRING_FIELD_NAME).omitNorms() == false) {
10491046
assertThat(query, equalTo(new ConstantScoreQuery(new NormsFieldExistsQuery(STRING_FIELD_NAME))));
10501047
} else {
10511048
assertThat(query, equalTo(new ConstantScoreQuery(new TermQuery(new Term("_field_names", STRING_FIELD_NAME)))));

‎server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.lucene.search.TermQuery;
3333
import org.apache.lucene.search.TermRangeQuery;
3434
import org.elasticsearch.ElasticsearchParseException;
35-
import org.elasticsearch.Version;
3635
import org.elasticsearch.common.ParsingException;
3736
import org.elasticsearch.common.geo.ShapeRelation;
3837
import org.elasticsearch.common.lucene.BytesRefs;
@@ -139,11 +138,9 @@ protected void doAssertLuceneQuery(RangeQueryBuilder queryBuilder, Query query,
139138
String expectedFieldName = expectedFieldName(queryBuilder.fieldName());
140139
if (queryBuilder.from() == null && queryBuilder.to() == null) {
141140
final Query expectedQuery;
142-
if (context.mapperService().getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_1_0)
143-
&& context.mapperService().fullName(queryBuilder.fieldName()).hasDocValues()) {
141+
if (context.mapperService().fullName(queryBuilder.fieldName()).hasDocValues()) {
144142
expectedQuery = new ConstantScoreQuery(new DocValuesFieldExistsQuery(expectedFieldName));
145-
} else if (context.mapperService().getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_1_0) &&
146-
context.mapperService().fullName(queryBuilder.fieldName()).omitNorms() == false) {
143+
} else if (context.mapperService().fullName(queryBuilder.fieldName()).omitNorms() == false) {
147144
expectedQuery = new ConstantScoreQuery(new NormsFieldExistsQuery(expectedFieldName));
148145
} else {
149146
expectedQuery = new ConstantScoreQuery(new TermQuery(new Term(FieldNamesFieldMapper.NAME, expectedFieldName)));
@@ -425,8 +422,7 @@ protected MappedFieldType.Relation getRelation(QueryRewriteContext queryRewriteC
425422
// Range query with open bounds rewrite to an exists query
426423
Query luceneQuery = rewrittenRange.toQuery(queryShardContext);
427424
final Query expectedQuery;
428-
if (queryShardContext.getIndexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_1_0)
429-
&& queryShardContext.fieldMapper(query.fieldName()).hasDocValues()) {
425+
if (queryShardContext.fieldMapper(query.fieldName()).hasDocValues()) {
430426
expectedQuery = new ConstantScoreQuery(new DocValuesFieldExistsQuery(query.fieldName()));
431427
} else {
432428
expectedQuery = new ConstantScoreQuery(new TermQuery(new Term(FieldNamesFieldMapper.NAME, query.fieldName())));

‎test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,16 @@ public void testMessage() {
5454
}
5555

5656
public void testParseSkipSectionVersionNoFeature() throws Exception {
57+
Version version = VersionUtils.randomVersion(random());
5758
parser = createParser(YamlXContent.yamlXContent,
58-
"version: \" - 6.1.1\"\n" +
59+
"version: \" - " + version + "\"\n" +
5960
"reason: Delete ignores the parent param"
6061
);
6162

6263
SkipSection skipSection = SkipSection.parse(parser);
6364
assertThat(skipSection, notNullValue());
6465
assertThat(skipSection.getLowerVersion(), equalTo(VersionUtils.getFirstVersion()));
65-
assertThat(skipSection.getUpperVersion(), equalTo(Version.V_6_1_1));
66+
assertThat(skipSection.getUpperVersion(), equalTo(version));
6667
assertThat(skipSection.getFeatures().size(), equalTo(0));
6768
assertThat(skipSection.getReason(), equalTo("Delete ignores the parent param"));
6869
}

‎x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicensesMetaData.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,11 @@ public void writeTo(StreamOutput streamOutput) throws IOException {
166166
streamOutput.writeBoolean(true); // has a license
167167
license.writeTo(streamOutput);
168168
}
169-
if (streamOutput.getVersion().onOrAfter(Version.V_6_1_0)) {
170-
if (trialVersion == null) {
171-
streamOutput.writeBoolean(false);
172-
} else {
173-
streamOutput.writeBoolean(true);
174-
Version.writeVersion(trialVersion, streamOutput);
175-
}
169+
if (trialVersion == null) {
170+
streamOutput.writeBoolean(false);
171+
} else {
172+
streamOutput.writeBoolean(true);
173+
Version.writeVersion(trialVersion, streamOutput);
176174
}
177175
}
178176

@@ -182,11 +180,9 @@ public LicensesMetaData(StreamInput streamInput) throws IOException {
182180
} else {
183181
license = LICENSE_TOMBSTONE;
184182
}
185-
if (streamInput.getVersion().onOrAfter(Version.V_6_1_0)) {
186-
boolean hasExercisedTrial = streamInput.readBoolean();
187-
if (hasExercisedTrial) {
188-
this.trialVersion = Version.readVersion(streamInput);
189-
}
183+
boolean hasExercisedTrial = streamInput.readBoolean();
184+
if (hasExercisedTrial) {
185+
this.trialVersion = Version.readVersion(streamInput);
190186
}
191187
}
192188

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CloseJobAction.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package org.elasticsearch.xpack.core.ml.action;
77

8-
import org.elasticsearch.Version;
98
import org.elasticsearch.action.Action;
109
import org.elasticsearch.action.ActionRequestBuilder;
1110
import org.elasticsearch.action.support.tasks.BaseTasksRequest;
@@ -91,9 +90,7 @@ public Request(StreamInput in) throws IOException {
9190
force = in.readBoolean();
9291
openJobIds = in.readStringArray();
9392
local = in.readBoolean();
94-
if (in.getVersion().onOrAfter(Version.V_6_1_0)) {
95-
allowNoJobs = in.readBoolean();
96-
}
93+
allowNoJobs = in.readBoolean();
9794
}
9895

9996
@Override
@@ -104,9 +101,7 @@ public void writeTo(StreamOutput out) throws IOException {
104101
out.writeBoolean(force);
105102
out.writeStringArray(openJobIds);
106103
out.writeBoolean(local);
107-
if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
108-
out.writeBoolean(allowNoJobs);
109-
}
104+
out.writeBoolean(allowNoJobs);
110105
}
111106

112107
public Request(String jobId) {

0 commit comments

Comments
 (0)