Docs: HLRC: refactor bulk, migrate and reindex apis (#35413)

fix typos and refactor to DRY up documentation for bulk, reindex and migration apis
relates #35345
This commit is contained in:
Przemyslaw Gomulka 2018-11-16 08:58:13 +01:00 committed by GitHub
parent 253c2fcc6a
commit c6e2634bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 27 deletions

View File

@ -106,15 +106,19 @@ public class ReindexIT extends ESRestHighLevelClientTestCase {
); );
} }
{ {
ReindexRequest reindexRequest = new ReindexRequest(); // tag::submit-reindex-task
ReindexRequest reindexRequest = new ReindexRequest(); // <1>
reindexRequest.setSourceIndices(sourceIndex); reindexRequest.setSourceIndices(sourceIndex);
reindexRequest.setDestIndex(destinationIndex); reindexRequest.setDestIndex(destinationIndex);
reindexRequest.setSourceQuery(new IdsQueryBuilder().addIds("1").types("type"));
reindexRequest.setRefresh(true); reindexRequest.setRefresh(true);
TaskSubmissionResponse reindexSubmission = highLevelClient().submitReindexTask(reindexRequest, RequestOptions.DEFAULT); TaskSubmissionResponse reindexSubmission = highLevelClient()
.submitReindexTask(reindexRequest, RequestOptions.DEFAULT); // <2>
BooleanSupplier hasUpgradeCompleted = checkCompletionStatus(reindexSubmission.getTask()); String taskId = reindexSubmission.getTask(); // <3>
// end::submit-reindex-task
BooleanSupplier hasUpgradeCompleted = checkCompletionStatus(taskId);
awaitBusy(hasUpgradeCompleted); awaitBusy(hasUpgradeCompleted);
} }
} }

View File

@ -37,9 +37,9 @@ And different operation types can be added to the same +{request}+:
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests-file}[{api}-request-with-mixed-operations] include-tagged::{doc-tests-file}[{api}-request-with-mixed-operations]
-------------------------------------------------- --------------------------------------------------
<1> Adds a `DeleteRequest` to the `BulkRequest`. See <<{upid}-delete>> <1> Adds a `DeleteRequest` to the +{request}+. See <<{upid}-delete>>
for more information on how to build `DeleteRequest`. for more information on how to build `DeleteRequest`.
<2> Adds an `UpdateRequest` to the `BulkRequest`. See <<{upid}-update>> <2> Adds an `UpdateRequest` to the +{request}+. See <<{upid}-update>>
for more information on how to build `UpdateRequest`. for more information on how to build `UpdateRequest`.
<3> Adds an `IndexRequest` using the SMILE format <3> Adds an `IndexRequest` using the SMILE format
@ -72,22 +72,22 @@ the index/update/delete operations.
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/CRUDDocumentationIT.java[bulk-request-pipeline] include-tagged::{doc-tests-file}[{api}-request-pipeline]
-------------------------------------------------- --------------------------------------------------
<1> Global pipelineId used on all sub requests, unless overridden on a sub request <1> Global pipelineId used on all sub requests, unless overridden on a sub request
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/CRUDDocumentationIT.java[bulk-request-routing] include-tagged::{doc-tests-file}[{api}-request-routing]
-------------------------------------------------- --------------------------------------------------
<1> Global routingId used on all sub requests, unless overridden on a sub request <1> Global routingId used on all sub requests, unless overridden on a sub request
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/CRUDDocumentationIT.java[bulk-request-index-type] include-tagged::{doc-tests-file}[{api}-request-index-type]
-------------------------------------------------- --------------------------------------------------
<1> A bulk request with global index and type used on all sub requests, unless overridden on a sub request. <1> A bulk request with global index and type used on all sub requests, unless overridden on a sub request.
Both parameters are @Nullable and can only be set during BulkRequest creation. Both parameters are @Nullable and can only be set during +{request}+ creation.
include::../execution.asciidoc[] include::../execution.asciidoc[]
@ -167,7 +167,7 @@ actions currently added (defaults to 1000, use -1 to disable it)
actions currently added (defaults to 5Mb, use -1 to disable it) actions currently added (defaults to 5Mb, use -1 to disable it)
<3> Set the number of concurrent requests allowed to be executed <3> Set the number of concurrent requests allowed to be executed
(default to 1, use 0 to only allow the execution of a single request) (default to 1, use 0 to only allow the execution of a single request)
<4> Set a flush interval flushing any `BulkRequest` pending if the <4> Set a flush interval flushing any +{request}+ pending if the
interval passes (defaults to not set) interval passes (defaults to not set)
<5> Set a constant back off policy that initially waits for 1 second <5> Set a constant back off policy that initially waits for 1 second
and retries up to 3 times. See `BackoffPolicy.noBackoff()`, and retries up to 3 times. See `BackoffPolicy.noBackoff()`,

View File

