Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,8 @@ public SearchContext createSearchContext(ShardSearchRequest request, TimeValue t
final Engine.SearcherSupplier reader = indexShard.acquireSearcherSupplier();
final ShardSearchContextId id = new ShardSearchContextId(sessionId, idGenerator.incrementAndGet(), reader.getSearcherId());
try (ReaderContext readerContext = new ReaderContext(id, indexService, indexShard, reader, -1L, true)) {
DefaultSearchContext searchContext = createSearchContext(readerContext, request, timeout, ResultsType.NONE);
// Use ResultsType.QUERY so that the created search context can execute queries correctly.
DefaultSearchContext searchContext = createSearchContext(readerContext, request, timeout, ResultsType.QUERY);
searchContext.addReleasable(readerContext.markAsUsed(0L));
return searchContext;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2001,6 +2001,7 @@ public void testCreateSearchContext() throws IOException {
clusterAlias
);
try (SearchContext searchContext = service.createSearchContext(request, new TimeValue(System.currentTimeMillis()))) {
assertTrue(searchContext.searcher().hasExecutor());
SearchShardTarget searchShardTarget = searchContext.shardTarget();
SearchExecutionContext searchExecutionContext = searchContext.getSearchExecutionContext();
String expectedIndexName = clusterAlias == null ? index : clusterAlias + ":" + index;
Expand Down