honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable DFS search types and request caching for suggest-only requests

This commit is contained in:
Areek Zillur 2016-03-18 14:41:27 -04:00
parent b0437c3f22
commit 0eb2032189
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/elasticsearch/action/search/SearchRequest.java
View File

@ -295,6 +295,13 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
return this.requestCache; return this.requestCache;
} }
/**
* @return true if the request only has suggest
*/
public boolean hasOnlySuggest() {
return source != null && source.hasOnlySuggest();
}
@Override @Override
public void readFrom(StreamInput in) throws IOException { public void readFrom(StreamInput in) throws IOException {
super.readFrom(in); super.readFrom(in);

12
core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
View File

@ -37,7 +37,10 @@ import org.elasticsearch.transport.TransportService;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import static org.elasticsearch.action.search.SearchType.DFS_QUERY_AND_FETCH;
import static org.elasticsearch.action.search.SearchType.DFS_QUERY_THEN_FETCH;
import static org.elasticsearch.action.search.SearchType.QUERY_AND_FETCH; import static org.elasticsearch.action.search.SearchType.QUERY_AND_FETCH;
import static org.elasticsearch.action.search.SearchType.QUERY_THEN_FETCH;
/** /**
* *
@ -68,9 +71,18 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
Map<String, Set<String>> routingMap = indexNameExpressionResolver.resolveSearchRouting(clusterState, Map<String, Set<String>> routingMap = indexNameExpressionResolver.resolveSearchRouting(clusterState,
searchRequest.routing(), searchRequest.indices()); searchRequest.routing(), searchRequest.indices());
int shardCount = clusterService.operationRouting().searchShardsCount(clusterState, concreteIndices, routingMap); int shardCount = clusterService.operationRouting().searchShardsCount(clusterState, concreteIndices, routingMap);
boolean hasOnlySuggest = searchRequest.hasOnlySuggest();
if (shardCount == 1) { if (shardCount == 1) {
// if we only have one group, then we always want Q_A_F, no need for DFS, and no need to do THEN since we hit one shard // if we only have one group, then we always want Q_A_F, no need for DFS, and no need to do THEN since we hit one shard
searchRequest.searchType(QUERY_AND_FETCH); searchRequest.searchType(QUERY_AND_FETCH);
} else if (hasOnlySuggest &&
(searchRequest.searchType() == DFS_QUERY_AND_FETCH || searchRequest.searchType() == DFS_QUERY_THEN_FETCH)) {
// convert to Q_T_F if we have only suggest
searchRequest.searchType(QUERY_THEN_FETCH);
}
if (hasOnlySuggest && (searchRequest.requestCache() == null || searchRequest.requestCache())) {
// disable request cache if we have only suggest
searchRequest.requestCache(false);
} }
} catch (IndexNotFoundException | IndexClosedException e) { } catch (IndexNotFoundException | IndexClosedException e) {
// ignore these failures, we will notify the search response if its really the case from the actual action // ignore these failures, we will notify the search response if its really the case from the actual action