-
Notifications
You must be signed in to change notification settings - Fork 24.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add async_search get and delete APIs to HLRC #53828
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e98a619
Add async_search get and delete APIs to HLRC
017fb83
Merge branch 'master' into aync-search-get-hlrc
28b307a
iter
9266287
try IT workaround
69de26a
Workaround for yellow clusterstate in integ tests
5c98d6b
Merge branch 'master' into aync-search-get-hlrc
1844cd9
Rename methods in AsyncSearchClient
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...gh-level/src/main/java/org/elasticsearch/client/asyncsearch/DeleteAsyncSearchRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
|
|
||
| package org.elasticsearch.client.asyncsearch; | ||
|
|
||
| import org.elasticsearch.client.Validatable; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class DeleteAsyncSearchRequest implements Validatable { | ||
|
|
||
| private final String id; | ||
|
|
||
| public DeleteAsyncSearchRequest(String id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getId() { | ||
| return this.id; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| DeleteAsyncSearchRequest request = (DeleteAsyncSearchRequest) o; | ||
| return Objects.equals(getId(), request.getId()); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(getId()); | ||
| } | ||
| } |
93 changes: 93 additions & 0 deletions
93
...-high-level/src/main/java/org/elasticsearch/client/asyncsearch/GetAsyncSearchRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
|
|
||
| package org.elasticsearch.client.asyncsearch; | ||
|
|
||
| import org.elasticsearch.client.Validatable; | ||
| import org.elasticsearch.client.ValidationException; | ||
| import org.elasticsearch.common.unit.TimeValue; | ||
|
|
||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
|
|
||
| public class GetAsyncSearchRequest implements Validatable { | ||
|
|
||
| private TimeValue waitForCompletion; | ||
jimczi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private TimeValue keepAlive; | ||
jimczi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| public static final long MIN_KEEPALIVE = TimeValue.timeValueMinutes(1).millis(); | ||
|
|
||
| private final String id; | ||
|
|
||
| public GetAsyncSearchRequest(String id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getId() { | ||
| return this.id; | ||
| } | ||
|
|
||
| public TimeValue getWaitForCompletion() { | ||
| return waitForCompletion; | ||
| } | ||
|
|
||
| public void setWaitForCompletion(TimeValue waitForCompletion) { | ||
| this.waitForCompletion = waitForCompletion; | ||
| } | ||
|
|
||
| public TimeValue getKeepAlive() { | ||
| return keepAlive; | ||
| } | ||
|
|
||
| public void setKeepAlive(TimeValue keepAlive) { | ||
| this.keepAlive = keepAlive; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<ValidationException> validate() { | ||
| final ValidationException validationException = new ValidationException(); | ||
| if (keepAlive != null && keepAlive.getMillis() < MIN_KEEPALIVE) { | ||
| validationException.addValidationError("keep_alive must be greater than 1 minute, got: " + keepAlive.toString()); | ||
| } | ||
| if (validationException.validationErrors().isEmpty()) { | ||
| return Optional.empty(); | ||
| } | ||
| return Optional.of(validationException); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| GetAsyncSearchRequest request = (GetAsyncSearchRequest) o; | ||
| return Objects.equals(getId(), request.getId()) | ||
| && Objects.equals(getKeepAlive(), request.getKeepAlive()) | ||
| && Objects.equals(getWaitForCompletion(), request.getWaitForCompletion()); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(getId(), getKeepAlive(), getWaitForCompletion()); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could also rename
submitAsyncSearchintosubmitandsubmitAsync?