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

Scroll queries asking for rescore are considered invalid #32918

Merged
merged 12 commits into from
Aug 28, 2018
Merged

Scroll queries asking for rescore are considered invalid #32918

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
361c7a2
Unit test
not-napoleon Aug 15, 2018
e61810b
New validation rule
not-napoleon Aug 16, 2018
9356d7d
Merge branch 'master' into fix/31775
not-napoleon Aug 17, 2018
3aaa33c
changed not to == false
not-napoleon Aug 17, 2018
2983371
Replaced mock with private static no op implementation
not-napoleon Aug 17, 2018
ab5468f
Merge branch 'master' into fix/31775
not-napoleon Aug 17, 2018
e1f02bf
Merge branch 'master' into fix/31775
not-napoleon Aug 21, 2018
8f39b1d
Merge remote-tracking branch 'origin/master' into fix/31775
not-napoleon Aug 22, 2018
3cc185e
Added documentation for the new behavior
not-napoleon Aug 22, 2018
d319989
Merge branch 'master' into fix/31775
not-napoleon Aug 24, 2018
66e76fb
Response to PR feedback
not-napoleon Aug 24, 2018
13bbb1c
fixed unused import
not-napoleon Aug 27, 2018
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
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/action/search/SearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ public ActionRequestValidationException validate() {
if (source != null && source.size() == 0 && scroll != null) {
validationException = addValidationError("[size] cannot be [0] in a scroll context", validationException);
}
if (source != null && source.rescores() != null && !source.rescores().isEmpty() && scroll != null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we tend to prefer source.rescores().isEmpty() == false in our codebase

validationException =
addValidationError("using [rescore] is not allowed in a scroll context", validationException);
}
return validationException;
}

Expand Down
13 changes: 13 additions & 0 deletions server/src/test/java/org/elasticsearch/search/SearchRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.ArrayUtils;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.rescore.RescorerBuilder;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode;
import static org.mockito.Mockito.mock;

public class SearchRequestTests extends AbstractSearchTestCase {

Expand Down Expand Up @@ -123,6 +125,17 @@ public void testValidate() throws IOException {
assertEquals(1, validationErrors.validationErrors().size());
assertEquals("[size] cannot be [0] in a scroll context", validationErrors.validationErrors().get(0));
}
{
// Rescore is not allowed on scroll requests
SearchRequest searchRequest = createSearchRequest().source(new SearchSourceBuilder());
searchRequest.source().addRescorer(mock(RescorerBuilder.class));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it necessary to mock the rescorer builder, seems like an easy object to create manually, unless I am missing something. In general, I tend to use mockito only as a last-resort, when things are really hard to reconstruct, that's why I'm asking.

searchRequest.requestCache(false);
searchRequest.scroll(new TimeValue(1000));
ActionRequestValidationException validationErrors = searchRequest.validate();
assertNotNull(validationErrors);
assertEquals(1, validationErrors.validationErrors().size());
assertEquals("using [rescore] is not allowed in a scroll context", validationErrors.validationErrors().get(0));
}
}

public void testEqualsAndHashcode() throws IOException {
Expand Down