Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adding validation for retrievers and scroll #115106

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Adding validation for retrievers and scroll #115106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2179,7 +2179,7 @@ public ActionRequestValidationException validate(
boolean allowPartialSearchResults
) {
if (retriever() != null) {
validationException = retriever().validate(this, validationException, allowPartialSearchResults);
validationException = retriever().validate(this, validationException, isScroll, allowPartialSearchResults);
List<String> specified = new ArrayList<>();
if (subSearches().isEmpty() == false) {
specified.add(QUERY_FIELD.getPreferredName());
Expand Down
10 changes: 7 additions & 3 deletions server/src/main/java/org/elasticsearch/search/retriever/CompoundRetrieverBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,10 @@ public final void extractToSearchSourceBuilder(SearchSourceBuilder searchSourceB
public ActionRequestValidationException validate(
SearchSourceBuilder source,
ActionRequestValidationException validationException,
boolean isScroll,
boolean allowPartialSearchResults
) {
validationException = super.validate(source, validationException, allowPartialSearchResults);
validationException = super.validate(source, validationException, isScroll, allowPartialSearchResults);
if (source.size() > rankWindowSize) {
validationException = addValidationError(
"["
Expand All @@ -190,12 +191,15 @@ public ActionRequestValidationException validate(
}
if (allowPartialSearchResults) {
validationException = addValidationError(
"cannot specify a compound retriever and [allow_partial_search_results]",
"cannot specify [" + getName() + "] and [allow_partial_search_results]",
validationException
);
}
if (isScroll) {
validationException = addValidationError("cannot specify [" + getName() + "] and [scroll]", validationException);
}
for (RetrieverSource innerRetriever : innerRetrievers) {
validationException = innerRetriever.retriever().validate(source, validationException, allowPartialSearchResults);
validationException = innerRetriever.retriever().validate(source, validationException, isScroll, allowPartialSearchResults);
}
return validationException;
}
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/search/retriever/RetrieverBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ public RetrieverBuilder rewrite(QueryRewriteContext ctx) throws IOException {
public ActionRequestValidationException validate(
SearchSourceBuilder source,
ActionRequestValidationException validationException,
boolean isScroll,
boolean allowPartialSearchResults
) {
return validationException;
Expand Down
15 changes: 14 additions & 1 deletion server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,23 @@ public void testValidate() throws IOException {
assertNotNull(validationErrors);
assertEquals(1, validationErrors.validationErrors().size());
assertEquals(
"cannot specify a compound retriever and [allow_partial_search_results]",
"cannot specify [test_compound_retriever_builder] and [allow_partial_search_results]",
validationErrors.validationErrors().get(0)
);
}
{
// scroll and compound retriever
SearchRequest searchRequest = createSearchRequest().source(
new SearchSourceBuilder().retriever(new TestCompoundRetrieverBuilder(randomIntBetween(1, 10)))
);
searchRequest.allowPartialSearchResults(false);
searchRequest.scroll(TimeValue.timeValueMinutes(1));
searchRequest.requestCache(false);
ActionRequestValidationException validationErrors = searchRequest.validate();
assertNotNull(validationErrors);
assertEquals(1, validationErrors.validationErrors().size());
assertEquals("cannot specify [test_compound_retriever_builder] and [scroll]", validationErrors.validationErrors().get(0));
}
{
// allow_partial_results and non-compound retriever
SearchRequest searchRequest = createSearchRequest().source(new SearchSourceBuilder().retriever(new RetrieverBuilder() {
Expand Down