Skip to content

CCS: Disable minimizing round-trips when dfs is requested #40044

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

Merged
merged 1 commit into from
Mar 14, 2019
Merged

CCS: Disable minimizing round-trips when dfs is requested #40044

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
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
import java.util.function.Function;
import java.util.function.LongSupplier;

import static org.elasticsearch.action.search.SearchType.DFS_QUERY_THEN_FETCH;
import static org.elasticsearch.action.search.SearchType.QUERY_THEN_FETCH;

public class TransportSearchAction extends HandledTransportAction<SearchRequest, SearchResponse> {
Expand Down Expand Up @@ -248,6 +249,9 @@ static boolean shouldMinimizeRoundtrips(SearchRequest searchRequest) {
if (searchRequest.scroll() != null) {
return false;
}
if (searchRequest.searchType() == DFS_QUERY_THEN_FETCH) {
return false;
}
SearchSourceBuilder source = searchRequest.source();
return source == null || source.collapse() == null || source.collapse().getInnerHits() == null ||
source.collapse().getInnerHits().isEmpty();
Expand Down
5 changes: 5 additions & 0 deletions server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,11 @@ public void testShouldMinimizeRoundtrips() throws Exception {
collapseBuilder.setInnerHits(new InnerHitBuilder("inner"));
assertFalse(TransportSearchAction.shouldMinimizeRoundtrips(searchRequest));
}
{
SearchRequest searchRequest = new SearchRequest();
searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
assertFalse(TransportSearchAction.shouldMinimizeRoundtrips(searchRequest));
}
{
SearchRequestTests searchRequestTests = new SearchRequestTests();
searchRequestTests.setUp();
Expand Down