diff --git a/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java index 70efa0031237f..6d4e55759a638 100644 --- a/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java @@ -273,7 +273,7 @@ private void doPerformPhaseOnShard(int shardIndex, SearchShardIterator shardIt, public void innerOnResponse(Result result) { try { releasable.close(); - onShardResult(result, shardIt); + onShardResult(result); } catch (Exception exc) { onShardFailure(shardIndex, shard, shardIt, exc); } @@ -494,9 +494,8 @@ void onShardFailure(final int shardIndex, SearchShardTarget shardTarget, Excepti /** * Executed once for every successful shard level request. * @param result the result returned form the shard - * @param shardIt the shard iterator */ - protected void onShardResult(Result result, SearchShardIterator shardIt) { + protected void onShardResult(Result result) { assert result.getShardIndex() != -1 : "shard index is not set"; assert result.getSearchShardTarget() != null : "search shard target must not be null"; hasShardResponse.set(true); @@ -700,7 +699,7 @@ void sendReleaseSearchContext(ShardSearchContextId contextId, Transport.Connecti /** * Executed once all shard results have been received and processed * @see #onShardFailure(int, SearchShardTarget, Exception) - * @see #onShardResult(SearchPhaseResult, SearchShardIterator) + * @see #onShardResult(SearchPhaseResult) */ private void onPhaseDone() { // as a tribute to @kimchy aka. finishHim() executeNextPhase(getName(), this::getNextPhase); diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java index f75b84abc2f0f..4517d46c2c614 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java @@ -104,7 +104,7 @@ protected void onShardGroupFailure(int shardIndex, SearchShardTarget shardTarget } @Override - protected void onShardResult(SearchPhaseResult result, SearchShardIterator shardIt) { + protected void onShardResult(SearchPhaseResult result) { QuerySearchResult queryResult = result.queryResult(); if (queryResult.isNull() == false // disable sort optims for scroll requests because they keep track of the last bottom doc locally (per shard) @@ -123,7 +123,7 @@ && getRequest().scroll() == null } bottomSortCollector.consumeTopDocs(topDocs, queryResult.sortValueFormats()); } - super.onShardResult(result, shardIt); + super.onShardResult(result); } static SearchPhase nextPhase( diff --git a/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java b/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java index e8e12300c23e3..b1395fbb67cfe 100644 --- a/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java +++ b/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java @@ -151,7 +151,7 @@ protected void executePhaseOnShard( SearchActionListener listener ) { onShardResult(new SearchPhaseResult() { - }, shardIt); + }); } @Override