Skip to content

Commit 9914525

Browse files
committed
Deprecate special handling of ReindexRequest#size
1 parent 8de4075 commit 9914525

File tree

3 files changed

+4
-30
lines changed

3 files changed

+4
-30
lines changed

modules/reindex/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,3 +167,7 @@ if (OS.current() == OS.WINDOWS) {
167167
}
168168
}
169169
}
170+
171+
tasks.named("yamlRestCompatTestTransform").configure { task ->
172+
task.skipTest("reindex/20_validation/specifying size fails", "size is rejected in 9.0")
173+
}

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -94,28 +94,6 @@
9494
body:
9595
conflicts: cat
9696

97-
---
98-
"specifying size fails":
99-
- requires:
100-
cluster_features: ["gte_v8.0.0"]
101-
reason: "size supported until 8"
102-
103-
- do:
104-
index:
105-
index: test
106-
id: "1"
107-
body: { "text": "test" }
108-
109-
- do:
110-
catch: /invalid parameter \[size\], use \[max_docs\] instead/
111-
reindex:
112-
body:
113-
source:
114-
index: test
115-
dest:
116-
index: dest
117-
size: 1
118-
11997
---
12098
"invalid max_docs in body fails":
12199
- requires:

server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
354354
);
355355

356356
PARSER.declareInt(ReindexRequest::setMaxDocsValidateIdentical, new ParseField("max_docs"));
357-
358-
// avoid silently accepting an ignored size.
359-
PARSER.declareInt((r, s) -> failOnSizeSpecified(), new ParseField("size"));
360-
361357
PARSER.declareField((p, v, c) -> v.setScript(Script.parse(p)), new ParseField("script"), ObjectParser.ValueType.OBJECT);
362358
PARSER.declareString(ReindexRequest::setConflicts, new ParseField("conflicts"));
363359
}
@@ -497,8 +493,4 @@ static void setMaxDocsValidateIdentical(AbstractBulkByScrollRequest<?> request,
497493
request.setMaxDocs(maxDocs);
498494
}
499495
}
500-
501-
private static void failOnSizeSpecified() {
502-
throw new IllegalArgumentException("invalid parameter [size], use [max_docs] instead");
503-
}
504496
}

0 commit comments

Comments
 (0)