@ -10,7 +10,7 @@
[id="{upid}-{api}-request"] [id="{upid}-{api}-request"]
==== Reindex Request ==== Reindex Request
A +{request} can be used to copy documents from one or more indexes into a A +{request}+ can be used to copy documents from one or more indexes into a
destination index. destination index.
It requires an existing source index and a target index which may or may not exist pre-request. Reindex does not attempt It requires an existing source index and a target index which may or may not exist pre-request. Reindex does not attempt
@ -100,7 +100,7 @@ include-tagged::{doc-tests-file}[{api}-request-sort]
<1> add descending sort to`field1` <1> add descending sort to`field1`
<2> add ascending sort to `field2` <2> add ascending sort to `field2`
+{request} also supports a `script` that modifies the document. It allows you to +{request}+ also supports a `script` that modifies the document. It allows you to
also change the document's metadata. The following example illustrates that. also change the document's metadata. The following example illustrates that.
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
@ -157,6 +157,19 @@ include-tagged::{doc-tests-file}[{api}-request-refresh]
include::../execution.asciidoc[] include::../execution.asciidoc[]
[id="{upid}-{api}-task-submission"]
==== Reindex task submission
It is also possible to submit a +{request}+ and not wait for it completion with the use of Task API. This is an equivalent of a REST request
with wait_for_completion flag set to false.
["source","java",subs="attributes,callouts,macros"]
--------------------------------------------------
include-tagged::{hlrc-tests}/ReindexIT.java[submit-reindex-task]
--------------------------------------------------
<1> A +{request}+ is constructed the same way as for the synchronous method
<2> A submit method returns a `TaskSubmissionResponse` which contains a task identifier.
<3> The task identifier can be used to get `response` from a completed task.
[id="{upid}-{api}-response"] [id="{upid}-{api}-response"]
==== Reindex Response ==== Reindex Response

View File

@ -25,6 +25,7 @@ the same response objects.
-- --
:doc-tests: {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation :doc-tests: {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client/documentation
:hlrc-tests: {docdir}/../../client/rest-high-level/src/test/java/org/elasticsearch/client
include::getting-started.asciidoc[] include::getting-started.asciidoc[]
include::supported-apis.asciidoc[] include::supported-apis.asciidoc[]

View File

@ -1,14 +1,22 @@
--
:api: upgrade
:request: IndexUpgradeRequest
:response: BulkByScrollResponse
:submit_response: IndexUpgradeSubmissionResponse
:doc-tests-file: {doc-tests}/MigrationClientDocumentationIT.java
--
[[java-rest-high-migration-upgrade]] [[java-rest-high-migration-upgrade]]
=== Migration Upgrade === Migration Upgrade
[[java-rest-high-migraton-upgrade-request]] [[java-rest-high-migraton-upgrade-request]]
==== Index Upgrade Request ==== Index Upgrade Request
An `IndexUpgradeRequest` requires an index argument. Only one index at the time should be upgraded: An +{request}+ requires an index argument. Only one index at the time should be upgraded:
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/MigrationClientDocumentationIT.java[upgrade-request] include-tagged::{doc-tests-file}[{api}-request]
-------------------------------------------------- --------------------------------------------------
<1> Create a new request instance <1> Create a new request instance
@ -17,39 +25,37 @@ include-tagged::{doc-tests}/MigrationClientDocumentationIT.java[upgrade-request]
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/MigrationClientDocumentationIT.java[upgrade-execute] include-tagged::{doc-tests-file}[{api}-execute]
-------------------------------------------------- --------------------------------------------------
[[java-rest-high-migration-upgrade-response]] [[java-rest-high-migration-upgrade-response]]
==== Response ==== Response
The returned `BulkByScrollResponse` contains information about the executed operation The returned +{response}+ contains information about the executed operation
[[java-rest-high-migraton-async-upgrade-request]] [[java-rest-high-migraton-async-upgrade-request]]
==== Asynchronous Execution ==== Asynchronous Execution
The asynchronous execution of a upgrade request requires both the `IndexUpgradeRequest` The asynchronous execution of an upgrade request requires both the +{request}+
instance and an `ActionListener` instance to be passed to the asynchronous instance and an `ActionListener` instance to be passed to the asynchronous
method: method:
A typical listener for `BulkResponse` looks like:
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/MigrationClientDocumentationIT.java[upgrade-async-listener] include-tagged::{doc-tests-file}[{api}-async-listener]
-------------------------------------------------- --------------------------------------------------
<1> Called when the execution is successfully completed. The response is <1> Called when the execution is successfully completed. The response is
provided as an argument and contains a list of individual results for each provided as an argument and contains a list of individual results for each
operation that was executed. Note that one or more operations might have operation that was executed. Note that one or more operations might have
failed while the others have been successfully executed. failed while the others have been successfully executed.
<2> Called when the whole `IndexUpgradeRequest` fails. In this case the raised <2> Called when the whole +{request}+ fails. In this case the raised
exception is provided as an argument and no operation has been executed. exception is provided as an argument and no operation has been executed.
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/MigrationClientDocumentationIT.java[upgrade-async-execute] include-tagged::{doc-tests-file}[{api}-async-execute]
-------------------------------------------------- --------------------------------------------------
<1> The `IndexUpgradeRequest` to execute and the `ActionListener` to use when <1> The +{request}+ to execute and the `ActionListener` to use when
the execution completes the execution completes
The asynchronous method does not block and returns immediately. Once it is The asynchronous method does not block and returns immediately. Once it is
@ -59,11 +65,11 @@ it failed.
=== Migration Upgrade with Task API === Migration Upgrade with Task API
Submission of upgrade request task will requires the `IndexUpgradeRequest` and will return Submission of upgrade request task will requires the +{request}+ and will return
`IndexUpgradeSubmissionResponse`. The `IndexUpgradeSubmissionResponse` can later be use to fetch +{submit_response}+. The +{submit_response}+ can later be use to fetch
TaskId and query the Task API for results. TaskId and query the Task API for results.
["source","java",subs="attributes,callouts,macros"] ["source","java",subs="attributes,callouts,macros"]
-------------------------------------------------- --------------------------------------------------
include-tagged::{doc-tests}/MigrationClientDocumentationIT.java[upgrade-task-api] include-tagged::{doc-tests-file}[{api}-task-api]
-------------------------------------------------- --------------------------------------------------