Skip to content

Commit 03ec1f4

Browse files
committed
iter
1 parent f679945 commit 03ec1f4

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,9 @@ static int getTopDocsSize(SearchRequest request) {
736736
return DEFAULT_SIZE;
737737
}
738738
SearchSourceBuilder source = request.source();
739+
if (source.rankBuilder() != null) {
740+
return source.rankBuilder().rankWindowSize();
741+
}
739742
return (source.size() == -1 ? DEFAULT_SIZE : source.size()) + (source.from() == -1 ? SearchService.DEFAULT_FROM : source.from());
740743
}
741744

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankMultiNodeTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ protected Collection<Class<? extends Plugin>> pluginsNeeded() {
4343
return List.of(InferencePlugin.class, TextSimilarityTestPlugin.class);
4444
}
4545

46-
4746
public void testQueryPhaseShardThrowingAllShardsFail() throws Exception {
4847
// no-op
4948
}

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityTestPlugin.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77

88
package org.elasticsearch.xpack.inference.rank.textsimilarity;
99

10-
import org.apache.lucene.search.Query;
11-
import org.apache.lucene.search.ScoreDoc;
12-
import org.apache.lucene.search.TopDocs;
1310
import org.apache.lucene.util.SetOnce;
1411
import org.elasticsearch.action.ActionListener;
1512
import org.elasticsearch.action.ActionRequest;
1613
import org.elasticsearch.action.ActionResponse;
17-
import org.elasticsearch.action.search.SearchPhaseController;
1814
import org.elasticsearch.action.support.ActionFilter;
1915
import org.elasticsearch.action.support.ActionFilterChain;
2016
import org.elasticsearch.client.internal.Client;
@@ -29,11 +25,8 @@
2925
import org.elasticsearch.plugins.Plugin;
3026
import org.elasticsearch.search.SearchHits;
3127
import org.elasticsearch.search.profile.coordinator.SearchCoordinatorProfiler;
32-
import org.elasticsearch.search.query.QuerySearchResult;
3328
import org.elasticsearch.search.rank.RankBuilder;
3429
import org.elasticsearch.search.rank.RankShardResult;
35-
import org.elasticsearch.search.rank.context.QueryPhaseRankCoordinatorContext;
36-
import org.elasticsearch.search.rank.context.QueryPhaseRankShardContext;
3730
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankCoordinatorContext;
3831
import org.elasticsearch.search.rank.context.RankFeaturePhaseRankShardContext;
3932
import org.elasticsearch.search.rank.rerank.AbstractRerankerIT;

0 commit comments

Comments
 (0)